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 Android zoom button behavior #371

Merged
merged 4 commits into from
Nov 26, 2024
Merged

Fix Android zoom button behavior #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e92e910
Fix Android zoom button behavior
ianthetechie Nov 26, 2024
86eeb4c
Copy logic to the non-dynamic views
ianthetechie Nov 26, 2024
484e055
Fix dropped value
ianthetechie Nov 26, 2024
6bc7cd9
Fix tests
ianthetechie Nov 26, 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
14 changes: 4 additions & 10 deletions ...eui/src/main/java/com/stadiamaps/ferrostar/composeui/config/VisualNavigationViewConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,21 @@ package com.stadiamaps.ferrostar.composeui.config
data class VisualNavigationViewConfig(
// Mute
var showMute: Boolean = false,
var onMute: (() -> Unit)? = null,

// Zoom
var showZoom: Boolean = false,
var onZoomIn: (() -> Unit)? = null,
var onZoomOut: (() -> Unit)? = null,
) {
companion object {
fun Default() = VisualNavigationViewConfig(showMute = true, showZoom = true)
}
}

/** Enables the mute button in the navigation view. */
fun VisualNavigationViewConfig.useMuteButton(onMute: () -> Unit): VisualNavigationViewConfig {
return copy(showMute = true, onMute = onMute)
fun VisualNavigationViewConfig.useMuteButton(): VisualNavigationViewConfig {
return copy(showMute = true)
}

/** Enables the zoom button in the navigation view. */
fun VisualNavigationViewConfig.useZoomButton(
onZoomIn: () -> Unit,
onZoomOut: () -> Unit
): VisualNavigationViewConfig {
return copy(showZoom = true, onZoomIn = onZoomIn, onZoomOut = onZoomOut)
fun VisualNavigationViewConfig.useZoomButton(): VisualNavigationViewConfig {
return copy(showZoom = true)
}
6 changes: 4 additions & 2 deletions .../java/com/stadiamaps/ferrostar/composeui/views/overlays/LandscapeNavigationOverlayView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ fun LandscapeNavigationOverlayView(
cameraControlState: CameraControlState,
theme: NavigationUITheme = DefaultNavigationUITheme,
config: VisualNavigationViewConfig = VisualNavigationViewConfig.Default(),
onClickZoomIn: (() -> Unit)? = null,
onClickZoomOut: (() -> Unit)? = null,
views: NavigationViewComponentBuilder = NavigationViewComponentBuilder.Default(theme),
mapViewInsets: MutableState<PaddingValues>,
onTapExit: (() -> Unit)? = null,
Expand Down Expand Up @@ -96,8 +98,8 @@ fun LandscapeNavigationOverlayView(
buttonSize = theme.buttonSize,
cameraControlState = cameraControlState,
showZoom = config.showZoom,
onClickZoomIn = { config.onZoomIn?.invoke() },
onClickZoomOut = { config.onZoomOut?.invoke() },
onClickZoomIn = { onClickZoomIn?.invoke() },
onClickZoomOut = { onClickZoomOut?.invoke() },
bottomCenter = {
views.streetNameView(Modifier, uiState.currentStepRoadName, cameraControlState)
})
Expand Down
6 changes: 4 additions & 2 deletions ...n/java/com/stadiamaps/ferrostar/composeui/views/overlays/PortraitNavigationOverlayView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ fun PortraitNavigationOverlayView(
cameraControlState: CameraControlState,
theme: NavigationUITheme = DefaultNavigationUITheme,
config: VisualNavigationViewConfig = VisualNavigationViewConfig.Default(),
onClickZoomIn: (() -> Unit)? = null,
onClickZoomOut: (() -> Unit)? = null,
views: NavigationViewComponentBuilder = NavigationViewComponentBuilder.Default(theme),
mapViewInsets: MutableState<PaddingValues>,
onTapExit: (() -> Unit)? = null,
Expand Down Expand Up @@ -77,8 +79,8 @@ fun PortraitNavigationOverlayView(
buttonSize = theme.buttonSize,
cameraControlState = cameraControlState,
showZoom = config.showZoom,
onClickZoomIn = { config.onZoomIn?.invoke() },
onClickZoomOut = { config.onZoomOut?.invoke() },
onClickZoomIn = { onClickZoomIn?.invoke() },
onClickZoomOut = { onClickZoomOut?.invoke() },
bottomCenter = {
views.streetNameView(Modifier, uiState.currentStepRoadName, cameraControlState)
},
Expand Down
5 changes: 5 additions & 0 deletions ...main/java/com/stadiamaps/ferrostar/maplibreui/views/DynamicallyOrientingNavigationView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import com.maplibre.compose.camera.MapViewCamera
import com.maplibre.compose.camera.extensions.incrementZoom
import com.maplibre.compose.ramani.LocationRequestProperties
import com.maplibre.compose.ramani.MapLibreComposable
import com.maplibre.compose.rememberSaveableMapViewCamera
Expand Down Expand Up @@ -115,6 +116,8 @@ fun DynamicallyOrientingNavigationView(
),
theme = theme,
config = config,
onClickZoomIn = { camera.value = camera.value.incrementZoom(1.0) },
onClickZoomOut = { camera.value = camera.value.incrementZoom(-1.0) },
views = views,
mapViewInsets = mapViewInsets,
onTapExit = onTapExit)
Expand All @@ -133,6 +136,8 @@ fun DynamicallyOrientingNavigationView(
),
theme = theme,
config = config,
onClickZoomIn = { camera.value = camera.value.incrementZoom(1.0) },
onClickZoomOut = { camera.value = camera.value.incrementZoom(-1.0) },
views = views,
mapViewInsets = mapViewInsets,
onTapExit = onTapExit)
Expand Down
3 changes: 3 additions & 0 deletions ...ibreui/src/main/java/com/stadiamaps/ferrostar/maplibreui/views/LandscapeNavigationView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.maplibre.compose.camera.MapViewCamera
import com.maplibre.compose.camera.extensions.incrementZoom
import com.maplibre.compose.ramani.LocationRequestProperties
import com.maplibre.compose.ramani.MapLibreComposable
import com.maplibre.compose.rememberSaveableMapViewCamera
Expand Down Expand Up @@ -108,6 +109,8 @@ fun LandscapeNavigationView(
),
theme = theme,
config = config,
onClickZoomIn = { camera.value = camera.value.incrementZoom(1.0) },
onClickZoomOut = { camera.value = camera.value.incrementZoom(-1.0) },
views = views,
mapViewInsets = mapViewInsets,
onTapExit = onTapExit)
Expand Down
3 changes: 3 additions & 0 deletions ...libreui/src/main/java/com/stadiamaps/ferrostar/maplibreui/views/PortraitNavigationView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.maplibre.compose.camera.MapViewCamera
import com.maplibre.compose.camera.extensions.incrementZoom
import com.maplibre.compose.ramani.LocationRequestProperties
import com.maplibre.compose.ramani.MapLibreComposable
import com.maplibre.compose.rememberSaveableMapViewCamera
Expand Down Expand Up @@ -119,6 +120,8 @@ fun PortraitNavigationView(
),
theme = theme,
config = config,
onClickZoomIn = { camera.value = camera.value.incrementZoom(1.0) },
onClickZoomOut = { camera.value = camera.value.incrementZoom(-1.0) },
views = views,
mapViewInsets = mapViewInsets,
onTapExit = onTapExit)
Expand Down
9 changes: 3 additions & 6 deletions ...rc/test/java/com/stadiamaps/ferrostar/maplibreui/config/VisualNavigationViewConfigTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,19 @@ class VisualNavigationViewConfigTest {

@Test
fun testUseMuteButton() {
val config = VisualNavigationViewConfig().useMuteButton(onMute = {})
val config = VisualNavigationViewConfig().useMuteButton()
assert(config.showMute)
}

@Test
fun testUseZoomButton() {
val config = VisualNavigationViewConfig().useZoomButton(onZoomIn = {}, onZoomOut = {})
val config = VisualNavigationViewConfig().useZoomButton()
assert(config.showZoom)
}

@Test
fun testUseMuteButtonAndZoomButton() {
val config =
VisualNavigationViewConfig()
.useMuteButton(onMute = {})
.useZoomButton(onZoomIn = {}, onZoomOut = {})
val config = VisualNavigationViewConfig().useMuteButton().useZoomButton()
assert(config.showMute)
assert(config.showZoom)
}
Expand Down
Loading