From 2e897cc8af4234abc4e3f5c3448e1fd7b2b8a1bd Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <guillaume.jacquart@hoodbrains.com>
Date: Tue, 5 Dec 2023 08:17:01 +0000
Subject: 1203 trackers oriented view

---
 app/src/main/res/layout/apptrackers_fragment.xml | 208 ++++++++++++++---------
 1 file changed, 131 insertions(+), 77 deletions(-)

(limited to 'app/src/main/res/layout/apptrackers_fragment.xml')

diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml
index d0a72d5..06b8d3f 100644
--- a/app/src/main/res/layout/apptrackers_fragment.xml
+++ b/app/src/main/res/layout/apptrackers_fragment.xml
@@ -15,18 +15,15 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
-
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    >
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
 
-        android:background="@color/background"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        >
+    android:background="@color/background"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    >
 
     <include layout="@layout/topbar" />
 
@@ -37,80 +34,137 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
 
-    <LinearLayout
-        android:layout_height="match_parent"
-        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_height="match_parent"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="16dp"
-            android:gravity="center_vertical">
+            android:orientation="vertical"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginVertical="32dp"
+            >
+            <TextView
+                android:id="@+id/subtitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:lineHeight="20sp"
+                android:textFontWeight="400"
+                android:textColor="@color/disabled"
+                android:layout_marginBottom="16dp"
+                tools:text="Facebook tracking summary"
+                />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginBottom="16dp"
+                android:baselineAligned="false">
+                <include
+                    android:id="@+id/data_detected_trackers"
+                    layout="@layout/highlight_data_number"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:layout_weight="1"
+                    />
+                <include
+                    android:id="@+id/data_blocked_trackers"
+                    layout="@layout/highlight_data_number"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    />
+            </LinearLayout>
+            <include
+                android:id="@+id/data_blocked_leaks"
+                layout="@layout/highlight_data_number"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                />
+
             <TextView
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/apptrackers_block_all_toggle"
+                android:textSize="14sp"
+                android:lineHeight="24sp"
+                android:textFontWeight="500"
+                android:textColor="@color/primary_text"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="@string/trackerdetails_manage_tracker"
                 />
-            <Switch
-                android:id="@+id/block_all_toggle"
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingVertical="12dp"
+                android:layout_marginBottom="16dp"
+                android:gravity="center_vertical">
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:textSize="14sp"
+                    android:lineHeight="20sp"
+                    android:textFontWeight="400"
+                    android:textColor="@color/primary_text"
+                    android:text="@string/apptrackers_block_all_toggle"
+                    />
+                <Switch
+                    android:id="@+id/block_all_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="24dp"
+                    android:checked="true"
+                    />
+            </LinearLayout>
+
+            <include
+                android:id="@+id/disclaimer_block_trackers"
+                layout="@layout/disclaimer_block_trackers"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                />
+            <TextView
+                android:id="@+id/list_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/apptrackers_list_title"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:textSize="14sp"
+                android:lineHeight="24sp"
+                android:textFontWeight="500"
+                android:textColor="@color/primary_text"
+                />
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/list"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginBottom="16dp"
+                tools:listitem="@layout/apptrackers_item_tracker_toggle"
+                />
+            <TextView
+                android:id="@+id/no_trackers_yet"
+                android:paddingHorizontal="32dp"
+                android:paddingTop="64dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                tools:text="@string/apptrackers_no_trackers_yet_block_off"
+                />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_reset"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                 android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:checked="true"
+                android:layout_height="wrap_content"
+                android:text="@string/apptrackers_reset"
+                android:textSize="14sp"
+                android:layout_gravity="center"
+                android:visibility="gone"
+                tools:visibility="visible"
+                android:layout_margin="16dp"
                 />
         </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/divider"
-            />
-        <TextView
-            android:id="@+id/trackers_list_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/apptrackers_trackers_list_title"
-            android:padding="16dp"
-            android:visibility="gone"
-            />
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/trackers"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:layout_marginBottom="16dp"
-            tools:listitem="@layout/apptrackers_item_tracker_toggle"
-            android:visibility="gone"
-            />
-        <TextView
-            android:id="@+id/no_trackers_yet"
-            android:paddingHorizontal="32dp"
-            android:paddingTop="64dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            tools:text="@string/apptrackers_no_trackers_yet_block_off"
-            />
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_reset"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/apptrackers_reset"
-            android:textSize="14sp"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:layout_margin="16dp"
-            />
-    </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-</layout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
-- 
cgit v1.2.1