WIP: feat: maplibre

app/build.gradle.kts

@@ -254,6 +254,9 @@ dependencies {
     googleImplementation(libs.location.services)
     googleImplementation(libs.play.services.maps)
 
+    // MapLibre for F-Droid flavor (POC - additive, does not remove osmdroid yet)
+    fdroidImplementation("org.maplibre.gl:android-sdk:12.1.0")
+
     fdroidImplementation(libs.osmdroid.android)
     fdroidImplementation(libs.osmdroid.geopackage) { exclude(group = "com.j256.ormlite") }
 

app/src/main/java/com/geeksville/mesh/navigation/MapNavigation.kt

@@ -35,7 +35,13 @@ fun NavGraphBuilder.mapGraph(navController: NavHostController) {
                     restoreState = true
                 }
             },
-            navigateToNodeDetails = { navController.navigate(NodesRoutes.NodeDetailGraph(it)) },
+            navigateToNodeDetails = {
+                navController.navigate(NodesRoutes.NodeDetailGraph(it)) {
+                    // Don't save the state of the map when navigating to node details
+                    // This ensures pressing back from node detail returns to map, not node list
+                    launchSingleTop = false
+                }
+            },
         )
     }
 }

app/src/main/java/com/geeksville/mesh/navigation/NodesNavigation.kt

@@ -97,13 +97,20 @@ fun NavGraphBuilder.nodeDetailGraph(navController: NavHostController, scrollToTo
                 ),
             ),
         ) { backStackEntry ->
-            val args = backStackEntry.toRoute<NodesRoutes.NodeDetail>()
+            // Get destNum from the parent graph (NodeDetailGraph) if available,
+            // otherwise from the route itself (for deep links)
+            val parentGraphEntry =
+                remember(backStackEntry) { navController.getBackStackEntry<NodesRoutes.NodeDetailGraph>() }
+            val graphArgs = parentGraphEntry.toRoute<NodesRoutes.NodeDetailGraph>()
+            val routeArgs = backStackEntry.toRoute<NodesRoutes.NodeDetail>()
+            val nodeId = graphArgs.destNum ?: routeArgs.destNum
+
             // When navigating directly to NodeDetail (e.g. from Map or deep link),
             // we use the Adaptive screen initialized with the specific node ID.
             AdaptiveNodeListScreen(
                 navController = navController,
                 scrollToTopEvents = scrollToTopEvents,
-                initialNodeId = args.destNum,
+                initialNodeId = nodeId,
                 onNavigateToMessages = { navController.navigate(ContactsRoutes.Messages(it)) },
             )
         }

app/src/main/java/com/geeksville/mesh/ui/node/AdaptiveNodeListScreen.kt

