From ffbb686bd571185217c0e9e0fef0f164be9a07f7 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Tue, 1 Jun 2021 23:49:41 +0530
Subject: Add dummy tracker feature to trigger blocker system service

---
 app/src/main/res/layout/fragment_trackers.xml | 46 +++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 app/src/main/res/layout/fragment_trackers.xml

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

diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml
new file mode 100644
index 0000000..e11f4cc
--- /dev/null
+++ b/app/src/main/res/layout/fragment_trackers.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    >
+
+    <include layout="@layout/topbar"/>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="32dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingLeft="32dp"
+            android:paddingRight="32dp"
+            tools:context=".main.MainActivity"
+            >
+
+            <TextView
+                android:id="@+id/internet_activity_privacy_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:paddingTop="16dp"
+                android:text="@string/internet_activity_privacy_info"
+                android:textColor="@color/black"
+                android:textSize="14sp"
+                />
+
+            <Button android:id="@+id/triggerBlockerService"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="Trigger Blocker"/>
+                />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
-- 
cgit v1.2.1


From f4fe8a4d881deef7e43ffe296df804c8c2c7a657 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Wed, 16 Jun 2021 00:33:46 +0530
Subject: Add tracker UI and integrate lineage blocker service

---
 app/src/main/res/layout/fragment_trackers.xml | 37 +++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 5 deletions(-)

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

diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml
index e11f4cc..13fcab3 100644
--- a/app/src/main/res/layout/fragment_trackers.xml
+++ b/app/src/main/res/layout/fragment_trackers.xml
@@ -26,21 +26,48 @@
             >
 
             <TextView
-                android:id="@+id/internet_activity_privacy_info"
+                android:id="@+id/trackers_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:paddingTop="16dp"
-                android:text="@string/internet_activity_privacy_info"
+                android:text="@string/manage_trackers_info"
                 android:textColor="@color/black"
                 android:textSize="14sp"
                 />
 
-            <Button android:id="@+id/triggerBlockerService"
-                android:layout_height="wrap_content"
+            <TextView
+                android:id="@+id/learn_more_trackers_info"
+                android:layout_width="wrap_content"
+                android:layout_height="48dp"
+                android:fontFamily="sans-serif-medium"
+                android:gravity="center_vertical"
+                android:text="@string/learn_more"
+                android:textColor="#007fff"
+                android:textSize="14sp"
+                />
+
+            <ImageView
+                android:layout_height="300dp"
                 android:layout_width="wrap_content"
-                android:text="Trigger Blocker"/>
+                android:scaleType="centerInside"
+                android:src="@drawable/dummy_trackers_usage"
                 />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:paddingTop="16dp"
+                android:text="@string/following_trackers_in_use"
+                android:textColor="@color/black"
+                android:textSize="16sp"
+                />
+            <androidx.recyclerview.widget.RecyclerView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:listitem="@layout/item_list_tracker"
+                android:id="@+id/recylcer_view_trackers"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
-- 
cgit v1.2.1


From e40866d03008ec6dafa0016a31ee4c9e820032df Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkma@e.email>
Date: Wed, 16 Jun 2021 01:57:50 +0530
Subject: Fix UI bugs and reformat code

---
 app/src/main/res/layout/fragment_trackers.xml | 30 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

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

diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml
index 13fcab3..591b2b6 100644
--- a/app/src/main/res/layout/fragment_trackers.xml
+++ b/app/src/main/res/layout/fragment_trackers.xml
@@ -2,23 +2,23 @@
 <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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     android:background="@color/white"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
     >
 
-    <include layout="@layout/topbar"/>
+    <include layout="@layout/topbar" />
 
     <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="32dp"
+        android:layout_width="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
 
         <LinearLayout
-            android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_width="match_parent"
             android:orientation="vertical"
             android:paddingLeft="32dp"
             android:paddingRight="32dp"
@@ -27,9 +27,9 @@
 
             <TextView
                 android:id="@+id/trackers_info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
                 android:paddingTop="16dp"
                 android:text="@string/manage_trackers_info"
                 android:textColor="@color/black"
@@ -37,11 +37,11 @@
                 />
 
             <TextView
-                android:id="@+id/learn_more_trackers_info"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
                 android:fontFamily="sans-serif-medium"
                 android:gravity="center_vertical"
+                android:id="@+id/learn_more_trackers_info"
+                android:layout_height="48dp"
+                android:layout_width="wrap_content"
                 android:text="@string/learn_more"
                 android:textColor="#007fff"
                 android:textSize="14sp"
@@ -55,19 +55,21 @@
                 />
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
                 android:paddingTop="16dp"
                 android:text="@string/following_trackers_in_use"
                 android:textColor="@color/black"
                 android:textSize="16sp"
                 />
+
             <androidx.recyclerview.widget.RecyclerView
-                android:layout_width="match_parent"
+                android:id="@+id/recylcer_view_trackers"
                 android:layout_height="match_parent"
+                android:layout_width="match_parent"
                 tools:listitem="@layout/item_list_tracker"
-                android:id="@+id/recylcer_view_trackers"/>
+                />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
-- 
cgit v1.2.1