Merge branch 'UX_upgrades' into 'main'

Ux upgrades

See merge request e/privacy-central/privacycentralapp!20

3 files changed, 41 insertions, 6 deletions

diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml
index 13f58e3..17d992e 100644
--- a/app/src/main/res/layout/apptrackers_fragment.xml
+++ b/app/src/main/res/layout/apptrackers_fragment.xml
@@ -41,6 +41,13 @@
         android:layout_width="match_parent"
         android:orientation="vertical"
         >
+        <TextView
+            android:id="@+id/trackers_count_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:padding="16dp"
+            />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/trackers_item_app.xml b/app/src/main/res/layout/trackers_item_app.xml
index b368664..310c792 100644
--- a/app/src/main/res/layout/trackers_item_app.xml
+++ b/app/src/main/res/layout/trackers_item_app.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_height="52dp"
     android:layout_width="match_parent"
@@ -16,23 +16,49 @@
         android:layout_height="32dp"
         android:layout_width="32dp"
         android:src="@drawable/ic_facebook"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         />
 
     <TextView
         android:id="@+id/title"
-        android:layout_centerVertical="true"
         android:layout_height="wrap_content"
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:maxLines="1"
         android:ellipsize="end"
         android:layout_marginStart="16dp"
         android:textSize="14sp"
+        android:textColor="@color/black_text"
         tools:text="Body sensor"
+        app:layout_constraintLeft_toRightOf="@+id/icon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/counts"
+        app:layout_constraintRight_toLeftOf="@+id/arrow"
+        app:layout_constraintVertical_chainStyle="packed"
+        />
+    <TextView
+        android:id="@+id/counts"
+        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:layout_marginStart="16dp"
+        android:textSize="14sp"
+        android:textColor="@color/grey_text_2"
+        tools:text="1 tracker blocked out of 4"
+        app:layout_constraintLeft_toRightOf="@+id/icon"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title"
+        app:layout_constraintRight_toLeftOf="@+id/arrow"
         />
     <ImageView
+        android:id="@+id/arrow"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:src="@drawable/ic_chevron_right_24dp"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         />
-</androidx.appcompat.widget.LinearLayoutCompat>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c2a0ba..49b6c95 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,7 +40,7 @@
     <string name="ipscrambling_hide_ip_label">Hide IP address</string>
     <string name="ipscrambling_hide_ip_subtitle">I am anonymous on the internet</string>
     <string name="ipscrambling_tor_disclaimer"><b>Note:</b> when active, this setting will slow down your Internet connectivity speed (uses the Tor network).</string>
-    <string name="ipscrambling_location_label">Force a country of origin:</string>
+    <string name="ipscrambling_location_label">My internet activity must appear from:</string>
     <string name="ipscrambling_any_location">Random country</string>
     <string name="ipscrambling_select_app">Apply this setting to all selected apps:</string>
     <string name="ipscrambling_error_quickprivacy_disabled">Enabled Quick Privacy to use functionalities</string>
@@ -67,6 +67,7 @@
     <string name="trackers_graph_hours_period_format">HH:mm</string>
     <string name="trackers_graph_days_period_format">MMM d - EEE</string>
     <string name="trackers_graph_months_period_format">MMM yyyy</string>
+    <string name="trackers_app_trackers_counts">%1$d blocked trackers out of %2$d</string>
 
     <!-- App Trackers -->
     <string name="apptrackers_block_all_toggle">Block trackers</string>
@@ -74,6 +75,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="quick_protection_info">Quick protection enables these settings when turned on</string>