Reformat code

lilstiffy · Aug 20, 2024 · 2304ec4 · 2304ec4
1 parent 6ccbbd4
commit 2304ec4
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 58 deletions.
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 4,
-      "versionName": "1.0.3",
+      "versionCode": 5,
+      "versionName": "1.0.4",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/androidTest/java/com/lilstiffy/mockgps/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/lilstiffy/mockgps/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package com.lilstiffy.mockgps
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

diff --git a/app/src/main/java/com/lilstiffy/mockgps/MainActivity.kt b/app/src/main/java/com/lilstiffy/mockgps/MainActivity.kt
@@ -4,27 +4,17 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.location.Location
-import android.location.LocationListener
-import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
-import android.util.Log
-import android.view.WindowInsets
-import android.view.WindowInsetsController
-import android.view.WindowManager
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.core.view.WindowCompat
 import com.lilstiffy.mockgps.service.LocationHelper
 import com.lilstiffy.mockgps.service.MockLocationService
@@ -65,8 +55,7 @@ class MainActivity : ComponentActivity() {
                 VibratorService.vibrate()
                 return false
             }
-        }
-        else if (!isBound && LocationHelper.hasPermission(this))
+        } else if (!isBound && LocationHelper.hasPermission(this))
             Toast.makeText(this, "Service not bound", Toast.LENGTH_SHORT).show()
         else
             Toast.makeText(this, "No Location permission", Toast.LENGTH_SHORT).show()