@@ -67,8 +67,23 @@ fun AdaptiveNodeListScreen(
     val scope = rememberCoroutineScope()
     val backNavigationBehavior = BackNavigationBehavior.PopUntilScaffoldValueChange
 
+    // Handle back navigation from detail pane
     BackHandler(enabled = navigator.currentDestination?.pane == ListDetailPaneScaffoldRole.Detail) {
-        scope.launch { navigator.navigateBack(backNavigationBehavior) }
+        if (initialNodeId != null) {
+            // If opened with initialNodeId (from Map/Connections), always go back to previous screen
+            navController.navigateUp()
+        } else {
+            // Normal navigation within scaffold (when opened from Nodes tab)
+            scope.launch { navigator.navigateBack(backNavigationBehavior) }
+        }
+    }
+
+    // Handle back from list pane when opened with initialNodeId
+    // This handles the case where user is on list pane after scaffold navigation on tablet
+    BackHandler(
+        enabled = initialNodeId != null && navigator.currentDestination?.pane == ListDetailPaneScaffoldRole.List,
+    ) {
+        navController.navigateUp()
     }
 
     LaunchedEffect(initialNodeId) {

core/prefs/src/fdroid/kotlin/org/meshtastic/core/prefs/di/MapLibreModule.kt

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2025 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.meshtastic.core.prefs.di
+
+import android.content.Context
+import android.content.SharedPreferences
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import org.meshtastic.core.prefs.map.MapLibrePrefs
+import org.meshtastic.core.prefs.map.MapLibrePrefsImpl
+import javax.inject.Qualifier
+import javax.inject.Singleton
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class MapLibreSharedPreferences
+
+@Module
+@InstallIn(SingletonComponent::class)
+object MapLibreProvidesModule {
+    @Provides
+    @Singleton
+    @MapLibreSharedPreferences
+    fun provideMapLibreSharedPreferences(@ApplicationContext context: Context): SharedPreferences =
+        context.getSharedPreferences("maplibre_prefs", Context.MODE_PRIVATE)
+}
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class MapLibreBindsModule {
+    @Binds @Singleton
+    abstract fun bindMapLibrePrefs(mapLibrePrefsImpl: MapLibrePrefsImpl): MapLibrePrefs
+}

core/prefs/src/fdroid/kotlin/org/meshtastic/core/prefs/map/MapLibrePrefs.kt

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2025 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.meshtastic.core.prefs.map
+
+import android.content.SharedPreferences
+import org.meshtastic.core.prefs.DoublePrefDelegate
+import org.meshtastic.core.prefs.NullableStringPrefDelegate
+import org.meshtastic.core.prefs.PrefDelegate
+import org.meshtastic.core.prefs.di.MapLibreSharedPreferences
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/** Interface for prefs specific to MapLibre. For general map prefs, see MapPrefs. */
+interface MapLibrePrefs {
+    var cameraTargetLat: Double
+    var cameraTargetLng: Double
+    var cameraZoom: Double
+    var cameraBearing: Double
+    var cameraTilt: Double
+    var shouldRestoreCameraPosition: Boolean
+    var markerColorMode: String
+    var clusteringEnabled: Boolean
+    var heatmapEnabled: Boolean
+    var baseStyleIndex: Int
+    var customTileUrl: String?
+    var usingCustomTiles: Boolean
+}
+
+@Singleton
+class MapLibrePrefsImpl @Inject constructor(@MapLibreSharedPreferences prefs: SharedPreferences) : MapLibrePrefs {
+    override var cameraTargetLat: Double by DoublePrefDelegate(prefs, "camera_target_lat", 0.0)
+    override var cameraTargetLng: Double by DoublePrefDelegate(prefs, "camera_target_lng", 0.0)
+    override var cameraZoom: Double by DoublePrefDelegate(prefs, "camera_zoom", 15.0)
+    override var cameraBearing: Double by DoublePrefDelegate(prefs, "camera_bearing", 0.0)
+    override var cameraTilt: Double by DoublePrefDelegate(prefs, "camera_tilt", 0.0)
+    override var shouldRestoreCameraPosition: Boolean by PrefDelegate(prefs, "should_restore_camera_position", false)
+    override var markerColorMode: String by PrefDelegate(prefs, "marker_color_mode", "NODE")
+    override var clusteringEnabled: Boolean by PrefDelegate(prefs, "clustering_enabled", true)
+    override var heatmapEnabled: Boolean by PrefDelegate(prefs, "heatmap_enabled", false)
+    override var baseStyleIndex: Int by PrefDelegate(prefs, "base_style_index", 0)
+    override var customTileUrl: String? by NullableStringPrefDelegate(prefs, "custom_tile_url", null)
+    override var usingCustomTiles: Boolean by PrefDelegate(prefs, "using_custom_tiles", false)
+}

core/strings/src/commonMain/composeResources/values/strings.xml

@@ -911,6 +911,12 @@
     <string name="add_layer_button">Add Layer</string>
     <string name="hide_layer">Hide Layer</string>
     <string name="show_layer">Show Layer</string>
+    <string name="role_legend_title">Show role legend</string>
+    <string name="role_legend_description">Display a role-to-color legend overlay on the map.</string>
+    <string name="marker_color_mode_title">Marker colors</string>
+    <string name="marker_color_mode_description">Switch between role colors and node-specific colors.</string>
+    <string name="marker_color_mode_role">Role colors</string>
+    <string name="marker_color_mode_node">Node colors</string>
     <string name="remove_layer">Remove Layer</string>
     <string name="add_layer">Add Layer</string>
     <string name="nodes_at_this_location">Nodes at this location</string>

feature/map/build.gradle.kts

@@ -53,6 +53,9 @@ dependencies {
     implementation(libs.osmdroid.android)
     implementation(libs.timber)
 
+    // MapLibre for fdroid POC
+    fdroidImplementation("org.maplibre.gl:android-sdk:12.1.0")
+
     googleImplementation(libs.location.services)
     googleImplementation(libs.maps.compose)
     googleImplementation(libs.maps.compose.utils)