From a0bc07fe141c62e60403d3099de0856c39bef49b Mon Sep 17 00:00:00 2001
From: Christoph <47949835+shtrophic@users.noreply.github.com>
Date: Sat, 29 Mar 2025 17:27:11 +0100
Subject: [PATCH] LocationItem: show {Open,Closed} in search result when
 details are not shown (#1320)

---
 .../ui/launcher/search/location/LocationItem.kt  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt
index 4efa636d..a6d78c6f 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/location/LocationItem.kt
@@ -92,6 +92,7 @@ import androidx.compose.ui.unit.TextUnitType
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.max
 import androidx.compose.ui.unit.times
+import androidx.compose.ui.util.fastFilterNotNull
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import blend.Blend.harmonize
@@ -210,15 +211,12 @@ fun LocationItem(
                         val formattedDistance = distance?.metersToLocalizedString(
                             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(
-                                when {
-                                    category != null && formattedDistance != null -> "$category • $formattedDistance"
-
-                                    category != null -> category.toString()
-                                    formattedDistance != null -> formattedDistance
-                                    else -> ""
-                                },
+                                listOf(category, formattedDistance, isOpenString)
+                                    .fastFilterNotNull()
+                                    .joinToString(" • "),
                                 style = MaterialTheme.typography.bodySmall,
                                 color = MaterialTheme.colorScheme.secondary,
                                 modifier = Modifier
@@ -314,7 +312,7 @@ fun LocationItem(
                                     when {
                                         category != null && formattedDistance != null -> "$category • $formattedDistance"
 
-                                        category != null -> category.toString()
+                                        category != null -> category
                                         formattedDistance != null -> formattedDistance
                                         else -> ""
                                     },