Henry-Hiles/QWeather
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some code cleanups, and a bug fix

Browse source
This commit is contained in:
Henry Hiles 2023-05-10 09:37:55 -04:00
parent dde95a1c6b
commit bfccbf2db8
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/henryhiles/qweather/presentation/screen/LocationPickerScreen.kt
View file

@ -22,6 +22,7 @@ import androidx.compose.ui.unit.dp
import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.Screen
import cafe.adriel.voyager.koin.getScreenModel import cafe.adriel.voyager.koin.getScreenModel
import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import com.henryhiles.qweather.R import com.henryhiles.qweather.R
import com.henryhiles.qweather.domain.geocoding.GeocodingData import com.henryhiles.qweather.domain.geocoding.GeocodingData
import com.henryhiles.qweather.presentation.components.navigation.SmallToolbar import com.henryhiles.qweather.presentation.components.navigation.SmallToolbar
@ -37,7 +38,7 @@ class LocationPickerScreen : Screen {
} }
var locationSearch by remember { mutableStateOf("") } var locationSearch by remember { mutableStateOf("") }
var isAboutOpen by remember { mutableStateOf(false) } var isAboutOpen by remember { mutableStateOf(false) }
val navigator = LocalNavigator.current val navigator = LocalNavigator.currentOrThrow
Scaffold( Scaffold(
modifier = Modifier.imePadding(), modifier = Modifier.imePadding(),
@ -53,7 +54,7 @@ class LocationPickerScreen : Screen {
} }
with(navigator) { with(navigator) {
if (this != null) if (canPop) pop() else push(MainScreen()) if (canPop) pop() else push(MainScreen())
} }
} ?: kotlin.run { isAboutOpen = true } } ?: kotlin.run { isAboutOpen = true }
}) { }) {
@ -67,7 +68,7 @@ class LocationPickerScreen : Screen {
Column { Column {
SmallToolbar( SmallToolbar(
title = { Text(text = stringResource(id = R.string.location_choose)) }, title = { Text(text = stringResource(id = R.string.location_choose)) },
backButton = true, backButton = screenModel.prefs.locations.isNotEmpty(),
actions = { actions = {
IconButton( IconButton(
onClick = { isAboutOpen = true }) { onClick = { isAboutOpen = true }) {

3
app/src/main/java/com/henryhiles/qweather/presentation/tabs/SettingsTab.kt
View file

@ -13,7 +13,6 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import cafe.adriel.voyager.navigator.tab.TabOptions import cafe.adriel.voyager.navigator.tab.TabOptions
import com.henryhiles.qweather.R import com.henryhiles.qweather.R
import com.henryhiles.qweather.domain.util.NavigationTab import com.henryhiles.qweather.domain.util.NavigationTab
@ -58,7 +57,7 @@ object SettingsTab : NavigationTab {
@Composable @Composable
override fun Actions() { override fun Actions() {
val navigator = LocalNavigator.currentOrThrow.parent val navigator = LocalNavigator.current?.parent
IconButton(onClick = { navigator?.push(AboutScreen()) }) { IconButton(onClick = { navigator?.push(AboutScreen()) }) {
Icon( Icon(