From b14d22413713fd865fafb8a53e44fd74017a6279 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Tue, 12 Apr 2022 09:28:00 +0200
Subject: 5255 Add instructions above leaks diagrams.

---
 app/src/main/res/layout/fragment_dashboard.xml | 12 ++++++++++++
 app/src/main/res/layout/fragment_trackers.xml  |  8 +++++++-
 app/src/main/res/values/strings.xml            |  4 +++-
 3 files changed, 22 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index ff64733..d2cb53c 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -168,6 +168,18 @@ android:text="@string/dashboard_state_ipaddress_off"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     />
+                <TextView
+                    android:id="@+id/graph_subtitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/graph_subtitle"
+                    android:layout_marginLeft="16dp"
+                    android:paddingTop="4dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/graph_title"
+                    android:textColor="@color/secondary_text"
+                    android:textSize="14sp"
+                    />
 
                 <com.github.mikephil.charting.charts.BarChart
                     android:id="@+id/graph"
diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml
index 2122816..7ee4d29 100644
--- a/app/src/main/res/layout/fragment_trackers.xml
+++ b/app/src/main/res/layout/fragment_trackers.xml
@@ -35,10 +35,16 @@
                     android:lineSpacingExtra="5sp"
                     android:text="@string/trackers_info"
                     />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/graph_subtitle"
+                    android:paddingTop="24dp"
+                    />
 
                 <include layout="@layout/trackers_item_graph"
                     android:id="@+id/graph_day"
-                    android:layout_marginTop="32dp"
+                    android:layout_marginTop="16dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:period="@{@string/trackers_period_day}"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 199472d..cf293e1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,8 @@
     <string name="graph_empty_message">Congratulations! No trackers are profiling you.</string>
     <string name="graph_legend_blocked">Blocked leaks</string>
     <string name="graph_legend_allowed">Allowed leaks</string>
+    <string name="graph_subtitle">Tap on the bars for more information.</string>
+
 
     <!-- Dashboard -->
     <string name="dashboard_title">@string/app_name</string>
@@ -20,7 +22,7 @@
     <string name="dashboard_state_ipaddress_label">Real IP address:</string>
     <string name="dashboard_state_ipaddress_off">Exposed</string>
     <string name="dashboard_state_ipaddress_on">Hidden</string>
-    <string name="dashboard_graph_label">Personal data leakage</string>
+    <string name="dashboard_graph_label">Personal data leakage:</string>
     <string name="dashboard_graph_period">Today</string>
     <string name="dashboard_graph_trackers_legend">%s trackers have profiled you in the last 24 hours</string>
 
-- 
cgit v1.2.1


From 14815678aaa5020e81f0cca9274f289e6ac7e2d5 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Tue, 12 Apr 2022 18:55:02 +0200
Subject: 5248 hide whitelist app trackers and fix counts when privacy
 protection disabled.

---
 app/src/main/res/layout/apptrackers_fragment.xml | 27 +++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

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

diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml
index b0b9e71..3eb9168 100644
--- a/app/src/main/res/layout/apptrackers_fragment.xml
+++ b/app/src/main/res/layout/apptrackers_fragment.xml
@@ -60,10 +60,31 @@
                 android:layout_weight="1"
                 android:text="@string/apptrackers_block_all_toggle"
                 />
-            <Switch
-                android:id="@+id/block_all_toggle"
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content">
+
+                <Switch
+                    android:id="@+id/block_all_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="24dp"
+                    android:checked="true"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    />
+                <View
+                    android:id="@+id/block_all_toggle_clicker"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:clickable="true"
+                    />
+            </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>
         <View
             android:layout_width="match_parent"
-- 
cgit v1.2.1