cilly/Banksia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: extract route info box to composable

Browse source
This commit is contained in:
LavaDesu 2025-05-01 19:57:35 +10:00
parent 7281f6e1ba
commit ba367d106c
Signed by: cilly
GPG key ID: 6500251E087653C9
1 changed files with 48 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

86
composeApp/src/commonMain/kotlin/moe/lava/banksia/ui/Searcher.kt
View file

@ -87,7 +87,7 @@ fun Searcher(
inputField = { inputField = {
var backProgress by remember { mutableFloatStateOf(1f) } var backProgress by remember { mutableFloatStateOf(1f) }
var backEdgeIsLeft by remember { mutableStateOf<Boolean?>(null) } var backEdgeIsLeft by remember { mutableStateOf<Boolean?>(null) }
val boxOpacityState by animateFloatAsState((1f - backProgress).pow(3)) val routeInfoOpacity by animateFloatAsState((1f - backProgress).pow(3))
val slideState by animateDpAsState((50 * backProgress).dp) val slideState by animateDpAsState((50 * backProgress).dp)
val slidePadding = if (backEdgeIsLeft == true) val slidePadding = if (backEdgeIsLeft == true)
PaddingValues(start = slideState) PaddingValues(start = slideState)
@ -112,7 +112,7 @@ fun Searcher(
SearchBarDefaults.InputField( SearchBarDefaults.InputField(
enabled = route == null, enabled = route == null,
modifier = Modifier modifier = Modifier
.alpha(1f - boxOpacityState) .alpha(1f - routeInfoOpacity)
.padding(horizontal = 20.dp - animatedPadding), .padding(horizontal = 20.dp - animatedPadding),
query = text, query = text,
onQueryChange = onTextChange, onQueryChange = onTextChange,
@ -132,42 +132,8 @@ fun Searcher(
LaunchedEffect(route) { LaunchedEffect(route) {
backProgress = if (route != null) 0f else 1f; backProgress = if (route != null) 0f else 1f;
} }
if (route != null) { if (route != null)
Box( RouteInfo(routeInfoOpacity, slidePadding, onRouteChange, route)
modifier = Modifier
.alpha(boxOpacityState)
.sizeIn(
minHeight = SearchBarDefaults.InputFieldHeight,
maxHeight = SearchBarDefaults.InputFieldHeight,
)
.fillMaxWidth()
.padding(slidePadding)
) {
IconButton(
modifier = Modifier.align(Alignment.CenterStart),
onClick = {
onRouteChange(null)
}
) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, "Clear route")
}
Row(
modifier = Modifier
.padding(horizontal = 50.dp)
.align(Alignment.Center),
verticalAlignment = Alignment.CenterVertically,
) {
route.routeType.ComposableIcon()
Spacer(Modifier.width(15.dp))
Text(
route.routeNumber.ifEmpty { route.routeName },
style = MaterialTheme.typography.headlineSmall,
overflow = TextOverflow.Ellipsis,
maxLines = 1,
)
}
}
}
}, },
expanded = expanded, expanded = expanded,
onExpandedChange = onExpandedChange, onExpandedChange = onExpandedChange,
@ -202,3 +168,47 @@ fun Searcher(
} }
} }
} }
@Composable
@OptIn(ExperimentalMaterial3Api::class)
private fun RouteInfo(
routeInfoOpacity: Float,
slidePadding: PaddingValues,
onRouteChange: (PtvRoute?) -> Unit,
route: PtvRoute
) {
Box(
modifier = Modifier
.alpha(routeInfoOpacity)
.sizeIn(
minHeight = SearchBarDefaults.InputFieldHeight,
maxHeight = SearchBarDefaults.InputFieldHeight,
)
.fillMaxWidth()
.padding(slidePadding)
) {
IconButton(
modifier = Modifier.align(Alignment.CenterStart),
onClick = {
onRouteChange(null)
}
) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, "Clear route")
}
Row(
modifier = Modifier
.padding(horizontal = 50.dp)
.align(Alignment.Center),
verticalAlignment = Alignment.CenterVertically,
) {
route.routeType.ComposableIcon()
Spacer(Modifier.width(15.dp))
Text(
route.routeNumber.ifEmpty { route.routeName },
style = MaterialTheme.typography.headlineSmall,
overflow = TextOverflow.Ellipsis,
maxLines = 1,
)
}
}
}