From e6ba99e31da49df559da60e8d012e40813ee14f0 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Sun, 27 Feb 2022 12:00:20 +0100
Subject: Add trackers summary count on apptrackers, #4597

---
 app/src/main/res/layout/apptrackers_fragment.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(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 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"
-- 
cgit v1.2.1


From e9e22d2fdbde4e9679337fa681d60b3fdbfeace7 Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Mon, 28 Feb 2022 09:30:55 +0100
Subject: Show trackers counts for each apps in tracekr screen, #4589

---
 app/src/main/res/layout/trackers_item_app.xml | 36 +++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 5 deletions(-)

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

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>
-- 
cgit v1.2.1