Add random city array and fix issue with location picking with map

2 files changed, 65 insertions, 42 deletions

diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml
index 38faf67..d67a981 100644
--- a/app/src/main/res/layout/fragment_fake_location.xml
+++ b/app/src/main/res/layout/fragment_fake_location.xml
@@ -3,30 +3,30 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:mapbox="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"
     >
 
     <Toolbar
+        android:background="@color/white"
         android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
         android:layout_gravity="top|center"
-        android:background="@color/white"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_width="match_parent"
         tools:layout_height="56dp"
         />
 
     <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?android:attr/actionBarSize"
         android:layout_marginBottom="32dp"
+        android:layout_marginTop="?android:attr/actionBarSize"
+        android:layout_width="match_parent"
         >
 
         <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"
@@ -35,9 +35,9 @@
 
             <TextView
                 android:id="@+id/fake_location_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/fake_location_info"
                 android:textColor="@color/black"
@@ -45,23 +45,23 @@
                 />
 
             <TextView
-                android:id="@+id/learn_more_fake_location"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
                 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:text="@string/learn_more"
                 android:textColor="#007fff"
                 android:textSize="14sp"
                 />
 
             <TextView
+                android:fontFamily="sans-serif-medium"
                 android:id="@+id/my_location_header"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-medium"
-                android:paddingTop="16dp"
+                android:layout_width="wrap_content"
                 android:paddingBottom="8dp"
+                android:paddingTop="16dp"
                 android:text="@string/my_location_title"
                 android:textColor="@color/black"
                 android:textSize="14sp"
@@ -69,31 +69,31 @@
 
             <RadioGroup
                 android:id="@+id/location_choices"
-                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_width="match_parent"
                 android:orientation="vertical"
                 >
 
                 <foundation.e.privacycentralapp.common.RightRadioButton
                     android:id="@+id/radio_use_real_location"
-                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
                     android:text="@string/use_real_location"
                     android:textSize="16sp"
                     />
 
                 <foundation.e.privacycentralapp.common.RightRadioButton
                     android:id="@+id/radio_use_random_location"
-                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
                     android:text="@string/use_random_location"
                     android:textSize="16sp"
                     />
 
                 <foundation.e.privacycentralapp.common.RightRadioButton
                     android:id="@+id/radio_use_specific_location"
-                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
                     android:text="@string/use_specific_location"
                     android:textSize="16sp"
                     />
@@ -102,53 +102,44 @@
 
             <foundation.e.privacycentralapp.features.location.FakeLocationMapView
                 android:id="@+id/mapView"
-                android:layout_width="match_parent"
                 android:layout_height="240dp"
-                mapbox:mapbox_cameraZoom="15"
-                android:layout_marginTop="32dp"
                 android:layout_marginBottom="32dp"
+                android:layout_marginTop="32dp"
+                android:layout_width="match_parent"
+                mapbox:mapbox_cameraZoom="8"
                 />
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/edittext_longitude"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:hint="@string/longitude"
+                android:id="@+id/edittext_longitude"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
                 >
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     android:inputType="numberDecimal"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
                     />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/edittext_latitude"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="match_parent"
+                android:hint="@string/latitude"
+                android:id="@+id/edittext_latitude"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:hint="@string/latitude"
+                android:layout_width="match_parent"
                 >
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     android:inputType="numberDecimal"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
                     />
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
-                android:id="@+id/button_add_location"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="32dp"
-                android:text="@string/add_location"
-                app:backgroundTint="#007fff"
-                />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..702947b
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ 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/>.
+  -->
+
+<resources>
+    <string-array name="cities">
+        <item>Barcelona</item>
+        <item>Budapest</item>
+        <item>Abu Dhabi</item>
+        <item>Hyderabad</item>
+        <item>Quezon City</item>
+        <item>Paris</item>
+        <item>London</item>
+        <item>Shanghai</item>
+        <item>Madrid</item>
+        <item>Lahore</item>
+        <item>Chicago</item>
+    </string-array>
+</resources>
\ No newline at end of file