From 7c02ed4d1d16c49425dff72bf18977629cb9ea49 Mon Sep 17 00:00:00 2001 From: Jacob Fielding Date: Wed, 27 May 2026 21:45:42 -0700 Subject: [PATCH] feat: remove maplibre-compose-playground --- android/demo-app/build.gradle | 1 + .../ferrostar/auto/DemoNavigationScreen.kt | 2 +- android/gradle/libs.versions.toml | 5 ++--- android/ui-maplibre-car-app/build.gradle | 3 +-- .../ui/maplibre/car/app/runtime/ScreenState.kt | 2 +- .../maplibre/car/app/runtime/SurfaceGestureBridge.kt | 12 ++++++------ 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/android/demo-app/build.gradle b/android/demo-app/build.gradle index ce86059ec..94699ef71 100644 --- a/android/demo-app/build.gradle +++ b/android/demo-app/build.gradle @@ -75,6 +75,7 @@ dependencies { implementation project(':ui-maplibre-car-app') implementation libs.maplibre.compose + implementation libs.car.app.compose implementation platform(libs.okhttp.bom) implementation libs.okhttp.core diff --git a/android/demo-app/src/main/java/com/stadiamaps/ferrostar/auto/DemoNavigationScreen.kt b/android/demo-app/src/main/java/com/stadiamaps/ferrostar/auto/DemoNavigationScreen.kt index a1c4a2c4b..0e34d83c8 100644 --- a/android/demo-app/src/main/java/com/stadiamaps/ferrostar/auto/DemoNavigationScreen.kt +++ b/android/demo-app/src/main/java/com/stadiamaps/ferrostar/auto/DemoNavigationScreen.kt @@ -15,7 +15,7 @@ import androidx.compose.runtime.snapshotFlow import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner -import com.maplibre.compose.car.ComposableScreen +import com.rallista.car.app.compose.ComposableScreen import com.stadiamaps.ferrostar.AppModule import com.stadiamaps.ferrostar.R import com.stadiamaps.ferrostar.car.app.intent.NavigationDestination diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 0e3472b76..05982d03f 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -16,7 +16,7 @@ androidx-activity-compose = "1.13.0" compose = "2026.02.01" okhttp = "5.3.2" maplibre-compose = "0.13.0" -rallista-maplibre-compose = "1.7.0" +car-app-compose = "0.0.2" playServicesLocation = "21.3.0" junit = "4.13.2" junitVersion = "1.3.0" @@ -63,8 +63,7 @@ okhttp-mock = { group = "com.github.gmazzo", name = "okhttp-mock", version.ref = kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" } # MapLibre maplibre-compose = { group = "org.maplibre.compose", name = "maplibre-compose-android", version.ref = "maplibre-compose" } -rallista-maplibre-compose = { group = "io.github.rallista", name = "maplibre-compose", version.ref = "rallista-maplibre-compose" } -rallista-maplibre-compose-car-app = { group = "io.github.rallista", name = "maplibre-compose-car-app", version.ref = "rallista-maplibre-compose" } +car-app-compose = { group = "io.github.rallista", name = "car-app-compose", version.ref = "car-app-compose" } # Google Play Services (for Google module) play-services-location = { module = "com.google.android.gms:play-services-location", version.ref = "playServicesLocation" } # Testing diff --git a/android/ui-maplibre-car-app/build.gradle b/android/ui-maplibre-car-app/build.gradle index ed05b6cf7..87ff4c238 100644 --- a/android/ui-maplibre-car-app/build.gradle +++ b/android/ui-maplibre-car-app/build.gradle @@ -51,8 +51,7 @@ dependencies { implementation libs.androidx.compose.ui.graphics implementation libs.androidx.compose.ui.tooling implementation libs.androidx.compose.material3 - api libs.rallista.maplibre.compose - api libs.rallista.maplibre.compose.car.app + api libs.car.app.compose implementation project(':core') implementation project(':ui-compose') diff --git a/android/ui-maplibre-car-app/src/main/java/com/stadiamaps/ferrostar/ui/maplibre/car/app/runtime/ScreenState.kt b/android/ui-maplibre-car-app/src/main/java/com/stadiamaps/ferrostar/ui/maplibre/car/app/runtime/ScreenState.kt index 94bbbc160..942b1aed3 100644 --- a/android/ui-maplibre-car-app/src/main/java/com/stadiamaps/ferrostar/ui/maplibre/car/app/runtime/ScreenState.kt +++ b/android/ui-maplibre-car-app/src/main/java/com/stadiamaps/ferrostar/ui/maplibre/car/app/runtime/ScreenState.kt @@ -9,7 +9,7 @@ import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalDensity -import com.maplibre.compose.surface.SurfaceGestureCallback +import com.rallista.car.app.compose.SurfaceGestureCallback import com.stadiamaps.ferrostar.maplibreui.runtime.NavigationMapState import kotlin.time.Duration diff --git a/android/ui-maplibre-car-app/src/main/java/com/stadiamaps/ferrostar/ui/maplibre/car/app/runtime/SurfaceGestureBridge.kt b/android/ui-maplibre-car-app/src/main/java/com/stadiamaps/ferrostar/ui/maplibre/car/app/runtime/SurfaceGestureBridge.kt index b10055c63..3fc00d832 100644 --- a/android/ui-maplibre-car-app/src/main/java/com/stadiamaps/ferrostar/ui/maplibre/car/app/runtime/SurfaceGestureBridge.kt +++ b/android/ui-maplibre-car-app/src/main/java/com/stadiamaps/ferrostar/ui/maplibre/car/app/runtime/SurfaceGestureBridge.kt @@ -3,7 +3,7 @@ package com.stadiamaps.ferrostar.ui.maplibre.car.app.runtime import androidx.compose.runtime.Composable import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.DpOffset -import com.maplibre.compose.surface.SurfaceGestureCallback +import com.rallista.car.app.compose.SurfaceGestureCallback import com.stadiamaps.ferrostar.maplibreui.runtime.NavigationMapState import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds @@ -12,11 +12,11 @@ internal const val DEFAULT_FLING_VELOCITY_FACTOR = 0.1f @Composable internal fun defaultFlingDuration(): Duration = 300.milliseconds -internal class ComposeMapSurfaceGestureCallback( - private val navigationMapState: NavigationMapState, - private val density: Density, - private val flingDuration: Duration, - private val flingVelocityFactor: Float, +class ComposeMapSurfaceGestureCallback( + val navigationMapState: NavigationMapState, + val density: Density, + val flingDuration: Duration, + val flingVelocityFactor: Float, ) : SurfaceGestureCallback { override fun onScroll(distanceX: Float, distanceY: Float) { // Preserve the old Ramani surface-gesture sign convention until DHU validation proves