From d036f0539de99381df8b770108a755a7a7311643 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Fri, 8 May 2015 00:42:46 +0200
Subject: [PATCH] Added missing resource strings and clean up layouts

---
 CHANGELOG.md                                  |  2 +-
 .../main/res/layout/activity_appinstaller.xml |  2 +-
 .../main/res/layout/activity_discovery.xml    | 65 +++++++------------
 .../res/layout/activity_mi_band_pairing.xml   |  2 +-
 .../main/res/layout/device_candidate_item.xml |  8 ++-
 app/src/main/res/layout/device_item.xml       | 19 +++---
 app/src/main/res/values/strings.xml           |  5 ++
 7 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e83ed8c3..c8e3d4c47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ###Changelog
 ####Version (next)
-* Add discovery and pairing Activity
+* Add discovery and pairing Activity for Mi Bands
 * Listen for Pebble Message intents and forward notification (used by Conversations)
 * Make strings translatable and add German, Italian, Spanish and Korean translations
 * Mi Band: Display battery status
diff --git a/app/src/main/res/layout/activity_appinstaller.xml b/app/src/main/res/layout/activity_appinstaller.xml
index 35bf22c3c..046af67aa 100644
--- a/app/src/main/res/layout/activity_appinstaller.xml
+++ b/app/src/main/res/layout/activity_appinstaller.xml
@@ -16,7 +16,7 @@
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Install"
+        android:text="@string/appinstaller_install"
         android:id="@+id/installButton"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
diff --git a/app/src/main/res/layout/activity_discovery.xml b/app/src/main/res/layout/activity_discovery.xml
index bb70df999..28a2aea3f 100644
--- a/app/src/main/res/layout/activity_discovery.xml
+++ b/app/src/main/res/layout/activity_discovery.xml
@@ -17,64 +17,43 @@
             android:layout_height="wrap_content"
             android:text="@string/discovery_start_scanning"
             android:id="@+id/discovery_start"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentStart="true"
             android:layout_gravity="center_horizontal" />
 
-    <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/discovery_progressbar"
-        android:indeterminate="true"
-        android:indeterminateOnly="true"
-        android:visibility="gone"
-        android:layout_centerHorizontal="true"
-        android:layout_gravity="center_horizontal" />
-
-    <ListView
-        android:layout_width="wrap_content"
-        android:layout_height="193dp"
-        android:id="@+id/discovery_deviceCandidatesView"
-        android:layout_alignParentBottom="true"
-        android:layout_toEndOf="@+id/discovery_progressbar"
-        android:layout_below="@+id/discovery_progressbar"
-        android:layout_alignParentStart="true"
-        android:layout_gravity="bottom|top"
-        android:layout_weight="0.83" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentStart="true">
-
-        <TextView
+        <ProgressBar
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:id="@+id/discovery_progressbar"
+            android:indeterminate="true"
+            android:indeterminateOnly="true"
+            android:visibility="gone"
+            android:layout_gravity="center_horizontal" />
+
+        <ListView
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:id="@+id/discovery_deviceCandidatesView"
+            android:layout_gravity="bottom|top"
+            android:layout_weight="0.83" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Note:"
+            android:text="@string/discovery_note"
             android:id="@+id/discovery_note"
-            android:layout_alignTop="@+id/discovery_hint"
-            android:layout_centerHorizontal="true"
             android:textStyle="bold"
-            android:layout_gravity="center_vertical|right"
             android:textColor="@color/secondarytext"
-            android:layout_marginLeft="10dp" />
+            android:gravity="center_horizontal|bottom" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Currently connected devices will likely not be discovered."
+            android:text="@string/discovery_connected_devices_hint"
             android:id="@+id/discovery_hint"
             android:textColor="@color/secondarytext"
