From 2ea0e99f1bcec61e1a94bb7c35605fca49c53d1c Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Fri, 12 Nov 2021 11:34:57 +0100
Subject: Integrate trackers module, small UI fixes

---
 app/src/main/res/layout/apptrackers_fragment.xml      | 19 ++++++++++++++-----
 .../res/layout/apptrackers_item_tracker_toggle.xml    |  4 +---
 app/src/main/res/layout/fragment_dashboard.xml        |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml
index 1f3063d..f037beb 100644
--- a/app/src/main/res/layout/apptrackers_fragment.xml
+++ b/app/src/main/res/layout/apptrackers_fragment.xml
@@ -32,6 +32,7 @@
     <androidx.core.widget.NestedScrollView
         android:layout_height="match_parent"
         android:layout_width="match_parent"
+        android:fillViewport="true"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
 
@@ -40,10 +41,11 @@
         android:layout_width="match_parent"
         android:orientation="vertical"
         >
-        <!--LinearLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            android:padding="16dp"
             android:gravity="center_vertical">
             <TextView
                 android:layout_width="0dp"
@@ -51,14 +53,19 @@
                 android:layout_weight="1"
                 android:text="@string/apptrackers_block_all_toggle"
                 />
-            <androidx.appcompat.widget.SwitchCompat
+            <Switch
                 android:id="@+id/block_all_toggle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
-        </LinearLayout-->
+        </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/grey_divider"
+            />
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/trackers"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:layout_marginBottom="32dp"
             tools:listitem="@layout/apptrackers_item_tracker_toggle"
@@ -66,9 +73,11 @@
             />
         <TextView
             android:id="@+id/no_trackers_yet"
+            android:padding="32dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="@string/apptrackers_no_trackers_yet"
+            android:gravity="center"
+            tools:text="@string/apptrackers_no_trackers_yet_block_off"
             />
     </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml b/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml
index 22678ce..baab3d9 100644
--- a/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml
+++ b/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml
@@ -17,16 +17,14 @@
         android:layout_weight="1"
         android:maxLines="1"
         android:ellipsize="end"
-        android:layout_marginStart="16dp"
         android:textSize="14sp"
         tools:text="Body sensor"
         />
 
-    <androidx.appcompat.widget.SwitchCompat
+    <Switch
         android:id="@+id/toggle"
         android:layout_width="wrap_content"
         android:layout_height="24dp"
-        android:layoutDirection="rtl"
         android:checked="true"
         />
 </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 6976948..c93b985 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -213,7 +213,7 @@ android:text="@string/dashboard_state_ipaddress_off"
                 android:layout_height="88dp"
                 app:icon="@{@drawable/ic_tracked}"
                 app:title="@{@string/dashboard_am_i_tracked_title}"
-                app:subTitle='@{""}'
+                app:subTitle='@{@string/trackers_title}'
                 />
             <View
                 android:layout_width="match_parent"
-- 
cgit v1.2.1