update UI on fake location

4 files changed, 54 insertions, 53 deletions

diff --git a/app/src/main/res/drawable/ic_valid.xml b/app/src/main/res/drawable/ic_valid.xml
new file mode 100644
index 0000000..e81474e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_valid.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,16.2001L4.8,12.0001L3.4,13.4001L9,19.0001L21,7.0001L19.6,5.6001L9,16.2001Z"
+      android:fillColor="#2CC766"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml
index d60513b..558fde0 100644
--- a/app/src/main/res/layout/fragment_fake_location.xml
+++ b/app/src/main/res/layout/fragment_fake_location.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<layout>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
@@ -18,7 +19,7 @@
 
         <LinearLayout
             android:layout_height="match_parent"
-            android:layout_marginBottom="32dp"
+            android:padding="16dp"
             android:layout_width="match_parent"
             android:orientation="vertical"
             tools:context=".main.MainActivity"
@@ -29,25 +30,8 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android:paddingLeft="32dp"
-                android:paddingRight="32dp"
-                android:paddingTop="16dp"
-                android:text="@string/fake_location_info"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                />
-
-            <TextView
-                android:fontFamily="sans-serif-medium"
-                android:gravity="center_vertical"
-                android:id="@+id/learn_more_fake_location"
-                android:layout_height="48dp"
-                android:layout_width="wrap_content"
-                android:paddingLeft="32dp"
-                android:paddingRight="32dp"
-                android:text="@string/learn_more"
-                android:textColor="#007fff"
-                android:textSize="14sp"
+                android:text="@string/location_info"
+                android:lineSpacingExtra="5sp"
                 />
 
             <RadioGroup
@@ -55,56 +39,56 @@
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:orientation="vertical"
-                android:paddingLeft="32dp"
-                android:paddingRight="32dp"
+                android:layout_marginTop="16dp"
                 >
 
                 <foundation.e.privacycentralapp.common.RightRadioButton
                     android:id="@+id/radio_use_real_location"
-                    android:layout_height="wrap_content"
+                    android:layout_height="52dp"
                     android:layout_width="match_parent"
-                    android:text="@string/use_real_location"
-                    android:textSize="16sp"
+                    android:text="@string/location_use_real_location"
+                    android:textSize="14sp"
                     />
 
                 <foundation.e.privacycentralapp.common.RightRadioButton
                     android:id="@+id/radio_use_random_location"
-                    android:layout_height="wrap_content"
+                    android:layout_height="52dp"
                     android:layout_width="match_parent"
-                    android:text="@string/use_random_location"
-                    android:textSize="16sp"
+                    android:text="@string/location_use_random_location"
+                    android:textSize="14sp"
                     />
 
                 <foundation.e.privacycentralapp.common.RightRadioButton
                     android:id="@+id/radio_use_specific_location"
-                    android:layout_height="wrap_content"
+                    android:layout_height="52dp"
                     android:layout_width="match_parent"
-                    android:text="@string/use_specific_location"
-                    android:textSize="16sp"
+                    android:text="@string/location_use_specific_location"
+                    android:textSize="14sp"
                     />
             </RadioGroup>
 
 
             <foundation.e.privacycentralapp.features.location.FakeLocationMapView
                 android:id="@+id/mapView"
-                android:layout_height="240dp"
-                android:layout_marginBottom="16dp"
-                android:layout_marginTop="32dp"
+                android:layout_height="220dp"
+                android:layout_marginTop="16dp"
                 android:layout_width="match_parent"
                 mapbox:mapbox_cameraZoom="8"
                 />
 
             <com.google.android.material.textfield.TextInputLayout
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:hint="@string/longitude"
-                android:id="@+id/edittext_longitude"
+                android:hint="@string/location_hint_longitude"
+                android:id="@+id/textlayout_longitude"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android:paddingLeft="32dp"
-                android:paddingRight="32dp"
+                android:layout_marginTop="16dp"
+                app:endIconDrawable="@drawable/ic_valid"
+                app:endIconMode="custom"
+                app:endIconTint="@color/green_valid"
                 >
-
                 <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edittext_longitude"
                     android:inputType="numberDecimal"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
@@ -113,16 +97,17 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:hint="@string/latitude"
-                android:id="@+id/edittext_latitude"
+                android:id="@+id/textlayout_latitude"
+                android:hint="@string/location_hint_latitude"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
                 android:layout_width="match_parent"
-                android:paddingLeft="32dp"
-                android:paddingRight="32dp"
+                android:layout_marginTop="16dp"
+                app:endIconDrawable="@drawable/ic_valid"
+                app:endIconMode="custom"
+                app:endIconTint="@color/green_valid"
                 >
-
                 <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edittext_latitude"
                     android:inputType="numberDecimal"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
@@ -131,4 +116,5 @@
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</layout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5f4bcb4..a3ebbeb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -19,6 +19,7 @@
 
     <color name="orange_off">#FC7222</color>
     <color name="green_on">#169659</color>
+    <color name="green_valid">#2CC766</color>
 
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 35987ea..d675a79 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,19 +40,23 @@
     <string name="ipscrambling_tor_disclaimer"><b>Note:</b> when active, this setting will slow down your Internet connectivity speed (uses Thor network).</string>
     <string name="ipscrambling_location_label">Force a country of origin:</string>
     <string name="ipscrambling_any_location">Any country</string>
-
     <string name="ipscrambling_select_app">Apply this setting to all selected apps:</string>
 
+    <!-- Location -->
+    <string name="location_title">Fake my location</string>
+    <string name="location_info">Choose if you want to use your real location when Quick Privacy is enabled.</string>
+    <string name="location_use_real_location">Use real location</string>
+    <string name="location_use_random_location">Use random plausible location</string>
+    <string name="location_use_specific_location">Use specific location</string>
+    <string name="location_hint_longitude">Longitude</string>
+    <string name="location_hint_latitude">Latitude</string>
+    <string name="location_input_error">Invalid coordinates</string>
+
     <!-- -->
     <string name="quick_protection_info">Quick protection enables these settings when turned on</string>
     <string name="quick_protection_settings_list"> - All trackers are turned off.\n- Your geolocation will be faked.\n- Your real IP address will be hidden.</string>
     <string name="learn_more">Learn more</string>
-    <string name="fake_location_info">Choose if you want to fake your real location when app asks for your geolocation tracking.</string>
-    <string name="use_real_location">Use real location</string>
-    <string name="use_random_location">Use random plausible location</string>
-    <string name="use_specific_location">Use specific location</string>
-    <string name="longitude">Longitude</string>
-    <string name="latitude">Latitude</string>
+
     <string name="add_location">Add location</string>
     <string name="i_am_exposing">I am exposing my real IP address</string>
     <string name="ipscrambling_all_apps_scrambled">All apps use hidden IP</string>