Add FakeLocation and InternetActivityPrivacy feature

5 files changed, 243 insertions, 204 deletions

diff --git a/app/src/main/res/drawable/ic_my_location.xml b/app/src/main/res/drawable/ic_my_location.xml
new file mode 100644
index 0000000..3b04dc4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_my_location.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ 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/>.
+  -->
+
+<vector android:height="23.99944dp" android:viewportHeight="42.738"
+    android:viewportWidth="42.739" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fc7222" android:pathData="M42.74,5L42.74,37.738A5,5 0,0 1,37.74 42.738L5.001,42.738A5,5 0,0 1,0.001 37.738L0.001,5A5,5 0,0 1,5.001 0L37.74,0A5,5 0,0 1,42.74 5z"/>
+    <path android:fillColor="#fff" android:pathData="M21.369,3.651a13.318,13.318 0,0 0,-13.271 13.27c0,5.322 1.728,6.912 11.888,21.5a1.685,1.685 0,0 0,2.7 0c10.16,-14.584 11.957,-16.173 11.957,-21.5a13.364,13.364 0,0 0,-13.271 -13.27zM21.369,27.98a2.183,2.183 0,0 1,-2.212 -2.212,2.227 2.227,0 0,1 2.212,-2.212 2.274,2.274 0,0 1,2.212 2.212,2.227 2.227,0 0,1 -2.212,2.212zM23.169,20.17v0.138a1.079,1.079 0,0 1,-1.106 1.037h-1.106a1.079,1.079 0,0 1,-1.106 -1.037v-1.175a1.562,1.562 0,0 1,0.968 -1.451c2.074,-1.037 3.456,-1.866 3.456,-2.972a2.722,2.722 0,0 0,-2.773 -2.765,2.737 2.737,0 0,0 -2.626,2 1.038,1.038 0,0 1,-1.037 0.76h-1.175a1.112,1.112 0,0 1,-1.106 -1.313,6.146 6.146,0 0,1 5.944,-4.764 6.038,6.038 0,0 1,6.082 6.082c0,2.834 -2.281,4.354 -4.424,5.46z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index ed4de49..663c270 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -15,10 +15,20 @@
         tools:layout_height="56dp"
         />
 
+    <ProgressBar
+        android:id="@+id/loadingSpinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        />
+
     <androidx.core.widget.NestedScrollView
+        android:id="@+id/scrollContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="?android:attr/actionBarSize"
+        android:visibility="gone"
         >
 
         <LinearLayout
@@ -71,8 +81,8 @@
                 />
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="160dp"
                 android:src="@drawable/dummy_leakage_analytics"
                 />
 
@@ -84,250 +94,256 @@
                 android:gravity="center"
                 android:paddingLeft="32dp"
                 android:paddingRight="32dp"
+                android:paddingBottom="16dp"
                 android:text="@string/personal_leakage_info"
                 android:textColor="@color/black"
                 android:textSize="12sp"
                 />
 
-            <RelativeLayout
-                android:id="@+id/am_i_tracked"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:background="#f9f9f9"
-                android:paddingLeft="32dp"
-                android:paddingTop="16dp"
-                android:paddingRight="32dp"
-                android:paddingBottom="16dp"
+                android:orientation="vertical"
                 >
 
-                <ImageView
-                    android:id="@+id/am_i_tracked_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_tracked"
-                    />
-
-                <LinearLayout
+                <RelativeLayout
+                    android:id="@+id/am_i_tracked"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@+id/am_i_tracked_chevron"
-                    android:layout_toEndOf="@+id/am_i_tracked_icon"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="32dp"
+                    android:paddingLeft="32dp"
+                    android:paddingTop="16dp"
+                    android:paddingRight="32dp"
+                    android:paddingBottom="16dp"
                     >
 
-                    <TextView
-                        android:id="@+id/am_i_tracked_title"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="sans-serif-medium"
-                        android:text="@string/am_i_tracked_title"
-                        android:textColor="@color/black"
-                        android:textSize="16sp"
+                    <ImageView
+                        android:id="@+id/am_i_tracked_icon"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_tracked"
                         />
 
-                    <TextView
-                        android:id="@+id/am_i_tracked_subtitle"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/am_i_tracked_subtitle"
-                        android:textColor="@color/black"
-                        android:textSize="14sp"
+                        android:layout_toStartOf="@+id/am_i_tracked_chevron"
+                        android:layout_toEndOf="@+id/am_i_tracked_icon"
+                        android:orientation="vertical"
+                        android:paddingStart="16dp"
+                        android:paddingEnd="32dp"
+                        >
+
+                        <TextView
+                            android:id="@+id/am_i_tracked_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="sans-serif-medium"
+                            android:text="@string/am_i_tracked_title"
+                            android:textColor="@color/black"
+                            android:textSize="16sp"
+                            />
+
+                        <TextView
+                            android:id="@+id/am_i_tracked_subtitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/am_i_tracked_subtitle"
+                            android:textColor="@color/black"
+                            android:textSize="14sp"
+                            />
+                    </LinearLayout>
+
+                    <ImageView
+                        android:id="@+id/am_i_tracked_chevron"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_chevron_right_24dp"
                         />
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/am_i_tracked_chevron"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_chevron_right_24dp"
-                    />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/apps_permissions"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="#f9f9f9"
-                android:paddingLeft="32dp"
-                android:paddingTop="16dp"
-                android:paddingRight="32dp"
-                android:paddingBottom="16dp"
-                >
+                </RelativeLayout>
 
