Improve warning setup (#373)

* show out of data area

* refactor and add tests

* update java

* update

* cleanup

* cleanup

* cleanup

* tests

* add more tests

* refactor AlarmView

* more refactoring

* fix issue

* cleanup

* more refactoring

* add AlarmView test

* add tests

* another test

* add tests

* add two more tests

Author: wuan

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2

app/build.gradle.kts

@@ -41,12 +41,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlin {
-        jvmToolchain(17)
+        jvmToolchain(21)
         compilerOptions {
             apiVersion.set(KotlinVersion.KOTLIN_2_2)
         }

app/src/androidTest/java/org/blitzortung/android/app/MainTest.kt

@@ -25,7 +25,7 @@ class MainTest {
     @get:Rule
     val activityRule = ActivityScenarioRule(Main::class.java)
 
-    private lateinit var uiDevice: androidx.test.uiautomator.UiDevice
+    private lateinit var uiDevice: UiDevice
     private val timeout = 5000L // 5 seconds
 
     @Before

app/src/main/java/org/blitzortung/android/alert/AlertLabelHandler.kt

@@ -19,33 +19,47 @@
 package org.blitzortung.android.alert
 
 import android.content.Context
-import org.blitzortung.android.app.R
+import org.blitzortung.android.app.R.color.Green
+import org.blitzortung.android.app.R.color.RedWarn
+import org.blitzortung.android.app.R.color.Yellow
 
 class AlertLabelHandler(
     private val alertLabel: AlertLabel,
     private val context: Context,
 ) {
-    fun apply(result: AlertResult?) {
-        var warningText = ""
+    fun apply(result: Warning) {
 
-        var textColorResource = R.color.Green
-
-        if (result != null && result.closestStrikeDistance < Float.POSITIVE_INFINITY) {
-            textColorResource =
-                when (result.closestStrikeDistance) {
-                    in 0.0..20.0 -> R.color.RedWarn
-                    in 20.0..50.0 -> R.color.Yellow
-                    else -> R.color.Green
-                }
-            val distanceUnit = context.resources.getString(result.parameters.measurementSystem.unitNameString)
-            warningText = "%.0f$distanceUnit".format(result.closestStrikeDistance)
-            if (result.closestStrikeDistance > 0.1) {
-                warningText += " ${result.bearingName}"
-            }
+        val (warningText, textColorResource) = when (result) {
+            is LocalActivity -> extractStatus(result)
+            Outlying -> "<->" to RedWarn
+            NoData -> "" to Green
+            NoLocation -> "?" to RedWarn
         }
 
         val color = context.getColor(textColorResource)
         alertLabel.setAlarmTextColor(color)
         alertLabel.setAlarmText(warningText)
     }
+
+    fun extractStatus(result: LocalActivity): Pair<String, Int> {
+        return if (result.closestStrikeDistance < Float.POSITIVE_INFINITY) {
+            val textColorResource =
+                when (result.closestStrikeDistance) {
+                    in 0.0..20.0 -> RedWarn
+                    in 20.0..50.0 -> Yellow
+                    else -> Green
+                }
+            val distanceUnit = context.resources.getString(result.parameters.measurementSystem.unitNameString)
+            val status =
+                "%.0f$distanceUnit".format(result.closestStrikeDistance) + if (result.closestStrikeDistance > 0.1) {
+                    " ${result.bearingName}"
+                } else {
+                    ""
+                }
+            status to textColorResource
+        } else {
+            "" to Green
+        }
+    }
+
 }

app/src/main/java/org/blitzortung/android/alert/AlertParameters.kt

@@ -25,4 +25,6 @@ data class AlertParameters(
     val rangeSteps: List<Float>,
     val sectorLabels: List<String>,
     val measurementSystem: MeasurementSystem,
-)
+) {
+    val sectorWidth = (360 / sectorLabels.size).toFloat()
+}

…blitzortung/android/alert/AlertResult.kt …org/blitzortung/android/alert/Warning.ktapp/src/main/java/org/blitzortung/android/alert/AlertResult.kt renamed to app/src/main/java/org/blitzortung/android/alert/Warning.kt app/src/main/java/org/blitzortung/android/alert/AlertResult.kt renamed to app/src/main/java/org/blitzortung/android/alert/Warning.kt

@@ -20,11 +20,20 @@ package org.blitzortung.android.alert
 
 import org.blitzortung.android.alert.data.AlertSector
 
-data class AlertResult(
+sealed interface Warning
+
+object Outlying : Warning
+
+object NoData : Warning
+
+object NoLocation : Warning
+
+data class LocalActivity(
     val sectors: List<AlertSector>,
     val parameters: AlertParameters,
     val referenceTime: Long,
-) {
+) : Warning {
+
     val sectorsByDistance: Map<Float, AlertSector> by lazy {
         sectors
             .filter { it.closestStrikeDistance < Float.POSITIVE_INFINITY }

app/src/main/java/org/blitzortung/android/alert/event/AlertCancelEvent.kt

@@ -23,8 +23,10 @@ import android.location.Location
 import android.util.Log
 import javax.inject.Inject
 import kotlin.math.max
+import org.blitzortung.android.alert.LocalActivity
 import org.blitzortung.android.alert.AlertParameters
-import org.blitzortung.android.alert.AlertResult
+import org.blitzortung.android.alert.Warning
+import org.blitzortung.android.alert.Outlying
 import org.blitzortung.android.alert.data.AlertSector
 import org.blitzortung.android.app.Main.Companion.LOG_TAG
 import org.blitzortung.android.data.beans.GridElement
@@ -44,7 +46,7 @@ open class AlertDataHandler
             location: Location,
             parameters: AlertParameters,
             referenceTime: Long = System.currentTimeMillis(),
-        ): AlertResult? {
+        ): Warning {
             val gridParameters: GridParameters? = strikes.gridParameters
             if (gridParameters != null &&
                 !gridParameters.isGlobal &&
@@ -58,7 +60,7 @@ open class AlertDataHandler
                     LOG_TAG,
                     "Location $location is not in grid ${gridParameters.longitudeInterval} + ${gridParameters.latitudeInterval}",
                 )
-                return null
+                return Outlying
             }
 
             val sectors = createSectors(parameters)
@@ -83,7 +85,7 @@ open class AlertDataHandler
                 }
             }
 
-            return AlertResult(sectors.map { aggregatingAlertDataMapper.mapSector(it) }, parameters, referenceTime)
+            return LocalActivity(sectors.map { aggregatingAlertDataMapper.mapSector(it) }, parameters, referenceTime)
         }
 
         private fun checkStrike(
@@ -141,13 +143,13 @@ open class AlertDataHandler
 
         fun getLatestTimstampWithin(
             distanceLimit: Float,
-            alertResult: AlertResult,
+            alertResult: LocalActivity,
         ): Long = alertResult.sectors.fold(0L) { latestTimestamp, sector ->
             max(latestTimestamp, getLatestTimestampWithin(distanceLimit, sector))
         }
 
         fun getTextMessage(
-            alertResult: AlertResult,
+            alertResult: LocalActivity,
             notificationDistanceLimit: Float,
             resources: Resources,
         ): String = alertResult.sectorsByDistance