Merge branch '1203-trackers_oriented_view' into 'main'

1203 trackers oriented view

See merge request e/os/advanced-privacy!151

1 files changed, 46 insertions, 21 deletions

diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml
index 0cd5980..683f01c 100644
--- a/app/src/main/res/layout/fragment_trackers.xml
+++ b/app/src/main/res/layout/fragment_trackers.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/>.
+  -->
 <layout>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -13,14 +30,9 @@
     <androidx.core.widget.NestedScrollView
         android:layout_height="match_parent"
         android:layout_width="match_parent"
+        android:fillViewport="true"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
-
-<LinearLayout
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:orientation="vertical"
-    >
     <LinearLayout
         android:layout_height="match_parent"
         android:layout_width="match_parent"
@@ -66,24 +78,37 @@
             app:period="@{@string/trackers_period_year}"
             />
         <TextView
-            android:id="@+id/trackers_apps_list_title"
+            android:id="@+id/trackers_lists_title"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_marginTop="32dp"
-            android:paddingTop="16dp"
-            android:paddingHorizontal="16dp"
-            android:text="@string/trackers_applist_title"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="24dp"
+            android:textSize="14sp"
+            android:lineHeight="24dp"
+            android:textFontWeight="500"
+            android:text="@string/trackers_lists_title"
+            />
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/lists_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="32dp"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginBottom="32dp"
+            android:background="@drawable/pill_shape_tab_bg"
+            app:tabBackground="@drawable/pill_shape_tab_indicator"
+            app:tabIndicator="@null"
+            app:tabSelectedTextColor="@color/white"
+            app:tabTextColor="@color/primary_text"
+            app:textAllCaps="false"
             />
-    </LinearLayout>
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/apps"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="32dp"
-        />
-</LinearLayout>
 
-</androidx.core.widget.NestedScrollView>
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/lists_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
-</layout>
\ No newline at end of file
+</layout>