@@ -76,7 +65,7 @@ class MainActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window,false)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
 
         setContent {
             MockGpsTheme {

diff --git a/app/src/main/java/com/lilstiffy/mockgps/MockGpsApp.kt b/app/src/main/java/com/lilstiffy/mockgps/MockGpsApp.kt
@@ -1,11 +1,10 @@
 package com.lilstiffy.mockgps
 
 import android.app.Application
-import android.os.VibratorManager
 import com.lilstiffy.mockgps.service.VibratorService
 import com.lilstiffy.mockgps.storage.StorageManager
 
-class MockGpsApp: Application() {
+class MockGpsApp : Application() {
     companion object {
         lateinit var shared: MockGpsApp
             private set

diff --git a/app/src/main/java/com/lilstiffy/mockgps/service/LocationHelper.kt b/app/src/main/java/com/lilstiffy/mockgps/service/LocationHelper.kt
@@ -1,6 +1,7 @@
 package com.lilstiffy.mockgps.service
 
-import android.Manifest.permission.*
+import android.Manifest.permission.ACCESS_COARSE_LOCATION
+import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.content.pm.PackageManager
 import android.location.Address
 import android.location.Geocoder
@@ -25,7 +26,10 @@ object LocationHelper {
     }
 
     fun hasPermission(activity: ComponentActivity): Boolean {
-        return ContextCompat.checkSelfPermission(activity, ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
+        return ContextCompat.checkSelfPermission(
+            activity,
+            ACCESS_FINE_LOCATION
+        ) == PackageManager.PERMISSION_GRANTED
     }
 
     // Geocoding

diff --git a/app/src/main/java/com/lilstiffy/mockgps/service/MockLocationService.kt b/app/src/main/java/com/lilstiffy/mockgps/service/MockLocationService.kt
@@ -5,7 +5,6 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.location.Location
-import android.location.LocationListener
 import android.location.LocationManager
 import android.location.provider.ProviderProperties
 import android.os.Binder

diff --git a/app/src/main/java/com/lilstiffy/mockgps/service/VibratorService.kt b/app/src/main/java/com/lilstiffy/mockgps/service/VibratorService.kt
@@ -12,7 +12,8 @@ object VibratorService {
 
     fun initialise(context: Context) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            vibrator_s = context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager
+            vibrator_s =
+                context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager
         } else {
             vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
         }

diff --git a/app/src/main/java/com/lilstiffy/mockgps/ui/components/FavoritesListComponent.kt b/app/src/main/java/com/lilstiffy/mockgps/ui/components/FavoritesListComponent.kt
@@ -30,18 +30,19 @@ fun FavoritesListComponent(
     onDismissRequest: () -> Unit,
     sheetState: SheetState,
     data: List<LocationEntry>,
-    onEntryClicked: (entry: LocationEntry) -> Unit
+    onEntryClicked: (entry: LocationEntry) -> Unit,
 ) {
     ModalBottomSheet(
         modifier = Modifier
             .fillMaxWidth()
             .fillMaxHeight(0.75f),
-        onDismissRequest =  onDismissRequest,
+        onDismissRequest = onDismissRequest,
         sheetState = sheetState,
-        windowInsets = WindowInsets(0,0,0,0)
+        windowInsets = WindowInsets(0, 0, 0, 0)
     ) {
         Column(
-            modifier = Modifier.fillMaxWidth()
+            modifier = Modifier
+                .fillMaxWidth()
                 .padding(horizontal = 8.dp)
         ) {
             // Title

diff --git a/app/src/main/java/com/lilstiffy/mockgps/ui/components/FooterComponent.kt b/app/src/main/java/com/lilstiffy/mockgps/ui/components/FooterComponent.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -17,7 +16,6 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Place
 import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material.icons.sharp.Favorite
 import androidx.compose.material.icons.sharp.Star
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -31,7 +29,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.google.android.gms.maps.model.LatLng
@@ -41,7 +38,6 @@ import com.lilstiffy.mockgps.service.VibratorService
 import com.lilstiffy.mockgps.ui.theme.ButtonGreen
 import com.lilstiffy.mockgps.ui.theme.ButtonRed
 import com.lilstiffy.mockgps.ui.theme.Gold
-import com.lilstiffy.mockgps.ui.theme.TextBody
 
 @Composable
 fun FooterComponent(
@@ -51,13 +47,14 @@ fun FooterComponent(
     isMocking: Boolean,
     isFavorite: Boolean = false,
     onStart: () -> Unit,
-    onFavorite: () -> Unit
+    onFavorite: () -> Unit,
 ) {
-    Box(modifier = modifier
-        .background(
-            color = MaterialTheme.colorScheme.surface,
-            shape = RoundedCornerShape(16.dp)
-        )
+    Box(
+        modifier = modifier
+            .background(
+                color = MaterialTheme.colorScheme.surface,
+                shape = RoundedCornerShape(16.dp)
+            )
     ) {
         Column(
             modifier = Modifier
@@ -141,7 +138,7 @@ fun FooterComponent(
                         contentDescription = "toggle favorite"
                     )
                 }
-                
+
                 Spacer(modifier = Modifier.width(16.dp))
 
                 // Toggle mocking button

diff --git a/app/src/main/java/com/lilstiffy/mockgps/ui/components/SearchComponent.kt b/app/src/main/java/com/lilstiffy/mockgps/ui/components/SearchComponent.kt
@@ -3,9 +3,7 @@ package com.lilstiffy.mockgps.ui.components
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
@@ -38,7 +36,7 @@ import androidx.compose.ui.unit.dp
 @Composable
 fun SearchComponent(
     modifier: Modifier = Modifier,
-    onSearch: (text: String) -> Unit
+    onSearch: (text: String) -> Unit,
 ) {
     var text by remember { mutableStateOf("") }
     val keyboardController = LocalSoftwareKeyboardController.current

diff --git a/app/src/main/java/com/lilstiffy/mockgps/ui/components/listitems/FavoriteListItem.kt b/app/src/main/java/com/lilstiffy/mockgps/ui/components/listitems/FavoriteListItem.kt
@@ -19,17 +19,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.lilstiffy.mockgps.extensions.displayString
 import com.lilstiffy.mockgps.extensions.prettyPrint
 import com.lilstiffy.mockgps.ui.models.LocationEntry
-import com.lilstiffy.mockgps.ui.theme.FederalBlue
-import com.lilstiffy.mockgps.ui.theme.TextBody
 
 @Composable
 fun FavoriteListItem(
     modifier: Modifier = Modifier,
     locationEntry: LocationEntry,
-    onClick: () -> Unit
+    onClick: () -> Unit,
 ) {
     Column(
         modifier = modifier

diff --git a/app/src/main/java/com/lilstiffy/mockgps/ui/models/LocationEntry.kt b/app/src/main/java/com/lilstiffy/mockgps/ui/models/LocationEntry.kt
@@ -4,5 +4,5 @@ import com.google.android.gms.maps.model.LatLng
 
 data class LocationEntry(
     var latLng: LatLng,
-    var addressLine: String? = null
+    var addressLine: String? = null,
 )
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
@@ -55,7 +55,7 @@ import kotlinx.coroutines.launch
 @Composable
 fun MapScreen(
     mapViewModel: MapViewModel = viewModel(),
-    activity: MainActivity
+    activity: MainActivity,
 ) {
     val scope = rememberCoroutineScope()
 
@@ -83,7 +83,7 @@ fun MapScreen(
         }
     }
 
-    Box(modifier = Modifier.fillMaxSize()){
+    Box(modifier = Modifier.fillMaxSize()) {
         // Google maps
         GoogleMap(
             modifier = Modifier.fillMaxSize(),
@@ -127,7 +127,11 @@ fun MapScreen(
                 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()
+                        Toast.makeText(
+                            activity,
+                            "You can't search while mocking location",
+                            Toast.LENGTH_SHORT
+                        ).show()
                         return@SearchComponent
                     }
 
@@ -182,7 +186,11 @@ fun MapScreen(
                 data = StorageManager.favorites,
                 onEntryClicked = { clickedEntry ->
                     if (isMocking) {
-                        Toast.makeText(activity, "You can't switch location while mocking", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(
+                            activity,
+                            "You can't switch location while mocking",
+                            Toast.LENGTH_SHORT
+                        ).show()
                         return@FavoritesListComponent
                     }
                     mapViewModel.apply {

diff --git a/app/src/main/java/com/lilstiffy/mockgps/ui/theme/Theme.kt b/app/src/main/java/com/lilstiffy/mockgps/ui/theme/Theme.kt
@@ -2,7 +2,6 @@ package com.lilstiffy.mockgps.ui.theme
 
 import android.app.Activity
 import android.os.Build
-import android.view.View
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
@@ -16,8 +15,6 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
-import com.google.android.gms.maps.model.MapStyleOptions
-import com.lilstiffy.mockgps.R
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -46,13 +43,14 @@ fun MockGpsTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     // Dynamic color is available on Android 12+
     dynamicColor: Boolean = true,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     val colorScheme = when {
         dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
             val context = LocalContext.current
             if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
         }
+
         darkTheme -> DarkColorScheme
         else -> LightColorScheme
     }

diff --git a/app/src/test/java/com/lilstiffy/mockgps/ExampleUnitTest.kt b/app/src/test/java/com/lilstiffy/mockgps/ExampleUnitTest.kt
@@ -1,9 +1,8 @@
 package com.lilstiffy.mockgps
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *