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
 
@@ -29,6 +30,7 @@ plugins {
     alias(libs.plugins.devtools.ksp)
     alias(libs.plugins.detekt)
     alias(libs.plugins.spotless)
+    alias(libs.plugins.secrets)
 }
 
 val keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -52,7 +54,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 = System.getenv("VERSION_CODE")?.toIntOrNull() ?: 30630
         testInstrumentationRunner = "com.geeksville.mesh.TestRunner"
@@ -206,8 +208,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 }
@@ -259,6 +263,13 @@ repositories { maven { url = uri("https://jitpack.io") } }
 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")
@@ -272,6 +283,22 @@ tasks.configureEach {
     }
 }
 
+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")
+}
+
 spotless {
     ratchetFrom("origin/main")
     kotlin {

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,47 +23,36 @@ 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)
 }
 
-/**
- * Implement our analytics API using Firebase Analytics
- */
-@Suppress("UNUSED_PARAMETER")
-class NopAnalytics(context: Context) : AnalyticsProvider, Logging {
+/** Implement our analytics API using Firebase Analytics */
+@Suppress("UNUSED_PARAMETER", "EmptyFunctionBlock", "EmptyInitBlock")
+class NopAnalytics(context: Context) :
+    AnalyticsProvider,
+    Logging {
 
-    init {
-    }
+    init {}
 
-    override fun setEnabled(on: Boolean) {
-    }
+    override fun setEnabled(on: Boolean) {}
 
-    override fun endSession() {
-    }
+    override fun endSession() {}
 
-    override fun trackLowValue(event: String, vararg properties: DataPair) {
-    }
+    override fun trackLowValue(event: String, vararg properties: DataPair) {}
 
-    override fun track(event: String, vararg properties: DataPair) {
-    }
+    override fun track(event: String, vararg properties: DataPair) {}
 
-    override fun startSession() {
-    }
+    override fun startSession() {}
 
-    override fun setUserInfo(vararg p: DataPair) {
-    }
+    override fun setUserInfo(vararg p: DataPair) {}
 
-    override fun increment(name: String, amount: Double) {
-    }
+    override fun increment(name: String, amount: Double) {}
 
-    /**
-     * Send a google analytics screen view event
-     */
-    override fun sendScreenView(name: String) {
-    }
+    /** Send a google analytics screen view event */
+    override fun sendScreenView(name: String) {}
 
-    override fun endScreenView() {
-    }
+    override fun endScreenView() {}
 }

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

@@ -25,19 +25,26 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import com.geeksville.mesh.analytics.AnalyticsProvider
 
-open class GeeksvilleApplication : Application(), Logging {
+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)
+            val testLabSetting = Settings.System.getString(contentResolver, "firebase.test.lab") ?: null
+            if (testLabSetting != null) {
                 info("Testlab is $testLabSetting")
+            }
             return "true" == testLabSetting
         }
 
@@ -48,9 +55,7 @@ open class GeeksvilleApplication : Application(), Logging {
     var isAnalyticsAllowed: Boolean
         get() = analyticsPrefs.getBoolean("allowed", true)
         set(value) {
-            analyticsPrefs.edit {
-                putBoolean("allowed", value)
-            }
+            analyticsPrefs.edit { putBoolean("allowed", value) }
 
             // Change the flag with the providers
             analytics.setEnabled(value && !isInTestLab) // Never do analytics in the test lab
@@ -69,5 +74,3 @@ open class GeeksvilleApplication : Application(), Logging {
         isAnalyticsAllowed = false
     }
 }
-
-fun Context.isGooglePlayAvailable(): Boolean = false