lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

LocationItem: show {Open,Closed} in search result when details are not shown (#1320)

Browse Source
This commit is contained in:
Christoph 2025-03-29 17:27:11 +01:00 committed by GitHub
parent bceae1aa58
commit a0bc07fe14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt
View File

@ -92,6 +92,7 @@ import androidx.compose.ui.unit.TextUnitType
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.max import androidx.compose.ui.unit.max
import androidx.compose.ui.unit.times import androidx.compose.ui.unit.times
import androidx.compose.ui.util.fastFilterNotNull
import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import blend.Blend.harmonize import blend.Blend.harmonize
@ -210,15 +211,12 @@ fun LocationItem(
val formattedDistance = distance?.metersToLocalizedString( val formattedDistance = distance?.metersToLocalizedString(
context, imperialUnits context, imperialUnits
) )
if (category != null || formattedDistance != null) { val isOpenString = location.openingSchedule?.isOpen()?.let { stringResource(if (it) R.string.location_open else R.string.location_closed) }
if (category != null || formattedDistance != null || isOpenString != null) {
Text( Text(
when { listOf(category, formattedDistance, isOpenString)
category != null && formattedDistance != null -> "$category • $formattedDistance" .fastFilterNotNull()
.joinToString(" • "),
category != null -> category.toString()
formattedDistance != null -> formattedDistance
else -> ""
},
style = MaterialTheme.typography.bodySmall, style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.secondary, color = MaterialTheme.colorScheme.secondary,
modifier = Modifier modifier = Modifier
@ -314,7 +312,7 @@ fun LocationItem(
when { when {
category != null && formattedDistance != null -> "$category • $formattedDistance" category != null && formattedDistance != null -> "$category • $formattedDistance"
category != null -> category.toString() category != null -> category
formattedDistance != null -> formattedDistance formattedDistance != null -> formattedDistance
else -> "" else -> ""
}, },