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

Simplify location picker

Browse source
This commit is contained in:
Henry Hiles 2023-12-25 11:06:04 -05:00
parent 3c9e1b4557
commit 1a8b022681
1 changed files with 23 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,39 +33,23 @@ class LocationPickerScreen : Screen {
@Composable
override fun Content() {
val screenModel: LocationPickerScreenModel = getScreenModel()
var location by remember {
mutableStateOf<GeocodingData?>(null)
}
var locationSearch by remember { mutableStateOf("") }
var isAboutOpen by remember { mutableStateOf(false) }
val navigator = LocalNavigator.currentOrThrow
Scaffold(
modifier = Modifier.imePadding(),
floatingActionButton = {
FloatingActionButton(onClick = {
location?.let {
with(screenModel.prefs) {
if (it !in locations) {
this.locations += it
selectedIndex =
locations.count() - 1
}
}
// FloatingActionButton(onClick = {
with(navigator) {
if (canPop) pop() else push(MainScreen())
}
} ?: kotlin.run { isAboutOpen = true }
}) {
Icon(
imageVector = Icons.Default.Check,
contentDescription = stringResource(id = R.string.action_apply)
)
}
}
) {
Column(modifier = Modifier.padding(it)) {
// } ?: kotlin.run { isAboutOpen = true }
// }) {
// Icon(
// imageVector = Icons.Default.Check,
// contentDescription = stringResource(id = R.string.action_apply)
// )
// }
) {padding ->
Column(modifier = Modifier.padding(padding)) {
SmallToolbar(
title = { Text(text = stringResource(id = R.string.location_choose)) },
backButton = screenModel.prefs.locations.isNotEmpty(),
@ -159,25 +143,26 @@ class LocationPickerScreen : Screen {
}
LazyColumn {
items(results) {
val selected = it == location
Spacer(modifier = Modifier.height(8.dp))
Card(modifier = Modifier.clickable { location = it }) {
Card(modifier = Modifier.clickable {
with(screenModel.prefs) {
if (it !in locations) {
locations += it
selectedIndex =
locations.count() - 1
}
}
with(navigator) {
if (canPop) pop() else push(MainScreen())
}
}) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically
) {
if (selected) {
Icon(
imageVector = Icons.Default.Check,
contentDescription = stringResource(
id = R.string.selected
),
modifier = Modifier.height(16.dp)
)
Spacer(modifier = Modifier.width(8.dp))
}
Text(text = it.location)
}
}