From 35438ebcb0fe840b7c6a8b6d383aa913ffd20cc3 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 18 Apr 2023 10:01:33 -0400
Subject: [PATCH] Remove location stuff for now

---
 app/src/main/AndroidManifest.xml              |  2 -
 .../java/com/henryhiles/qweather/QWeather.kt  |  7 ++-
 .../henryhiles/qweather/di/LocationModule.kt  |  9 ---
 .../domain/location/LocationTracker.kt        | 29 ---------
 .../screen/LocationPickerScreen.kt            | 59 ++++++++-----------
 .../screenmodel/LocationPickerScreenModel.kt  |  3 -
 app/src/main/res/values/strings.xml           |  2 +-
 7 files changed, 32 insertions(+), 79 deletions(-)
 delete mode 100644 app/src/main/java/com/henryhiles/qweather/di/LocationModule.kt
 delete mode 100644 app/src/main/java/com/henryhiles/qweather/domain/location/LocationTracker.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 337df8f..14bf66a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,8 +3,6 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:name=".QWeather"
diff --git a/app/src/main/java/com/henryhiles/qweather/QWeather.kt b/app/src/main/java/com/henryhiles/qweather/QWeather.kt
index 65a9430..7990031 100644
--- a/app/src/main/java/com/henryhiles/qweather/QWeather.kt
+++ b/app/src/main/java/com/henryhiles/qweather/QWeather.kt
@@ -1,7 +1,10 @@
 package com.henryhiles.qweather
 
 import android.app.Application
-import com.henryhiles.qweather.di.*
+import com.henryhiles.qweather.di.appModule
+import com.henryhiles.qweather.di.managerModule
+import com.henryhiles.qweather.di.repositoryModule
+import com.henryhiles.qweather.di.screenModelModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 
@@ -11,7 +14,7 @@ class QWeather : Application() {
         startKoin {
             androidContext(this@QWeather)
             modules(
-                appModule, locationModule, repositoryModule, screenModelModule, managerModule
+                appModule, repositoryModule, screenModelModule, managerModule
             )
         }
     }
