Fix the detekted issues

Author: afarber

.github/workflows/_docs.yml

@@ -47,6 +47,14 @@ jobs:
           mkdir -p openmapview/build/dokka/html/licenses
           cp openmapview/build/reports/licenses/licenses.html openmapview/build/dokka/html/licenses/index.html
 
+      - name: Run Detekt Analysis
+        run: ./gradlew detekt --no-daemon
+
+      - name: Copy Detekt Report to Docs
+        run: |
+          mkdir -p openmapview/build/dokka/html/detekt
+          cp openmapview/build/reports/detekt/detekt.html openmapview/build/dokka/html/detekt/index.html
+
       - name: Upload documentation artifact
         uses: actions/upload-artifact@v4
         with:

.github/workflows/docs-deploy.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - 'openmapview/src/**/*.kt'
       - 'README.md'
+      - 'config/detekt/detekt.yml'
       - '.github/workflows/_docs.yml'
       - '.github/workflows/docs-deploy.yml'
 

config/detekt/detekt.yml

@@ -1,34 +1,63 @@
 build:
   maxIssues: 0
 
-formatting:
-  active: false
-
 complexity:
   active: true
   LongMethod:
-    threshold: 60
+    threshold: 200
   LongParameterList:
-    threshold: 6
-  ComplexMethod:
-    threshold: 15
+    functionThreshold: 10
+    constructorThreshold: 12
+  CyclomaticComplexMethod:
+    threshold: 50
+  TooManyFunctions:
+    thresholdInClasses: 100
+    thresholdInObjects: 20
+  LargeClass:
+    threshold: 3000
+  ComplexCondition:
+    threshold: 5
+  NestedBlockDepth:
+    threshold: 8
 
 style:
   active: true
   MagicNumber:
-    ignoreNumbers:
-      - '-1'
-      - '0'
-      - '1'
-      - '2'
-    ignorePropertyDeclaration: true
-    ignoreAnnotation: true
+    active: false
+  MaxLineLength:
+    maxLineLength: 140
+  ReturnCount:
+    max: 15
+  FunctionOnlyReturningConstant:
+    active: false
+  LoopWithTooManyJumpStatements:
+    active: false
+  UseRequire:
+    active: true
+  UnusedPrivateMember:
+    active: false
 
 naming:
   active: true
+  FunctionNaming:
+    ignoreAnnotated:
+      - Composable
 
-potential-bugs:
+empty-blocks:
   active: true
 
+comments:
+  active: false
+
 performance:
   active: true
+
+coroutines:
+  active: true
+
+exceptions:
+  active: true
+  SwallowedException:
+    active: false
+  TooGenericExceptionCaught:
+    active: false

docs/CONTRIBUTING.md

@@ -51,7 +51,28 @@ Running `./gradlew spotlessApply` automatically adds this header to any files mi
 
 The CI pipeline includes a copyright check that will fail if any `.kt` files are missing the required header.
 
-### 3. Dependency Management
+### 3. Static Code Analysis
+
+All code must pass Detekt static analysis checks. Detekt analyzes code for:
+- Code complexity and potential bugs
+- Naming conventions
+- Performance issues
+- Code smells
+
+**Run static analysis:**
+
+```bash
+./gradlew detekt
+```
+
+The CI pipeline will fail if Detekt finds any issues. View the HTML report at:
+```
+openmapview/build/reports/detekt/detekt.html
+```
+
+The Detekt report is also published at https://afarber.github.io/OpenMapView/detekt/
+
+### 4. Dependency Management
 
 Before adding new dependencies to OpenMapView, verify the following:
 
@@ -98,8 +119,8 @@ From the repository root, run:
 This installs a pre-commit hook that automatically:
 1. Checks code formatting with `./scripts/check-format.sh`
 2. Checks copyright headers with `./scripts/check-copyright.sh`
-3. Blocks the commit if any issues are found
-4. Provides instructions to run `./gradlew spotlessApply` to fix issues
+3. Runs Detekt static analysis with `./scripts/check-detekt.sh`
+4. Blocks the commit if any issues are found
 
 ### What Happens on Commit
 
@@ -112,6 +133,8 @@ Running pre-commit checks...
    Code formatting: OK
 2. Checking copyright headers...
    Copyright headers: OK
+3. Running Detekt static analysis...
+   Static analysis: OK
 
 All pre-commit checks passed!
 ```
@@ -190,10 +213,11 @@ The CI pipeline runs automatically on all pull requests and includes:
 
 1. **Format Check** - Verifies Spotless formatting
 2. **Copyright Check** - Verifies MIT license headers
-3. **Unit Tests** - Runs all JVM unit tests
-4. **Test Coverage** - Ensures minimum 20% code coverage
-5. **Build Library** - Builds the OpenMapView AAR
-6. **Build Examples** - Builds all example applications
+3. **Static Analysis** - Runs Detekt code analysis
+4. **Unit Tests** - Runs all JVM unit tests
+5. **Test Coverage** - Ensures minimum 20% code coverage
+6. **Build Library** - Builds the OpenMapView AAR
+7. **Build Examples** - Builds all example applications
 
 All checks must pass before merging.
 
@@ -206,6 +230,9 @@ All checks must pass before merging.
 # Check formatting
 ./gradlew spotlessCheck
 
+# Run static analysis
+./gradlew detekt
+
 # Run unit tests
 ./gradlew :openmapview:test
 

docs/GITHUB_WORKFLOWS.md

@@ -81,11 +81,15 @@ Located in `.github/workflows/`:
 - **Duration**: ~10-15 minutes (may vary due to emulator startup)
 
 #### `_docs.yml`
-- **Purpose**: Build API documentation with Dokka
-- **Runs**: `./gradlew dokkaGenerate`
-- **Artifacts**: Uploads generated HTML documentation
+- **Purpose**: Build API documentation with Dokka, license report, and Detekt report
+- **Runs**: `./gradlew dokkaGenerate`, `./gradlew generateLicenseReport`, `./gradlew detekt`
+- **Artifacts**: Uploads generated HTML documentation with license and Detekt reports
 - **Usage**: Called by CI for validation and docs-deploy for publishing
-- **Duration**: ~1-2 minutes
+- **Duration**: ~2-3 minutes
+- **Published URLs**:
+  - API docs: https://afarber.github.io/OpenMapView/
+  - Licenses: https://afarber.github.io/OpenMapView/licenses/
+  - Detekt: https://afarber.github.io/OpenMapView/detekt/
 
 ### Main Workflows
 

examples/Example11MapTypes/src/main/kotlin/de/afarber/openmapview/example11maptypes/MainActivity.kt

@@ -30,7 +30,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -57,7 +56,6 @@ class MainActivity : ComponentActivity() {
 
 @Composable
 fun MapViewScreen() {
-    val context = LocalContext.current
     val lifecycleOwner = androidx.lifecycle.compose.LocalLifecycleOwner.current
     val configuration = LocalConfiguration.current
     var currentMapType by remember { mutableStateOf(MapType.STANDARD) }
@@ -287,7 +285,8 @@ fun MapTypeControls(
 
         // API Key Info
         Text(
-            text = "API key required: Cycle Map, Transport, Transport Dark, Tracestrack Topo\n\nConfigure in AndroidManifest.xml\nSee docs/API_KEYS.md",
+            text = "API key required: Cycle Map, Transport, Transport Dark, " +
+                "Tracestrack Topo\n\nConfigure in AndroidManifest.xml\nSee docs/API_KEYS.md",
             style = MaterialTheme.typography.bodySmall,
             fontSize = 9.sp,
             lineHeight = 11.sp,

openmapview/src/main/kotlin/de/afarber/openmapview/MapController.kt

@@ -213,13 +213,6 @@ class MapController(
             strokeWidth = 2f
         }
 
-    private val tileTextPaint =
-        Paint().apply {
-            color = Color.BLACK
-            textSize = 24f
-            textAlign = Paint.Align.CENTER
-        }
-
     private val tilePlaceholderPaint =
         Paint().apply {
             style = Paint.Style.FILL

openmapview/src/main/kotlin/de/afarber/openmapview/OpenMapView.kt

@@ -305,7 +305,7 @@ class OpenMapView
                                     }
                                 }
 
-                                val consumed = controller.onMarkerClickListener?.onMarkerClick(touchedMarker) ?: false
+                                controller.onMarkerClickListener?.onMarkerClick(touchedMarker)
                                 controller.commitPan()
                                 invalidate()
                                 return true
@@ -500,10 +500,7 @@ class OpenMapView
          * @see getMapType
          */
         fun setMapType(type: Int) {
-            // Validate map type
-            if (type !in 0..14) {
-                throw IllegalArgumentException("Unknown map type: $type. Must be a valid MapType constant (0-14).")
-            }
+            require(type in 0..14) { "Unknown map type: $type. Must be a valid MapType constant (0-14)." }
 
             currentMapType = type
             controller.setMapType(type)

openmapview/src/test/kotlin/de/afarber/openmapview/MapControllerTest.kt

@@ -86,7 +86,6 @@ class MapControllerTest {
     @Test
     fun testZoom_BeyondMaxLimit() {
         controller.setZoom(18.0f)
-        val oldZoom = controller.getZoom()
         controller.zoom(5.0f, 540f, 960f)
         assertEquals(MapController.DEFAULT_MAX_ZOOM, controller.getZoom(), DELTA)
     }