-                <ImageView
-                    android:id="@+id/apps_permissions_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_apps_permissions"
-                    />
-
-                <LinearLayout
+                <RelativeLayout
+                    android:id="@+id/apps_permissions"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@+id/apps_permissions_chevron"
-                    android:layout_toEndOf="@+id/apps_permissions_icon"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="32dp"
+                    android:paddingLeft="32dp"
+                    android:paddingTop="16dp"
+                    android:paddingRight="32dp"
+                    android:paddingBottom="16dp"
                     >
 
-                    <TextView
-                        android:id="@+id/apps_permissions_title"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="sans-serif-medium"
-                        android:text="@string/apps_permissions_title"
-                        android:textColor="@color/black"
-                        android:textSize="16sp"
+                    <ImageView
+                        android:id="@+id/apps_permissions_icon"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_apps_permissions"
                         />
 
-                    <TextView
-                        android:id="@+id/apps_permissions_subtitle"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/apps_permissions_subtitle"
-                        android:textColor="@color/black"
-                        android:textSize="14sp"
+                        android:layout_toStartOf="@+id/apps_permissions_chevron"
+                        android:layout_toEndOf="@+id/apps_permissions_icon"
+                        android:orientation="vertical"
+                        android:paddingStart="16dp"
+                        android:paddingEnd="32dp"
+                        >
+
+                        <TextView
+                            android:id="@+id/apps_permissions_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="sans-serif-medium"
+                            android:text="@string/apps_permissions_title"
+                            android:textColor="@color/black"
+                            android:textSize="16sp"
+                            />
+
+                        <TextView
+                            android:id="@+id/apps_permissions_subtitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/apps_permissions_subtitle"
+                            android:textColor="@color/black"
+                            android:textSize="14sp"
+                            />
+                    </LinearLayout>
+
+                    <ImageView
+                        android:id="@+id/apps_permissions_chevron"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_chevron_right_24dp"
                         />
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/apps_permissions_chevron"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_chevron_right_24dp"
-                    />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/my_location"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="#f9f9f9"
-                android:paddingLeft="32dp"
-                android:paddingTop="16dp"
-                android:paddingRight="32dp"
-                android:paddingBottom="16dp"
-                >
-
-                <ImageView
-                    android:id="@+id/my_location_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_location"
-                    />
+                </RelativeLayout>
 
-                <LinearLayout
+                <RelativeLayout
+                    android:id="@+id/my_location"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@+id/my_location_chevron"
-                    android:layout_toEndOf="@+id/my_location_icon"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="32dp"
+                    android:paddingLeft="32dp"
+                    android:paddingTop="16dp"
+                    android:paddingRight="32dp"
+                    android:paddingBottom="16dp"
                     >
 
-                    <TextView
-                        android:id="@+id/my_location_title"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="sans-serif-medium"
-                        android:text="@string/my_location_title"
-                        android:textColor="@color/black"
-                        android:textSize="16sp"
+                    <ImageView
+                        android:id="@+id/my_location_icon"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_my_location"
                         />
 
-                    <TextView
-                        android:id="@+id/my_location_subtitle"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/my_location_subtitle"
-                        android:textColor="@color/black"
-                        android:textSize="14sp"
+                        android:layout_toStartOf="@+id/my_location_chevron"
+                        android:layout_toEndOf="@+id/my_location_icon"
+                        android:orientation="vertical"
+                        android:paddingStart="16dp"
+                        android:paddingEnd="32dp"
+                        >
+
+                        <TextView
+                            android:id="@+id/my_location_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="sans-serif-medium"
+                            android:text="@string/my_location_title"
+                            android:textColor="@color/black"
+                            android:textSize="16sp"
+                            />
+
+                        <TextView
+                            android:id="@+id/my_location_subtitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/my_location_subtitle"
+                            android:textColor="@color/black"
+                            android:textSize="14sp"
+                            />
+                    </LinearLayout>
+
+                    <ImageView
+                        android:id="@+id/my_location_chevron"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_chevron_right_24dp"
                         />
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/my_location_chevron"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_chevron_right_24dp"
-                    />
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/internet_activity_privacy"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="#f9f9f9"
-                android:paddingLeft="32dp"
-                android:paddingTop="16dp"
-                android:paddingRight="32dp"
-                android:paddingBottom="16dp"
-                >
-
-                <ImageView
-                    android:id="@+id/internet_activity_privacy_icon"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_internet_activity"
-                    />
+                </RelativeLayout>
 
