From aa2d37c76ba90061b509138a903f8cb7276a33a1 Mon Sep 17 00:00:00 2001
From: Daniele Gobbetti <daniele+github@gobbetti.name>
Date: Sun, 4 Sep 2016 16:20:50 +0200
Subject: [PATCH] Small changes to the DB management activity #UX

---
 .../res/layout/activity_db_management.xml     | 36 +++++++++++--------
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/activity_db_management.xml b/app/src/main/res/layout/activity_db_management.xml
index 0787c6a6..feb005a4 100644
--- a/app/src/main/res/layout/activity_db_management.xml
+++ b/app/src/main/res/layout/activity_db_management.xml
@@ -18,19 +18,6 @@
             android:paddingRight="@dimen/activity_horizontal_margin"
             android:paddingTop="@dimen/activity_vertical_margin">
 
-            <TextView
-                android:id="@+id/db_management_intro"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/activity_db_management_import_export_explanation"
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            <TextView
-                android:id="@+id/activity_db_management_path"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -55,12 +42,33 @@
                     android:text="Import DB" />
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/db_management_intro"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/activity_db_management_import_export_explanation"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <TextView
+                android:id="@+id/activity_db_management_path"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+            <TextView
+                android:id="@+id/mergeOldActivityDataTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="40dp"
+                android:text="@string/activity_db_management_merge_old_title"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/accent" />
 
             <TextView
                 android:id="@+id/mergeOldActivityDataText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="40dp"
                 android:text="@string/activity_db_management_merge_old_explanation"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ac0c6783..c2f1c432 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -301,4 +301,5 @@
     <string name="title_activity_db_management">Database management</string>
     <string name="activity_db_management_import_export_explanation">The database operations use the following path on your device. \nThis path is accessible to other android applications and your computer. \nExpect to find your exported database (or place the database you want to import) there:</string>
     <string name="activity_db_management_merge_old_explanation">The activity data recorded with Gadgetbridge versions prior to 0.12 must be converted to a new format. \nYou can do this using the button below. Be aware that you must be connected to the device you want to associate the old activity data with! \nIf you already imported your data and are happy with the result, you may delete the old database.</string>
+    <string name="activity_db_management_merge_old_title">Legacy database import / delete</string>
 </resources>