refactor: maps

.gitignore

@@ -27,5 +27,5 @@ keystore.properties
 # Kotlin compiler
 .kotlin
 
-# VS code
-.vscode/settings.json
+#project secrets
+/secrets.properties

app/build.gradle.kts

@@ -15,6 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import io.gitlab.arturbosch.detekt.Detekt
 import java.io.FileInputStream
 import java.util.Properties
 
@@ -28,6 +29,7 @@ plugins {
     alias(libs.plugins.protobuf)
     alias(libs.plugins.devtools.ksp)
     alias(libs.plugins.detekt)
+    alias(libs.plugins.secrets)
 }
 
 val keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -50,7 +52,7 @@ android {
     compileSdk = Configs.COMPILE_SDK
     defaultConfig {
         applicationId = Configs.APPLICATION_ID
-        minSdk = Configs.MIN_SDK_VERSION
+        minSdk = Configs.MIN_SDK
         targetSdk = Configs.TARGET_SDK
         versionCode =
             Configs.VERSION_CODE // format is Mmmss (where M is 1+the numeric major number)
@@ -191,8 +193,10 @@ dependencies {
     implementation(libs.bundles.coil)
 
     // OSM
-    implementation(libs.bundles.osm)
-    implementation(libs.osmdroid.geopackage) { exclude(group = "com.j256.ormlite") }
+    "fdroidImplementation"(libs.bundles.osm)
+    "fdroidImplementation"(libs.osmdroid.geopackage) { exclude(group = "com.j256.ormlite") }
+
+    "googleImplementation"(libs.bundles.maps.compose)
 
     // ZXing
     implementation(libs.zxing.android.embedded) { isTransitive = false }
@@ -247,6 +251,19 @@ repositories {
 detekt {
     config.setFrom("../config/detekt/detekt.yml")
     baseline = file("../config/detekt/detekt-baseline.xml")
+    source.setFrom(
+        files(
+            "src/main/java",
+            "src/google/java",
+            "src/fdroid/java",
+        )
+    )
+    parallel = true
+}
+
+secrets {
+    propertiesFileName = "secrets.properties"
+    defaultPropertiesFileName = "local.defaults.properties"
 }
 
 val googleServiceKeywords = listOf("crashlytics", "google")
@@ -260,3 +277,18 @@ tasks.configureEach {
         enabled = false
     }
 }
+tasks.withType<Detekt> {
+    reports {
+        xml.required = true
+        xml.outputLocation = file("build/reports/detekt/detekt.xml")
+        html.required = true
+        html.outputLocation = file("build/reports/detekt/detekt.html")
+        sarif.required = true
+        sarif.outputLocation = file("build/reports/detekt/detekt.sarif")
+        md.required = true
+        md.outputLocation = file("build/reports/detekt/detekt.md")
+    }
+    debug = true
+    include("**/*.kt")
+    include("**/*.kts")
+}

app/src/fdroid/java/com/geeksville/mesh/MeshUtilApplication.kt

@@ -28,6 +28,5 @@ class MeshUtilApplication : GeeksvilleApplication() {
         super.onCreate()
 
         Logging.showLogs = BuildConfig.DEBUG
-
     }
-}
+}

app/src/fdroid/java/com/geeksville/mesh/analytics/NopAnalytics.kt

@@ -23,7 +23,7 @@ import com.geeksville.mesh.android.Logging
 class DataPair(val name: String, valueIn: Any?) {
     val value = valueIn ?: "null"
 
-    /// An accumulating firebase event - only one allowed per event
+    // / An accumulating firebase event - only one allowed per event
     constructor(d: Double) : this("BOGUS", d)
     constructor(d: Int) : this("BOGUS", d)
 }

app/src/fdroid/java/com/geeksville/mesh/android/GeeksvilleApplication.kt

@@ -30,14 +30,18 @@ open class GeeksvilleApplication : Application(), Logging {
     companion object {
         lateinit var analytics: AnalyticsProvider
     }
-
-    /// Are we running inside the testlab?
+    val isGooglePlayAvailable: Boolean
+        get() {
+          return false
+        }
+    // / Are we running inside the testlab?
     val isInTestLab: Boolean
         get() {
             val testLabSetting =
                 Settings.System.getString(contentResolver, "firebase.test.lab") ?: null
-            if(testLabSetting != null)
+            if (testLabSetting != null) {
                 info("Testlab is $testLabSetting")
+            }
             return "true" == testLabSetting
         }
 
@@ -69,5 +73,3 @@ open class GeeksvilleApplication : Application(), Logging {
         isAnalyticsAllowed = false
     }
 }
-
-fun Context.isGooglePlayAvailable(): Boolean = false

app/src/main/java/com/geeksville/mesh/model/map/clustering/MarkerClusterer.java → app/src/fdroid/java/com/geeksville/mesh/model/map/clustering/MarkerClusterer.java

@@ -1,17 +1,32 @@
+/*
+ * 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 com.geeksville.mesh.model.map.clustering;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Point;
 import android.view.MotionEvent;
 
-import org.osmdroid.api.IGeoPoint;
-import org.osmdroid.bonuspack.kml.KmlFeature;
+import com.geeksville.mesh.model.map.MarkerWithLabel;
+
 import org.osmdroid.util.BoundingBox;
-import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.overlay.Overlay;
-import com.geeksville.mesh.model.map.MarkerWithLabel;
 
 import java.util.ArrayList;
 import java.util.Iterator;

app/src/main/java/com/geeksville/mesh/model/map/clustering/RadiusMarkerClusterer.java → app/src/fdroid/java/com/geeksville/mesh/model/map/clustering/RadiusMarkerClusterer.java

@@ -1,3 +1,20 @@
+/*
+ * 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 com.geeksville.mesh.model.map.clustering;
 
 import android.content.Context;
@@ -10,11 +27,12 @@
 import android.graphics.drawable.Drawable;
 import android.view.MotionEvent;
 
+import com.geeksville.mesh.model.map.MarkerWithLabel;
+
 import org.osmdroid.bonuspack.R;
 import org.osmdroid.util.BoundingBox;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
-import com.geeksville.mesh.model.map.MarkerWithLabel;
 
 import java.util.ArrayList;
 import java.util.Iterator;

app/src/main/java/com/geeksville/mesh/model/map/clustering/StaticCluster.java → app/src/fdroid/java/com/geeksville/mesh/model/map/clustering/StaticCluster.java

@@ -1,8 +1,26 @@
+/*
+ * 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 com.geeksville.mesh.model.map.clustering;
 
+import com.geeksville.mesh.model.map.MarkerWithLabel;
+
 import org.osmdroid.util.BoundingBox;
 import org.osmdroid.util.GeoPoint;
-import com.geeksville.mesh.model.map.MarkerWithLabel;
 
 import java.util.ArrayList;