-            android:layout_marginLeft="10dp"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentStart="true"
-            android:layout_marginStart="76dp" />
+            android:gravity="bottom"
+            android:textIsSelectable="true" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_mi_band_pairing.xml b/app/src/main/res/layout/activity_mi_band_pairing.xml
index 7183a7f75..0f84fbcc4 100644
--- a/app/src/main/res/layout/activity_mi_band_pairing.xml
+++ b/app/src/main/res/layout/activity_mi_band_pairing.xml
@@ -21,7 +21,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="When your Mi Band vibrates and blinks, tap it a few times in a row."
+        android:text="@string/miband_pairing_tap_hint"
         android:id="@+id/miband_pair_hint"
         android:layout_centerVertical="true"
         android:layout_alignParentStart="true" />
diff --git a/app/src/main/res/layout/device_candidate_item.xml b/app/src/main/res/layout/device_candidate_item.xml
index ef1fcbdd0..0eb1f6e19 100644
--- a/app/src/main/res/layout/device_candidate_item.xml
+++ b/app/src/main/res/layout/device_candidate_item.xml
@@ -9,15 +9,17 @@
         android:id="@+id/device_candidate_image"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_alignParentLeft="true" />
+        android:layout_alignParentStart="true"
+        android:contentDescription="@string/candidate_item_device_image" />
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toRightOf="@+id/device_candidate_image"
+        android:layout_toEndOf="@+id/device_candidate_image"
         android:orientation="vertical"
-        android:paddingLeft="8dp" >
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp">
 
         <TextView
             android:id="@+id/device_candidate_name"
diff --git a/app/src/main/res/layout/device_item.xml b/app/src/main/res/layout/device_item.xml
index ebc7e8bb9..bfd0e8b14 100644
--- a/app/src/main/res/layout/device_item.xml
+++ b/app/src/main/res/layout/device_item.xml
@@ -9,23 +9,24 @@
         android:id="@+id/device_image"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_alignParentLeft="true" />
+        android:layout_alignParentStart="true"
+        android:contentDescription="@string/candidate_item_device_image" />
 
 
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toRightOf="@+id/device_image"
+        android:layout_toEndOf="@+id/device_image"
         android:orientation="vertical"
-        android:paddingLeft="8dp">
+        android:paddingStart="8dp">
 
         <TextView
             android:id="@+id/device_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/statuswrapper"
-            android:layout_toLeftOf="@+id/device_info"
+            android:layout_alignStart="@+id/statuswrapper"
+            android:layout_toStartOf="@+id/device_info"
             android:singleLine="true"
             android:textColor="@color/primarytext"
             android:typeface="sans" />
@@ -42,7 +43,7 @@
                 android:id="@+id/device_status"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
-                android:gravity="left"
+                android:gravity="start"
                 android:textColor="@color/primarytext"
                 android:textStyle="bold" />
 
@@ -50,7 +51,7 @@
                 android:id="@+id/battery_status"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
-                android:gravity="right"
+                android:gravity="end"
                 android:textColor="@color/secondarytext"
                 android:textStyle="bold" />
         </LinearLayout>
@@ -60,8 +61,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@+id/device_name"
-            android:layout_alignParentRight="true"
-            android:gravity="right"
+            android:layout_alignParentEnd="true"
+            android:gravity="end"
             android:textColor="@color/secondarytext"
             android:textSize="12sp" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b26219db..879bc1f6c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -87,5 +87,10 @@
     <string name="female">female</string>
     <string name="other">other</string>
     <string name="miband_pairing_using_dummy_userdata">No valid user data given, using dummy user data for now.</string>
+    <string name="miband_pairing_tap_hint">When your Mi Band vibrates and blinks, tap it a few times in a row.</string>
+    <string name="appinstaller_install">Install</string>
+    <string name="discovery_connected_devices_hint">Currently connected devices will likely not be discovered.</string>
+    <string name="discovery_note">Note:</string>
+    <string name="candidate_item_device_image">Device Image</string>
 
 </resources>