From 20209809294a51e2371107b852502f21162b6961 Mon Sep 17 00:00:00 2001
From: wolkenschieber <wolkenschieber@users.noreply.github.com>
Date: Sun, 5 Mar 2017 12:25:56 +0100
Subject: [PATCH] Define version code and name in build.gradle

---
 android_app/app/build.gradle                 |  2 ++
 android_app/app/src/main/AndroidManifest.xml | 13 ++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle
index e634ccf2..588a25af 100644
--- a/android_app/app/build.gradle
+++ b/android_app/app/build.gradle
@@ -8,6 +8,8 @@ android {
         applicationId "com.health.openscale"
         minSdkVersion 18
         targetSdkVersion 25
+        versionCode 10
+        versionName "1.4.2"
     }
 
     buildTypes {
diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml
index c19207b5..fd039283 100644
--- a/android_app/app/src/main/AndroidManifest.xml
+++ b/android_app/app/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.health.openscale"
-    android:versionCode="10"
-    android:versionName="1.4.2" >
+    package="com.health.openscale" >
 
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
@@ -26,13 +24,14 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".gui.SettingsActivity"></activity>
-        <activity android:name=".gui.DataEntryActivity" android:theme="@android:style/Theme.Holo.Light.Dialog"></activity>
-        <activity android:name=".gui.UserSettingsActivity" android:theme="@android:style/Theme.Holo.Dialog" android:label="@string/label_title_user"></activity>
+        <activity android:name=".gui.SettingsActivity"/>
+        <activity android:name=".gui.DataEntryActivity" android:theme="@android:style/Theme.Holo.Light.Dialog"/>
+        <activity android:name=".gui.UserSettingsActivity" android:theme="@android:style/Theme.Holo.Dialog"
+                  android:label="@string/label_title_user"/>
 
         <receiver android:name=".gui.ReminderBootReceiver" android:enabled="false">
             <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"></action>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
     </application>