-                <LinearLayout
+                <RelativeLayout
+                    android:id="@+id/internet_activity_privacy"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_toStartOf="@+id/internet_activity_privacy_chevron"
-                    android:layout_toEndOf="@+id/internet_activity_privacy_icon"
-                    android:orientation="vertical"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="32dp"
+                    android:paddingLeft="32dp"
+                    android:paddingTop="16dp"
+                    android:paddingRight="32dp"
+                    android:paddingBottom="16dp"
                     >
 
-                    <TextView
-                        android:id="@+id/internet_activity_privacy_title"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:fontFamily="sans-serif-medium"
-                        android:text="@string/internet_activity_privacy_title"
-                        android:textColor="@color/black"
-                        android:textSize="16sp"
+                    <ImageView
+                        android:id="@+id/internet_activity_privacy_icon"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_internet_activity"
                         />
 
-                    <TextView
-                        android:id="@+id/internet_activity_privacy_subtitle"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/internet_activity_privacy_subtitle"
-                        android:textColor="@color/black"
-                        android:textSize="14sp"
+                        android:layout_toStartOf="@+id/internet_activity_privacy_chevron"
+                        android:layout_toEndOf="@+id/internet_activity_privacy_icon"
+                        android:orientation="vertical"
+                        android:paddingStart="16dp"
+                        android:paddingEnd="32dp"
+                        >
+
+                        <TextView
+                            android:id="@+id/internet_activity_privacy_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="sans-serif-medium"
+                            android:text="@string/internet_activity_privacy_title"
+                            android:textColor="@color/black"
+                            android:textSize="16sp"
+                            />
+
+                        <TextView
+                            android:id="@+id/internet_activity_privacy_subtitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/internet_activity_privacy_subtitle"
+                            android:textColor="@color/black"
+                            android:textSize="14sp"
+                            />
+                    </LinearLayout>
+
+                    <ImageView
+                        android:id="@+id/internet_activity_privacy_chevron"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_alignParentEnd="true"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_chevron_right_24dp"
                         />
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/internet_activity_privacy_chevron"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/ic_chevron_right_24dp"
-                    />
-            </RelativeLayout>
+                </RelativeLayout>
+
+            </LinearLayout>
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml
index 1b02f86..1ebe9ef 100644
--- a/app/src/main/res/layout/fragment_fake_location.xml
+++ b/app/src/main/res/layout/fragment_fake_location.xml
@@ -99,6 +99,7 @@
             </RadioGroup>
 
             <ImageView
+                android:id="@+id/dummy_img_map"
                 android:layout_width="match_parent"
                 android:layout_height="254dp"
                 android:layout_marginTop="32dp"
diff --git a/app/src/main/res/layout/fragment_internet_activity_policy.xml b/app/src/main/res/layout/fragment_internet_activity_policy.xml
index 787ee11..6a53498 100644
--- a/app/src/main/res/layout/fragment_internet_activity_policy.xml
+++ b/app/src/main/res/layout/fragment_internet_activity_policy.xml
@@ -87,10 +87,10 @@
                     android:textSize="14sp"/>
 
                 <foundation.e.privacycentralapp.common.RightRadioButton
-                    android:id="@+id/radio_hide_ip"
+                    android:id="@+id/radio_use_hidden_ip"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/hide_ip"
+                    android:text="@string/hidden_ip"
                     android:textSize="16sp"
                     android:layout_marginTop="8dp"
                     />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f79852c..989e233 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,11 +4,11 @@
     <string name="tap_to_enable_quick_protection">Tap to enable quick privacy protection</string>
     <string name="personal_leakage_info">Personal data leakage over past 24 hours. </string>
     <string name="am_i_tracked_title">Am I tracked?</string>
-    <string name="am_i_tracked_subtitle">Currently there are 77 trackers in your apps, 12 trackers are active</string>
+    <string name="am_i_tracked_subtitle">Currently there are %1$d trackers in your apps, %2$d trackers are active</string>
     <string name="apps_permissions_title">Apps Permissions</string>
-    <string name="apps_permissions_subtitle">120 apps are requesting 72 permissions</string>
+    <string name="apps_permissions_subtitle">%1$d apps are requesting %2$d permissions</string>
     <string name="my_location_title">My Location</string>
-    <string name="my_location_subtitle">"7 apps are using location permission\n Current location mode: "</string>
+    <string name="my_location_subtitle">"%1$d apps are using location permission\nCurrent location mode: "</string>
     <string name="internet_activity_privacy_title">My Internet Activity Privacy</string>
     <string name="internet_activity_privacy_subtitle">"Current internet activity mode: "</string>
     <string name="quick_protection_info">Quick protection enables these settings when turned on</string>
@@ -24,7 +24,7 @@
     <string name="internet_activity_privacy_info">Choose if you want to expose your real IP address or hide when connected to the internet (uses the tor network).</string>
     <string name="use_real_ip">Use real IP address</string>
     <string name="i_can_be_tracked">I can be tracked by my IP address.</string>
-    <string name="hide_ip">Hide IP address</string>
+    <string name="hidden_ip">Hide IP address</string>
     <string name="i_am_anonymous">I am anonymous on the internet.</string>
     <string name="permission_control_info">Manage and control apps requesting various permissions.</string>