Merge pull request #158 from ellenhp/ellenhp/v0_10_1_fixes

ellenhp · web-flow · commit a63a59b6be7b · 2025-09-25T16:38:19.000-07:00
Fixes for a few bugs in v0.10.1
diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/AppContent.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/AppContent.kt
@@ -788,54 +788,58 @@ private fun HomeScreenComposable(
                 onFabHeightChange(it)
             }
         },
-        toolbarContent = {
-            val prev = remember(homeBottomSheetState) {
-                HomeBottomSheetState.fromValue((homeBottomSheetState.value + HomeBottomSheetState.COUNT - 1) % HomeBottomSheetState.COUNT)
-            }
-            val next = remember(homeBottomSheetState) {
-                HomeBottomSheetState.fromValue((homeBottomSheetState.value + 1) % HomeBottomSheetState.COUNT)
-            }
-            OutlinedButton(onClick = {
-                homeBottomSheetState = prev
-            }) {
-                Icon(
-                    painter = painterResource(drawable.ic_arrow_back),
-                    contentDescription = stringResource(string.content_description_previous_page)
-                )
-                Text(
-                    modifier = Modifier.padding(start = 4.dp), text = stringResource(prev.label)
-                )
-            }
-            when (homeBottomSheetState) {
-                HomeBottomSheetState.SAVED -> {
-                    IconButton(onClick = {
-                        showManagePlacesDialog = true
-                    }) {
-                        Icon(
-                            painter = painterResource(drawable.ic_edit),
-                            contentDescription = stringResource(string.content_description_edit_saved_places)
-                        )
-                    }
+        toolbarContent = if (!homeInSearchScreen) {
+            {
+                val prev = remember(homeBottomSheetState) {
+                    HomeBottomSheetState.fromValue((homeBottomSheetState.value + HomeBottomSheetState.COUNT - 1) % HomeBottomSheetState.COUNT)
                 }
-
-                HomeBottomSheetState.NEARBY -> {
+                val next = remember(homeBottomSheetState) {
+                    HomeBottomSheetState.fromValue((homeBottomSheetState.value + 1) % HomeBottomSheetState.COUNT)
                 }
+                OutlinedButton(onClick = {
+                    homeBottomSheetState = prev
+                }) {
+                    Icon(
+                        painter = painterResource(drawable.ic_arrow_back),
+                        contentDescription = stringResource(string.content_description_previous_page)
+                    )
+                    Text(
+                        modifier = Modifier.padding(start = 4.dp), text = stringResource(prev.label)
+                    )
+                }
+                when (homeBottomSheetState) {
+                    HomeBottomSheetState.SAVED -> {
+                        IconButton(onClick = {
+                            showManagePlacesDialog = true
+                        }) {
+                            Icon(
+                                painter = painterResource(drawable.ic_edit),
+                                contentDescription = stringResource(string.content_description_edit_saved_places)
+                            )
+                        }
+                    }
 
-                HomeBottomSheetState.TRANSIT -> {
+                    HomeBottomSheetState.NEARBY -> {
+                    }
+
+                    HomeBottomSheetState.TRANSIT -> {
 
+                    }
+                }
+                OutlinedButton(onClick = {
+                    homeBottomSheetState = next
+                }) {
+                    Text(
+                        modifier = Modifier.padding(end = 4.dp), text = stringResource(next.label)
+                    )
+                    Icon(
+                        painter = painterResource(drawable.ic_arrow_forward),
+                        contentDescription = stringResource(string.content_description_next_page)
+                    )
                 }
             }
-            OutlinedButton(onClick = {
-                homeBottomSheetState = next
-            }) {
-                Text(
-                    modifier = Modifier.padding(end = 4.dp), text = stringResource(next.label)
-                )
-                Icon(
-                    painter = painterResource(drawable.ic_arrow_forward),
-                    contentDescription = stringResource(string.content_description_next_page)
-                )
-            }
+        } else {
+            null
         },
         content = {
             HomeScreen(
@@ -859,12 +863,7 @@ private fun HomeScreenComposable(
                 },
                 homeInSearchScreen = homeInSearchScreen,
                 onSearchFocusChange = {
-                    if (it) {
-                        coroutineScope.launch {
-                            bottomSheetState.expand()
-                        }
-                        homeInSearchScreen = true
-                    }
+                    homeInSearchScreen = it
                 },
                 onDismissShowPlaces = {
                     showManagePlacesDialog = false
diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/HomeScreen.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/HomeScreen.kt
@@ -28,6 +28,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
@@ -234,16 +236,19 @@ private fun SearchPanelContent(
             )
         }
 
-        viewModel.geocodeResults.value.forEach {
-            SearchResultItem(
-                addressFormatter = addressFormatter,
-                viewModel.geocodeResultToPlace(it),
-                onPlaceSelected
-            )
-        }
-
         if (homeInSearchScreen) {
-            Spacer(modifier = Modifier.fillMaxSize())
+            LazyColumn {
+                items(viewModel.geocodeResults.value) {
+                    SearchResultItem(
+                        addressFormatter = addressFormatter,
+                        viewModel.geocodeResultToPlace(it),
+                        onPlaceSelected
+                    )
+                }
+            }
+            if (searchQuery.text.isNotEmpty()) {
+                Spacer(modifier = Modifier.fillMaxSize())
+            }
         }
     }
 }
diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/TransitScreen.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/TransitScreen.kt
@@ -48,10 +48,14 @@ import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -69,20 +73,35 @@ import earth.maps.cardinal.data.Place
 import earth.maps.cardinal.data.isYellow
 import earth.maps.cardinal.transit.StopTime
 import earth.maps.cardinal.viewmodel.TransitScreenViewModel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlin.time.Duration.Companion.seconds
 import kotlin.time.ExperimentalTime
 
 @Composable
 fun TransitScreenContent(
     viewModel: TransitScreenViewModel,
     onRouteClicked: (Place) -> Unit,
 ) {
+    var secondsSinceStart by rememberSaveable(viewModel) { mutableIntStateOf(0) }
+    LaunchedEffect(Unit) {
+        while (true) {
+            delay(1.seconds)
+            secondsSinceStart++
+        }
+    }
     val coroutineScope = rememberCoroutineScope()
     val isRefreshingDepartures = viewModel.isRefreshingDepartures.collectAsState()
-    val isInitiallyLoading = viewModel.isLoading.collectAsState()
+    val isLoading = viewModel.isLoading.collectAsState()
     val didLoadingFail = viewModel.didLoadingFail.collectAsState()
     val scrollState = rememberScrollState()
 
+    LaunchedEffect(secondsSinceStart) {
+        if (secondsSinceStart % 30 == 0) {
+            viewModel.refreshData()
+        }
+    }
+
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -120,7 +139,14 @@ fun TransitScreenContent(
             }
         }
 
-        if (isInitiallyLoading.value) {
+        if (didLoadingFail.value) {
+            Text(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                text = stringResource(string.failed_to_load_departures)
+            )
+        } else if (isLoading.value && viewModel.departures.value.isEmpty()) {
             Text(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -133,13 +159,6 @@ fun TransitScreenContent(
                     .fillMaxWidth()
                     .padding(16.dp)
             )
-        } else if (didLoadingFail.value) {
-            Text(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-                text = stringResource(string.failed_to_load_departures)
-            )
         } else if (viewModel.departures.value.isEmpty()) {
             Text(
                 text = stringResource(string.no_upcoming_departures),
diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/TransitStopScreen.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/TransitStopScreen.kt
@@ -94,7 +94,7 @@ fun TransitStopInformation(viewModel: TransitStopCardViewModel, onRouteClicked:
     val scrollState = rememberScrollState()
     val coroutineScope = rememberCoroutineScope()
     val isRefreshingDepartures = viewModel.isRefreshingDepartures.collectAsState()
-    val isInitiallyLoading = viewModel.isLoading.collectAsState()
+    val isLoading = viewModel.isLoading.collectAsState()
     val didLoadingFail = viewModel.didLoadingFail.collectAsState()
 
     LaunchedEffect(Unit) {
@@ -134,7 +134,14 @@ fun TransitStopInformation(viewModel: TransitStopCardViewModel, onRouteClicked:
             }
         }
 
-        if (isInitiallyLoading.value) {
+        if (didLoadingFail.value) {
+            Text(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                text = stringResource(string.failed_to_load_departures)
+            )
+        } else if (isLoading.value && viewModel.departures.value.isEmpty()) {
             Text(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -147,13 +154,6 @@ fun TransitStopInformation(viewModel: TransitStopCardViewModel, onRouteClicked:
                     .fillMaxWidth()
                     .padding(16.dp)
             )
-        } else if (didLoadingFail.value) {
-            Text(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-                text = stringResource(string.failed_to_load_departures)
-            )
         } else if (viewModel.departures.value.isEmpty()) {
             Text(
                 text = stringResource(string.no_upcoming_departures),
diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/viewmodel/TransitScreenViewModel.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/viewmodel/TransitScreenViewModel.kt
@@ -30,15 +30,12 @@ import earth.maps.cardinal.transit.StopTime
 import earth.maps.cardinal.transit.TransitStop
 import earth.maps.cardinal.transit.TransitousService
 import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
 import javax.inject.Inject
-import kotlin.time.Duration.Companion.seconds
 
 @HiltViewModel
 class TransitScreenViewModel @Inject constructor(
@@ -53,8 +50,6 @@ class TransitScreenViewModel @Inject constructor(
         private const val NUM_EVENTS = 200
     }
 
-    private var refreshJob: Job? = null
-
     val stop = mutableStateOf<String?>(null)
     val reverseGeocodedStop = mutableStateOf<TransitStop?>(null)
     val departures = mutableStateOf<List<StopTime>>(emptyList())
@@ -86,13 +81,6 @@ class TransitScreenViewModel @Inject constructor(
         // Start observing location updates
         locationRepository.startContinuousLocationUpdates(context)
         observeLocationUpdates()
-
-        refreshJob = viewModelScope.launch {
-            while (true) {
-                refreshData()
-                delay(60.seconds)
-            }
-        }
     }
 
     /**
@@ -196,10 +184,5 @@ class TransitScreenViewModel @Inject constructor(
             }
         }
     }
-
-    override fun onCleared() {
-        super.onCleared()
-        refreshJob?.cancel()
-    }
 }
 
