Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: [ANDROAPP-6657] add loading in "search on this area" button #3935

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+24 −3
Open

fix: [ANDROAPP-6657] add loading in "search on this area" button #3935

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa7b45
add loading in "search on this area" button
Balcan Dec 18, 2024
eb2bcf8
fix paddings
Balcan Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions dhis2_android_maps/src/main/java/org/dhis2/maps/views/MapSelectorScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
Expand Down Expand Up @@ -77,10 +78,13 @@ import org.hisp.dhis.mobile.ui.designsystem.component.LocationBar
import org.hisp.dhis.mobile.ui.designsystem.component.LocationItem
import org.hisp.dhis.mobile.ui.designsystem.component.LocationItemIcon
import org.hisp.dhis.mobile.ui.designsystem.component.OnSearchAction
import org.hisp.dhis.mobile.ui.designsystem.component.ProgressIndicator
import org.hisp.dhis.mobile.ui.designsystem.component.ProgressIndicatorType
import org.hisp.dhis.mobile.ui.designsystem.component.SearchBarMode
import org.hisp.dhis.mobile.ui.designsystem.component.TopBar
import org.hisp.dhis.mobile.ui.designsystem.component.model.LocationItemModel
import org.hisp.dhis.mobile.ui.designsystem.theme.Shape
import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing
import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor

Expand Down Expand Up @@ -148,6 +152,7 @@ fun SinglePaneMapSelector(
captureMode = screenState.captureMode,
selectedLocation = screenState.selectedLocation,
searchOnThisAreaVisible = screenState.searchOnAreaVisible,
searching = screenState.searching,
locationState = screenState.locationState,
isManualCaptureEnabled = screenState.isManualCaptureEnabled,
isPolygonMode = screenState.displayPolygonInfo,
Expand Down Expand Up @@ -239,6 +244,7 @@ private fun TwoPaneMapSelector(
captureMode = screenState.captureMode,
selectedLocation = screenState.selectedLocation,
searchOnThisAreaVisible = screenState.searchOnAreaVisible,
searching = screenState.searching,
locationState = screenState.locationState,
isManualCaptureEnabled = screenState.isManualCaptureEnabled,
isPolygonMode = screenState.displayPolygonInfo,
Expand Down Expand Up @@ -442,6 +448,7 @@ private fun Map(
captureMode: MapSelectorViewModel.CaptureMode,
selectedLocation: SelectedLocation,
searchOnThisAreaVisible: Boolean,
searching: Boolean,
locationState: LocationState,
isManualCaptureEnabled: Boolean,
isPolygonMode: Boolean,
Expand Down Expand Up @@ -487,7 +494,7 @@ private fun Map(
modifier = Modifier
.align(Alignment.TopCenter)
.offset(y = 60.dp),
visible = searchOnThisAreaVisible,
visible = searchOnThisAreaVisible or searching,
enter = scaleIn(
animationSpec = spring(
dampingRatio = Spring.DampingRatioLowBouncy,
Expand All @@ -502,6 +509,7 @@ private fun Map(
),
) {
SearchInAreaButton(
searching = searching,
onClick = onSearchOnAreaClick,
)
}
Expand Down Expand Up @@ -548,12 +556,24 @@ private fun SwipeToChangeLocationInfo(

@Composable
private fun SearchInAreaButton(
searching: Boolean,
onClick: () -> Unit = {},
) {
Button(
style = ButtonStyle.TONAL,
text = stringResource(R.string.search_on_this_area),
onClick = onClick,
text = if (searching) "" else stringResource(R.string.search_on_this_area),
icon = if (searching) {
{ ProgressIndicator(type = ProgressIndicatorType.CIRCULAR_SMALL) }
} else {
null
},
paddingValues = PaddingValues(
Spacing.Spacing24,
Spacing.Spacing10,
if (searching) Spacing.Spacing24 - Spacing.Spacing8 else Spacing.Spacing24,
Spacing.Spacing10,
),
onClick = { if (searching.not()) onClick() },
)
}

Expand Down Expand Up @@ -669,6 +689,7 @@ private class ScreenStateParamProvider : PreviewParameterProvider<MapSelectorScr
get() = sequenceOf(
searchScreenState,
gpsScreenState,
gpsScreenState.copy(searching = true),
)
}

Expand Down
Loading