1203 trackers oriented view

2 files changed, 73 insertions, 7 deletions

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 952ed60..e0e9530 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 MURENA SAS
+  ~ Copyright (C) 2021 E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <resources>
     <!--themable -->
     <color name="primary">@color/e_action_bar</color>
@@ -10,14 +27,16 @@
     <color name="background">@color/e_background</color>
     <color name="iconInvertedColor">@color/e_alpha_base</color>
 
+    <color name="disabled">@color/e_disabled_color</color>
+    <color name="divider">@color/e_divider_color</color>
+
+    <color name="background_overlay">@color/e_background_overlay</color>
     <!-- Custom -->
     <color name="dark_color">#263238</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="grey_overlay">@color/e_disabled_color</color>
     <color name="green_valid">#28C97C</color>
     <color name="red_off">#F8432E</color>
     <color name="blue_unselected">#AADCFE</color> <!-- used in combination with accent color ! -->
-    <color name="divider">@color/e_background_overlay</color>
 
     <!-- Widget -->
     <color name="on_surface_high_emphasis">@color/e_primary_text_color_dark</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba3ba03..aa33837 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 MURENA SAS
+  ~ Copyright (C) 2021 E FOUNDATION
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <resources>
     <string name="app_name" translatable="false">Advanced Privacy</string>
 
@@ -80,25 +97,55 @@
     <string name="trackers_period_day" weblate_ctx="trackers-1">24 hours</string>
     <string name="trackers_period_month" weblate_ctx="trackers-1;trackers-2">past month</string>
     <string name="trackers_period_year" weblate_ctx="trackers-1">past year</string>
-    <string name="trackers_applist_title" weblate_ctx="trackers-3">Manage trackers used in applications * :</string>
+
     <string name="trackers_applist_infos" translatable="false">@string/ipscrambling_app_list_infos</string>
 
+    <string name="trackers_lists_title" weblate_ctx="trackers-3">Trackers Activity Summary</string>
+    <string name="trackers_toggle_list_apps">Apps</string>
+    <string name="trackers_toggle_list_trackers">Trackers</string>
+
+    <string name="trackers_list_app_trackers_counts">%s trackers detected</string>
+    <string name="trackers_list_tracker_apps_counts">detected in %s apps</string>
+
     <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/%2$d blocked trackers, %3$d leaks</string>
+
     <!-- App Trackers -->
-    <string name="apptrackers_block_all_toggle">Block trackers</string>
-    <string name="apptrackers_trackers_list_title">Opt for the trackers you want to activate/deactivate.</string>
+    <string name="apptrackers_subtitle">%s tracking summary</string>
+    <string name="apptrackers_detected_tracker_primary">Total</string>
+    <string name="apptrackers_detected_tracker_secondary">Detected trackers</string>
+    <string name="apptrackers_blocked_tracker_primary">Blocked</string>
+    <string name="apptrackers_blocked_tracker_secondary">Trackers</string>
+    <string name="apptrackers_blocked_leaks_primary">Blocked leaks</string>
+    <string name="apptrackers_blocked_leaks_secondary">%s allowed leaks</string>
+    <string name="apptrackers_manage_tracker">Manage tracker</string>
+    <string name="apptrackers_block_all_toggle">Toggle on trackers control</string>
+    <string name="apptrackers_list_title">Toggle off the trackers you want to allow:</string>
     <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="app_trackers_no_trackers_yet_remaining_whitelist">No trackers were detected yet. Some trackers were unblocked previously.</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, %3$d blocked leaks and %4$d allowed leaks.</string>
     <string name="apptrackers_error_no_app">App not installed.</string>
     <string name="apptrackers_tracker_control_disabled_message">Changes will take effect when tracker blocker is on.</string>
     <string name="apptrackers_reset">Reset trackers</string>
 
+    <!-- Tracker details -->
+    <string name="trackerdetails_subtitle">%s tracking summary</string>
+    <string name="trackerdetails_app_count_primary">Detected in</string>
+    <string name="trackerdetails_app_count_secondary">Different applications</string>
+    <string name="trackerdetails_blocked_leaks_primary">Blocked leaks</string>
+    <string name="trackerdetails_blocked_leaks_secondary">%s allowed leaks</string>
+    <string name="trackerdetails_manage_tracker">Manage tracker</string>
+    <string name="trackerdetails_block_all_toggle">Block this tracker across all apps</string>
+    <string name="trackerdetails_apps_list_title">Toggle off the apps for which you want to allow this tracker:</string>
+
+    <!-- Trackers control disclaimer block -->
+    <string name="trackercontroldisclaimer_start">Note:</string>
+    <string name="trackercontroldisclaimer_body">in some rare cases, disabling tracker can cause some apps to malfunction. You can choose specifically which trackers you want to block.</string>
+    <string name="trackercontroldisclaimer_link">Know more.</string>
+
+
     <!-- Features warning dialog -->
     <string name="warningdialog_do_not_show_again" weblate_ctx="home-trackers-alert;widget-trackers-alert;home-location-alert;widget-location-alert;home-ipscrambling-alert;widget-ipscrambling-alert">Do not show again</string>
     <string name="warningdialog_trackers_title" weblate_ctx="home-trackers-alert;widget-trackers-alert">Trackers control</string>