From 730c2bc7566c03a9774509ab35bbbbca578ecf72 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Mon, 25 Apr 2022 08:56:18 +0200
Subject: 219 highlight active trackers

---
 .../main/res/layout/apptrackers_item_tracker_toggle.xml | 12 ++++++------
 app/src/main/res/layout/fragment_dashboard.xml          | 17 ++++++++++++++++-
 app/src/main/res/layout/widget.xml                      | 15 +++++++++++++++
 app/src/main/res/values-fr/strings.xml                  |  2 +-
 app/src/main/res/values/strings.xml                     |  6 ++++--
 5 files changed, 42 insertions(+), 10 deletions(-)

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

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 0371390..db7086f 100644
--- a/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml
+++ b/app/src/main/res/layout/apptrackers_item_tracker_toggle.xml
@@ -20,10 +20,10 @@
         android:textSize="14sp"
         tools:text="Body sensor"
         />
-        <Switch
-            android:id="@+id/toggle"
-            android:layout_width="wrap_content"
-            android:layout_height="24dp"
-            android:checked="true"
-            />
+    <Switch
+        android:id="@+id/toggle"
+        android:layout_width="wrap_content"
+        android:layout_height="24dp"
+        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 d79dea1..f6beca6 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -30,7 +30,7 @@
                     android:layout_height="25dp"
                     android:layout_width="24dp"
                     android:layout_margin="16dp"
-                    android:src="@drawable/ic_shield_off"
+                    android:src="@drawable/ic_shield_off_white"
                     android:scaleType="fitCenter"
                     />
                 <TextView
@@ -247,6 +247,21 @@ android:text="@string/dashboard_state_ipaddress_off"
                     android:text="@string/graph_legend_allowed"
                     />
 
+                <TextView
+                    android:id="@+id/leaking_app_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="12sp"
+                    android:textColor="@color/primary_text"
+                    android:drawableEnd="@drawable/ic_chevron_right_24dp"
+                    android:text="@string/dashboard_graph_leaking_app"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"
+                    app:layout_constraintTop_toTopOf="@+id/graph_legend_blocked_icon"
+                    android:gravity="center_vertical|end"
+                    android:layout_marginRight="16dp"
+                    />
+
                 <TextView
                     android:id="@+id/graph_empty"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index e55d8a3..999a888 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -687,6 +687,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginHorizontal="24dp"
         android:layout_marginBottom="24dp"
+        android:gravity="center_vertical"
         >
 
         <ImageView
@@ -726,6 +727,20 @@
             android:textSize="12sp"
             android:text="@string/graph_legend_allowed"
             />
+
+        <TextView
+            android:id="@+id/graph_view_trackers_btn"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:textSize="12sp"
+            android:textAlignment="textEnd"
+            android:gravity="center_vertical|end"
+            android:textColor="@color/on_primary_high_emphasis"
+            android:drawableEnd="@drawable/ic_chevron_right_24dp"
+            android:drawableTint="@color/on_primary_high_emphasis"
+            android:text="@string/widget_graph_view_trackers"
+            />
     </LinearLayout>
 
     <TextView
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 47970a1..c0a8582 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -62,7 +62,7 @@
     <string name="trackers_title">Gérer les pisteurs des applications</string>
     <string name="trackers_count_label">%d pisteurs</string>
     <string name="trackers_applist_title">Gérer les pisteurs utilisés dans les applications :</string>
-    <string name="trackers_app_trackers_counts">%1$d pisteurs bloqués sur %2$d</string>
+    <string name="trackers_app_trackers_counts">%1$d pisteurs bloqués sur %2$d, </string>
     <string name="apptrackers_block_all_toggle">Bloquer les pisteurs</string>
     <string name="apptrackers_trackers_list_title">Optez pour les pisteurs que vous souhaitez activer/désactiver.</string>
     <string name="apptrackers_no_trackers_yet_block_off">Pour l\'instant, aucun pisteurs n\'a été détecté. Si de nouveaux pisteurs sont détectés, ils seront mis à jour ici.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 489dff2..c1f15f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,6 +27,7 @@
     <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>
+    <string name="dashboard_graph_leaking_app">View</string>
     <string name="dashboard_first_ipscrambling_activation">While your IP is faked, your internet speed is likely to be reduced.</string>
 
     <string name="dashboard_am_i_tracked_title">Manage apps\' trackers</string>
@@ -77,7 +78,7 @@
     <string name="trackers_graph_hours_period_format">HH:mm</string>
     <string name="trackers_graph_days_period_format">MMMM d - EEE</string>
     <string name="trackers_graph_months_period_format">MMMM yyyy</string>
-    <string name="trackers_app_trackers_counts">%1$d blocked trackers out of %2$d</string>
+    <string name="trackers_app_trackers_counts">%1$d blocked trackers out of %2$d, %3$d leaks</string>
 
     <!-- App Trackers -->
     <string name="apptrackers_block_all_toggle">Block trackers</string>
@@ -85,7 +86,7 @@
     <string name="apptrackers_no_trackers_yet_block_off">No trackers were detected yet. If new trackers are detected they will be updated here.</string>
     <string name="apptrackers_no_trackers_yet_block_on">No trackers were detected yet. All future trackers will be blocked.</string>
     <string name="apptrackers_error_quickprivacy_disabled">Enable Quick Privacy to be able to activate/deactivate trackers.</string>
-    <string name="apptrackers_trackers_count_summary">%1$d blocked trackers out of %2$d detected trackers</string>
+    <string name="apptrackers_trackers_count_summary">%1$d blocked trackers out of %2$d detected trackers, %3$d blocked leaks and %4$d allowed leaks.</string>
     <string name="apptrackers_error_no_app">App not installed.</string>
 
     <!-- -->
@@ -140,6 +141,7 @@
     <string name="widget_state_ipaddress_off">@string/dashboard_state_ipaddress_off</string>
     <string name="widget_state_ipaddress_on">@string/dashboard_state_ipaddress_on</string>
     <string name="widget_graph_trackers_legend">@string/dashboard_graph_trackers_legend</string>
+    <string name="widget_graph_view_trackers">View</string>
 
     <string name="first_notification_title">Discover Advanced Privacy</string>
     <string name="first_notification_summary">Tap to find out how to easily block trackers, fake your location &amp; hide your IP address.</string>
-- 
cgit v1.2.1