update version

wuan · Jan 2, 2025 · 7e69570 · 7e69570
1 parent 167d865
commit 7e69570
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 52 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "org.blitzortung.android.app"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 325
-        versionName '2.2.6'
+        versionCode 326
+        versionName '2.3.0beta1'
         multiDexEnabled false
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/org/blitzortung/android/app/Main.kt b/app/src/main/java/org/blitzortung/android/app/Main.kt
@@ -30,8 +30,6 @@ import android.location.LocationManager.*
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.os.PowerManager
 import android.preference.PreferenceManager
 import android.provider.Settings
@@ -421,7 +419,6 @@ class Main : FragmentActivity(), OnSharedPreferenceChangeListener {
             mapView.zoomLevelDouble
         }
 
-        Log.d(LOG_TAG, "Main.animateAndZoomTo() start animation ${mapView.zoomLevelDouble}")
         mapView.controller.animateTo(GeoPoint(latitude, longitude), targetZoomLevel, OwnMapView.DEFAULT_ZOOM_SPEED)
     }
 

diff --git a/app/src/main/java/org/blitzortung/android/app/view/HistogramView.kt b/app/src/main/java/org/blitzortung/android/app/view/HistogramView.kt
@@ -112,13 +112,13 @@ class HistogramView @JvmOverloads constructor(
             var topCoordinate = padding
 
             val bb = mapFragment.mapView.boundingBox
-            val text = "%.2f..%.2f - %.2f..%.2f".format(bb.lonWest, bb.lonEast, bb.latSouth, bb.latNorth)
+            val text = "%.2f..%.2f  %.2f..%.2f".format(bb.lonWest, bb.lonEast, bb.latSouth, bb.latNorth)
             canvas.drawText(text, width - padding, topCoordinate + textSize / 1.2f * SMALL_TEXT_SCALE, smallTextPaint)
             topCoordinate += (textSize + padding) * SMALL_TEXT_SCALE
 
             val gridParameters = gridParameters
             if (gridParameters != null) {
-                val text = "%.2f..%.2f - %.2f..%.2f".format(gridParameters.longitudeStart, gridParameters.longitudeEnd, gridParameters.latitudeEnd, gridParameters.latitudeStart)
+                val text = "%.2f..%.2f  %.2f..%.2f".format(gridParameters.longitudeStart, gridParameters.longitudeEnd, gridParameters.latitudeEnd, gridParameters.latitudeStart)
                 canvas.drawText(text, width - padding, topCoordinate + textSize / 1.2f * SMALL_TEXT_SCALE, smallTextPaint)
                 topCoordinate += (textSize + padding) * SMALL_TEXT_SCALE
             }

diff --git a/app/src/main/java/org/blitzortung/android/app/view/LegendView.kt b/app/src/main/java/org/blitzortung/android/app/view/LegendView.kt
@@ -25,12 +25,10 @@ import android.graphics.Paint
 import android.graphics.RectF
 import android.util.AttributeSet
 import org.blitzortung.android.app.R
-import org.blitzortung.android.map.MapFragment
 import org.blitzortung.android.map.overlay.StrikeListOverlay
 import org.blitzortung.android.util.TabletAwareView
 import kotlin.math.max
 import kotlin.math.min
-import kotlin.math.round
 
 class LegendView @JvmOverloads constructor(
     context: Context,

diff --git a/app/src/main/java/org/blitzortung/android/data/MainDataHandler.kt b/app/src/main/java/org/blitzortung/android/data/MainDataHandler.kt
@@ -26,7 +26,6 @@ import android.location.Location
 import android.os.Handler
 import android.util.Log
 import android.widget.Toast
-import androidx.core.animation.doOnEnd
 import org.blitzortung.android.app.Main.Companion.LOG_TAG
 import org.blitzortung.android.app.R
 import org.blitzortung.android.app.view.OnSharedPreferenceChangeListener
@@ -143,10 +142,6 @@ class MainDataHandler @Inject constructor(
     val hasConsumers: Boolean
         get() = dataConsumerContainer.isEmpty
 
-    open fun defaultUpdate(animator: Animator) {
-        updateData()
-    }
-
     fun updateData(updateTargets: Set<DataChannel> = DEFAULT_DATA_CHANNELS) {
         if (updatesEnabled) {
             sendEvent(REQUEST_STARTED_EVENT)
@@ -423,59 +418,35 @@ class MainDataHandler @Inject constructor(
         return if (event != null) {
             val mapView = event.source as OwnMapView
             val updated = updateLocation(mapView.boundingBox)
-            if (updated && !mapView.isAnimating) {
-                updateData()
-            }
-            updated
+            ensureUpdate(updated, mapView)
         } else {
             false
         }
     }
 
-    private val animatorListener = object : AnimatorListener {
-        override fun onAnimationStart(animation: Animator) {
-        }
-
-        override fun onAnimationEnd(animation: Animator) {
-            Log.v(LOG_TAG, "MainDataHandler AnimatorListener.onAnimationEnd()")
-            this@MainDataHandler.updateData()
-        }
-
-        override fun onAnimationCancel(animation: Animator) {
-            Log.v(LOG_TAG, "MainDataHandler AnimatorListener.onAnimationCancel()")
-            this@MainDataHandler.updateData()
-        }
-
-        override fun onAnimationRepeat(animation: Animator) {
-        }
-    }
-
     override fun onZoom(event: ZoomEvent?): Boolean {
         return if (event != null) {
             val mapView = event.source as OwnMapView
             val updateAutoGridSize = updateAutoGridSize(event.zoomLevel)
             val updateLocation = updateLocation(mapView.boundingBox, updateAutoGridSize)
             val updated = updateLocation || updateAutoGridSize
-            if (updated) {
-                if (mapView.isAnimating) {
-
-                    val animator = mapView.animator()!!
-
-                    if (!animator.listeners.contains(animatorListener)) {
-                        animator.addListener(animatorListener)
-                    }
-
-                    Log.v(LOG_TAG, "MainDataHandler.onZoom() listeners ${animator.listeners}")
-                } else {
-                    updateData()
-                }
-            }
-            updated
+            ensureUpdate(updated, mapView)
         } else {
             false
         }
     }
 
+    private fun ensureUpdate(updated: Boolean, mapView: OwnMapView): Boolean {
+        if (updated) {
+            if (mapView.isAnimating) {
+                addUpdateAfterAnimationListener(mapView)
+            } else {
+                updateData()
+            }
+        }
+        return updated
+    }
+
     fun updateLocation(boundingBox: BoundingBox, force: Boolean = false): Boolean = localData.update(boundingBox, force)
 
     fun updateAutoGridSize(zoomLevel: Double): Boolean =
@@ -501,6 +472,29 @@ class MainDataHandler @Inject constructor(
             false
         }
 
+    private fun addUpdateAfterAnimationListener(mapView: OwnMapView) {
+        val animator = mapView.animator()!!
+
+        if (!animator.listeners.contains(animatorListener)) {
+            animator.addListener(animatorListener)
+        }
+    }
+
+    private val animatorListener = object : AnimatorListener {
+        override fun onAnimationStart(animation: Animator) {
+        }
+
+        override fun onAnimationEnd(animation: Animator) {
+            this@MainDataHandler.updateData()
+        }
+
+        override fun onAnimationCancel(animation: Animator) {
+            this@MainDataHandler.updateData()
+        }
+
+        override fun onAnimationRepeat(animation: Animator) {
+        }
+    }
 
     fun calculateTotalCacheSize(): CacheSize = cache.calculateTotalSize()
 }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@ Polish by Jakub Świątkiewicz ([email protected]), Agnieszka Cieślak (aga_04@
 Italian by Michele Locati ([email protected])\n
 Russian by Ivan Karev ([email protected])\n
     </string>
-    <string name="copyright" translatable="false">© 2011–2024, Andreas Würl</string>
+    <string name="copyright" translatable="false">© 2011–2025, Andreas Würl</string>
     <string name="project_email" translatable="false">[email protected]</string>
     <string name="legend">Legend</string>
     <string name="legend_grid">Grid</string>