no movements of marker while already mocking through search

lilstiffy · Nov 27, 2023 · f8602f4 · f8602f4
1 parent 99e3ece
commit f8602f4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/app/release/mockgps-app-release.apk b/app/release/mockgps-app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.lilstiffy.mockgps",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
diff --git a/app/src/main/java/com/lilstiffy/mockgps/storage/StorageManager.kt b/app/src/main/java/com/lilstiffy/mockgps/storage/StorageManager.kt
@@ -30,7 +30,7 @@ object StorageManager {
         }
     }
 
-    var locationHistory: MutableList<LatLng>
+    private var locationHistory: MutableList<LatLng>
         get() {
             val json = pref.getString(KEY_HISTORY, "[]")
             val typeToken = object : TypeToken<MutableList<LatLng>>() {}

diff --git a/app/src/main/java/com/lilstiffy/mockgps/ui/screens/MapScreen.kt b/app/src/main/java/com/lilstiffy/mockgps/ui/screens/MapScreen.kt
@@ -1,5 +1,6 @@
 package com.lilstiffy.mockgps.ui.screens
 
+import android.widget.Toast
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -103,7 +104,7 @@ fun MapScreen(activity: MainActivity) {
                 .align(Alignment.BottomEnd),
             checked = isMocking,
             onCheckedChange = { checked ->
-                isMocking = activity.toggleMocking() ?: isMocking
+                isMocking = activity.toggleMocking()
             },
             colors = IconButtonDefaults.filledIconToggleButtonColors(
                 checkedContainerColor = ButtonRed, containerColor = ButtonGreen, contentColor = Color.White
@@ -127,6 +128,12 @@ fun MapScreen(activity: MainActivity) {
                 .fillMaxHeight(0.075f)
                 .fillMaxWidth(),
             onSearch = { searchTerm ->
+                // We don't want to support switching locations while already mocking
+                if (isMocking) {
+                    Toast.makeText(activity, "You can't search while mocking location", Toast.LENGTH_SHORT).show()
+                    return@SearchComponent
+                }
+
                 LocationHelper.geocoding(searchTerm) { foundLatLng ->
                     foundLatLng?.let {
                         markerPosition = it