Merge pull request #330 from dhis2/release/0.4.0-SNAPSHOT

Release/0.4.0 snapshot

.github/workflows/github-ci.yml

@@ -9,11 +9,12 @@ on:
     branches:
      - main
      - develop
+     - release/*
   pull_request:
     branches:
      - main
      - develop
-
+     - release/*
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 

common/src/commonMain/kotlin/org/hisp/dhis/common/screens/location/LocationSearchBarScreen.kt

@@ -8,11 +8,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.TopCenter
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.hisp.dhis.common.screens.components.GroupComponentDropDown
 import org.hisp.dhis.mobile.ui.designsystem.component.DropdownItem
 import org.hisp.dhis.mobile.ui.designsystem.component.LocationBar
@@ -37,6 +40,8 @@ fun LocationSearchBarScreen(
         screenDropdownItemList.add(DropdownItem(it.label))
     }
 
+    val scope = rememberCoroutineScope()
+
     GroupComponentDropDown(
         dropdownItems = screenDropdownItemList.toList(),
         onItemSelected = {
@@ -52,6 +57,8 @@ fun LocationSearchBarScreen(
 
     when (currentScreen.value) {
         LocationSearchBarOptions.DEFAULT_BEHAVIOUR -> {
+            var searching by remember { mutableStateOf(false) }
+
             Box(
                 modifier = Modifier.fillMaxSize()
                     .background(Color.White)
@@ -63,18 +70,26 @@ fun LocationSearchBarScreen(
                     onBackClicked = {},
                     onClearLocation = {},
                     onSearchLocation = { locationQuery ->
-                        onSearchLocation(locationQuery) {
-                            itemList =
-                                it.takeIf { locationQuery.isNotBlank() } ?: defaultLocationItems
+                        searching = true
+                        scope.launch {
+                            delay(3000)
+                            onSearchLocation(locationQuery) {
+                                itemList =
+                                    it.takeIf { locationQuery.isNotBlank() } ?: defaultLocationItems
+                                searching = false
+                            }
                         }
                     },
                     onLocationSelected = { locationItemModel ->
                     },
+                    searching = searching,
                 )
             }
         }
 
         LocationSearchBarOptions.AUTOSELECT_ON_ONE_ITEM_FOUND -> {
+            var searching by remember { mutableStateOf(false) }
+
             Box(
                 modifier = Modifier.fillMaxSize()
                     .background(Color.White)
@@ -87,14 +102,19 @@ fun LocationSearchBarScreen(
                     onBackClicked = {},
                     onClearLocation = {},
                     onSearchLocation = { locationQuery ->
-                        onSearchLocation(locationQuery) {
-                            itemList =
-                                it.take(1).takeIf { locationQuery.isNotBlank() }
-                                    ?: defaultLocationItems
+                        searching = true
+                        scope.launch {
+                            onSearchLocation(locationQuery) {
+                                itemList =
+                                    it.take(1).takeIf { locationQuery.isNotBlank() }
+                                        ?: defaultLocationItems
+                                searching = false
+                            }
                         }
                     },
                     onLocationSelected = { locationItemModel ->
                     },
+                    searching = searching,
                 )
             }
         }

designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarButtonSnapshotTest.kt

@@ -17,6 +17,7 @@ class LocationBarButtonSnapshotTest {
                 onClearLocation = {},
                 onSearchLocation = {},
                 onLocationSelected = {},
+                searching = false,
             )
         }
     }

designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarSearchSnapshotTest.kt

@@ -33,6 +33,7 @@ class LocationBarSearchSnapshotTest {
                 onClearLocation = {},
                 onSearchLocation = {},
                 onLocationSelected = {},
+                searching = false,
             )
         }
     }

designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/LocationSearchBar.kt

@@ -66,6 +66,11 @@ enum class SearchBarMode {
     SEARCH,
 }
 
+/**
+ * DHIS2 Location Bar search actions
+ * Default: The user will need to select a result to mark it as selected
+ * OnOneItemSelect: If only one item is available, it will be selected automatically
+ * */
 enum class OnSearchAction {
     Default,
     OnOneItemSelect,
@@ -75,6 +80,8 @@ enum class OnSearchAction {
  * DHIS2 Location Bar.
  * @param currentResults: the available location items to display before/after search.
  * @param mode: the initial mode for the composable.
+ * @param searchAction: How the search result selection is carried out.
+ * @param searching: whether the search is currently in progress.
  * @param onBackClicked: callback for when the back button is clicked.
  * @param onClearLocation: callback for when the clear location button is clicked.
  * @param onSearchLocation: callback for when the search location button is clicked.
@@ -86,6 +93,7 @@ fun LocationBar(
     currentResults: List<LocationItemModel>,
     mode: SearchBarMode = SearchBarMode.BUTTON,
     searchAction: OnSearchAction = OnSearchAction.Default,
+    searching: Boolean,
     onBackClicked: () -> Unit,
     onClearLocation: () -> Unit,
     onSearchLocation: (query: String) -> Unit,
@@ -129,6 +137,7 @@ fun LocationBar(
         SearchBarMode.SEARCH -> LocationSearchBar(
             currentSearch = currentSearch,
             currentResults = currentResults,
+            activeSearching = searching,
             onSearchChanged = {
                 currentSearch = it
                 onSearchLocation(currentSearch)
@@ -212,6 +221,7 @@ private fun LocationSearchBarButton(
 private fun LocationSearchBar(
     currentSearch: String = "",
     currentResults: List<LocationItemModel>,
+    activeSearching: Boolean,
     onSearchChanged: (String) -> Unit,
     onSearch: (String) -> Unit,
     onBackClicked: () -> Unit,
@@ -221,6 +231,7 @@ private fun LocationSearchBar(
     val focusRequester = remember { FocusRequester() }
     val keyboardController = LocalSoftwareKeyboardController.current
     var needsToFocus by remember { mutableStateOf(true) }
+    var searching by remember(currentSearch) { mutableStateOf(false) }
 
     Column(
         modifier = Modifier.fillMaxSize(),
@@ -259,6 +270,11 @@ private fun LocationSearchBar(
 
         LazyColumn(modifier = Modifier.fillMaxWidth(), state = scrollState) {
             when {
+                activeSearching ->
+                    item {
+                        SearchProgressMessage()
+                    }
+
                 currentResults.isNotEmpty() ->
                     itemsIndexed(items = currentResults) { index, locationItemModel ->
                         SearchResultLocationItem(
@@ -431,3 +447,24 @@ private fun NoResultsMessage(isSearching: Boolean) {
         )
     }
 }
+
+@Composable
+private fun SearchProgressMessage() {
+    val message = provideStringResource("searching_location")
+
+    Column(
+        modifier = Modifier
+            .testTag("SEARCHING_LOCATION")
+            .fillMaxWidth()
+            .padding(vertical = 64.dp),
+        verticalArrangement = spacedBy(16.dp),
+        horizontalAlignment = CenterHorizontally,
+    ) {
+        ProgressIndicator(type = ProgressIndicatorType.CIRCULAR)
+        Text(
+            text = message,
+            style = MaterialTheme.typography.bodyLarge,
+            color = TextColor.OnSurfaceVariant,
+        )
+    }
+}

designsystem/src/commonMain/resources/values-es/strings.xml

@@ -46,4 +46,5 @@
     <string name="select_in_map">Seleccionar en el mapa</string>
     <string name="no_recent_results">No hay resultados recientes</string>
     <string name="no_results">No hay resultados</string>
+    <string name="searching_location">Buscando...</string>
 </resources>

designsystem/src/commonMain/resources/values/strings.xml

@@ -46,4 +46,5 @@
     <string name="select_in_map">Select in map</string>
     <string name="no_recent_results">No recent results</string>
     <string name="no_results">No results</string>
+    <string name="searching_location">Searching...</string>
 </resources>

designsystem/src/desktopTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/LocationSearchBarTest.kt

@@ -30,6 +30,7 @@ class LocationSearchBarTest {
                 onClearLocation = {},
                 onSearchLocation = {},
                 onLocationSelected = {},
+                searching = false,
             )
         }
 
@@ -60,6 +61,7 @@ class LocationSearchBarTest {
                 onClearLocation = {},
                 onSearchLocation = {},
                 onLocationSelected = {},
+                searching = false,
             )
         }
 
@@ -97,6 +99,7 @@ class LocationSearchBarTest {
                     items = listOf()
                 },
                 onLocationSelected = {},
+                searching = false,
             )
         }
 
@@ -144,6 +147,7 @@ class LocationSearchBarTest {
                     )
                 },
                 onLocationSelected = {},
+                searching = false,
             )
         }
 
@@ -192,6 +196,7 @@ class LocationSearchBarTest {
                     )
                 },
                 onLocationSelected = {},
+                searching = false,
             )
         }