diff --git a/app/src/main/java/com/henryhiles/qweather/di/LocationModule.kt b/app/src/main/java/com/henryhiles/qweather/di/LocationModule.kt
deleted file mode 100644
index 0bf4610..0000000
--- a/app/src/main/java/com/henryhiles/qweather/di/LocationModule.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.henryhiles.qweather.di
-
-import com.henryhiles.qweather.domain.location.LocationTracker
-import org.koin.core.module.dsl.singleOf
-import org.koin.dsl.module
-
-val locationModule = module {
-    singleOf(::LocationTracker)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/henryhiles/qweather/domain/location/LocationTracker.kt b/app/src/main/java/com/henryhiles/qweather/domain/location/LocationTracker.kt
deleted file mode 100644
index 747a18e..0000000
--- a/app/src/main/java/com/henryhiles/qweather/domain/location/LocationTracker.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.henryhiles.qweather.domain.location
-
-import android.Manifest
-import android.app.Application
-import android.content.Context
-import android.content.pm.PackageManager
-import android.location.Location
-import android.location.LocationManager
-import androidx.core.content.ContextCompat
-
-class LocationTracker(
-    private val application: Application
-) {
-    fun getCurrentLocation(): Location? {
-        val hasAccessFineLocationPermission = ContextCompat.checkSelfPermission(
-            application,
-            Manifest.permission.ACCESS_FINE_LOCATION
-        ) == PackageManager.PERMISSION_GRANTED
-
-        val locationManager =
-            application.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-        val isGpsEnabled = locationManager.isProviderEnabled(
-            LocationManager.GPS_PROVIDER
-        )
-        if (!hasAccessFineLocationPermission || !isGpsEnabled) return null
-        
-        return locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/henryhiles/qweather/presentation/screen/LocationPickerScreen.kt b/app/src/main/java/com/henryhiles/qweather/presentation/screen/LocationPickerScreen.kt
index 7d1fe56..883f3b8 100644
--- a/app/src/main/java/com/henryhiles/qweather/presentation/screen/LocationPickerScreen.kt
+++ b/app/src/main/java/com/henryhiles/qweather/presentation/screen/LocationPickerScreen.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material.icons.outlined.MyLocation
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
@@ -41,19 +40,23 @@ class LocationPickerScreen : Screen {
         val navigator = LocalNavigator.current
         val context = LocalContext.current
 
-        Scaffold(floatingActionButton = {
-            FloatingActionButton(onClick = {
-                screenModel.prefs.location = location
-                screenModel.prefs.latitude = latitude
-                screenModel.prefs.longitude = longitude
-                navigator?.push(MainScreen())
+        Scaffold(modifier = Modifier.imePadding(),
+            floatingActionButton = {
+                FloatingActionButton(onClick = {
+                    if (location == "") isAboutOpen = true
+                    else {
+                        screenModel.prefs.location = location
+                        screenModel.prefs.latitude = latitude
+                        screenModel.prefs.longitude = longitude
+                        navigator?.push(MainScreen())
+                    }
+                }) {
+                    Icon(
+                        imageVector = Icons.Default.Check,
+                        contentDescription = stringResource(id = R.string.action_apply)
+                    )
+                }
             }) {
-                Icon(
-                    imageVector = Icons.Default.Check,
-                    contentDescription = stringResource(id = R.string.action_apply)
-                )
-            }
-        }) {
             screenModel.state.error?.let {
                 AlertDialog(
                     onDismissRequest = {},
@@ -107,26 +110,16 @@ class LocationPickerScreen : Screen {
                             value = locationSearch,
                             onValueChange = { locationSearch = it },
                             trailingIcon = {
-                                if (locationSearch == "")
-                                    IconButton(onClick = {
-
-                                    }) {
-                                        Icon(
-                                            imageVector = Icons.Outlined.MyLocation,
-                                            contentDescription = stringResource(id = R.string.location_auto_pick)
-                                        )
-                                    }
-                                else
-                                    IconButton(onClick = {
-                                        screenModel.loadGeolocationInfo(
-                                            locationSearch
-                                        )
-                                    }) {
-                                        Icon(
-                                            imageVector = Icons.Outlined.Search,
-                                            contentDescription = stringResource(id = R.string.action_search)
-                                        )
-                                    }
+                                IconButton(onClick = {
+                                    screenModel.loadGeolocationInfo(
+                                        locationSearch
+                                    )
+                                }, enabled = locationSearch != "") {
+                                    Icon(
+                                        imageVector = Icons.Outlined.Search,
+                                        contentDescription = stringResource(id = R.string.action_search)
+                                    )
+                                }
                             },
                             modifier = Modifier.fillMaxWidth()
                         )
diff --git a/app/src/main/java/com/henryhiles/qweather/presentation/screenmodel/LocationPickerScreenModel.kt b/app/src/main/java/com/henryhiles/qweather/presentation/screenmodel/LocationPickerScreenModel.kt
index d9d94cf..b946c8c 100644
--- a/app/src/main/java/com/henryhiles/qweather/presentation/screenmodel/LocationPickerScreenModel.kt
+++ b/app/src/main/java/com/henryhiles/qweather/presentation/screenmodel/LocationPickerScreenModel.kt
@@ -6,7 +6,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.coroutineScope
-import com.henryhiles.qweather.domain.location.LocationTracker
 import com.henryhiles.qweather.domain.manager.BasePreferenceManager
 import com.henryhiles.qweather.domain.remote.GeocodingLocationDto
 import com.henryhiles.qweather.domain.repository.GeocodingRepository
@@ -29,8 +28,6 @@ class LocationPreferenceManager(context: Context) :
 class LocationPickerScreenModel(
     val prefs: LocationPreferenceManager,
     private val repository: GeocodingRepository,
-    private val locationTracker: LocationTracker,
-    private val context: Context
 ) : ScreenModel {
     var state by mutableStateOf(LocationPickerState())
         private set
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d34db7..c2fc7e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
     <string name="selected">Selected</string>x
 
     <string name="help_screen">How do I use this screen?</string>
-    <string name="help_location_picker">Please either tap the auto-pick button or enter a location. Then tap the apply button in the bottom left corner.</string>
+    <string name="help_location_picker">Please search a location, then tap a result. Then tap the apply button in the bottom left corner.</string>
 
     <string name="appearance_theme">Theme</string>
     <string name="appearance_monet">Dynamic Theme</string>