From bfccbf2db881dce4e63fa552530e28e1128d7735 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Wed, 10 May 2023 09:37:55 -0400
Subject: [PATCH] Some code cleanups, and a bug fix

---
 .../qweather/presentation/screen/LocationPickerScreen.kt   | 7 ++++---
 .../henryhiles/qweather/presentation/tabs/SettingsTab.kt   | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 1e1a6b4..205ebe6 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
@@ -22,6 +22,7 @@ import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.koin.getScreenModel
 import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
 import com.henryhiles.qweather.R
 import com.henryhiles.qweather.domain.geocoding.GeocodingData
 import com.henryhiles.qweather.presentation.components.navigation.SmallToolbar
@@ -37,7 +38,7 @@ class LocationPickerScreen : Screen {
         }
         var locationSearch by remember { mutableStateOf("") }
         var isAboutOpen by remember { mutableStateOf(false) }
-        val navigator = LocalNavigator.current
+        val navigator = LocalNavigator.currentOrThrow
 
         Scaffold(
             modifier = Modifier.imePadding(),
@@ -53,7 +54,7 @@ class LocationPickerScreen : Screen {
                         }
 
                         with(navigator) {
-                            if (this != null) if (canPop) pop() else push(MainScreen())
+                            if (canPop) pop() else push(MainScreen())
                         }
                     } ?: kotlin.run { isAboutOpen = true }
                 }) {
@@ -67,7 +68,7 @@ class LocationPickerScreen : Screen {
             Column {
                 SmallToolbar(
                     title = { Text(text = stringResource(id = R.string.location_choose)) },
-                    backButton = true,
+                    backButton = screenModel.prefs.locations.isNotEmpty(),
                     actions = {
                         IconButton(
                             onClick = { isAboutOpen = true }) {
diff --git a/app/src/main/java/com/henryhiles/qweather/presentation/tabs/SettingsTab.kt b/app/src/main/java/com/henryhiles/qweather/presentation/tabs/SettingsTab.kt
index f398520..bf6bf5d 100644
--- a/app/src/main/java/com/henryhiles/qweather/presentation/tabs/SettingsTab.kt
+++ b/app/src/main/java/com/henryhiles/qweather/presentation/tabs/SettingsTab.kt
@@ -13,7 +13,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.res.stringResource
 import cafe.adriel.voyager.navigator.LocalNavigator
-import cafe.adriel.voyager.navigator.currentOrThrow
 import cafe.adriel.voyager.navigator.tab.TabOptions
 import com.henryhiles.qweather.R
 import com.henryhiles.qweather.domain.util.NavigationTab
@@ -58,7 +57,7 @@ object SettingsTab : NavigationTab {
 
     @Composable
     override fun Actions() {
-        val navigator = LocalNavigator.currentOrThrow.parent
+        val navigator = LocalNavigator.current?.parent
 
         IconButton(onClick = { navigator?.push(AboutScreen()) }) {
             Icon(