fix #477 make track colors configurable

Author: pstorch

build.gradle.kts

@@ -40,8 +40,8 @@ android {
         compileSdk = 35
         minSdk = 26
         targetSdk = 35
-        versionCode = 49
-        versionName = "6.1.0"
+        versionCode = 50
+        versionName = "6.2.0"
         applicationId = "de.storchp.opentracks.osmplugin"
 
         testInstrumentationRunnerArguments += mapOf("runnerBuilder" to "de.mannodermaus.junit5.AndroidJUnit5Builder")
@@ -179,6 +179,7 @@ dependencies {
     implementation(libs.material)
     implementation(libs.activity)
     implementation(libs.activity.ktx)
+    implementation(libs.colorpicker)
 
     // VTM
     implementation(libs.vtm)

fastlane/metadata/android/de-DE/changelogs/50.txt

@@ -0,0 +1,3 @@
+- Neu: Trackfarben sind nun konfigurierbar
+- Übersetzungen aktualisiert
+- Abhängigkeiten aktualisiert

fastlane/metadata/android/en-US/changelogs/50.txt

@@ -0,0 +1,3 @@
+- New: make track colors configurable
+- Updated translations
+- Updated dependencies

gradle/libs.versions.toml

@@ -5,6 +5,7 @@ androidsvg = "1.4"
 androidTest = "1.7.0"
 appcompat = "1.7.0"
 assertJ = "3.27.3"
+colorpicker = "1.1.5"
 constraintlayout = "2.2.1"
 desugar_jdk_libs = "2.1.5"
 documentfile = "1.0.1"
@@ -26,6 +27,7 @@ android-test-core = { module = "de.mannodermaus.junit5:android-test-core", versi
 androidsvg = { module = "com.caverock:androidsvg", version.ref = "androidsvg" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertJ" }
+colorpicker = { module = "com.github.7Koston:HSVColorPicker", version.ref = "colorpicker" }
 constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 documentfile = { module = "androidx.documentfile:documentfile", version.ref = "documentfile" }

src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapUtils.kt

@@ -3,10 +3,11 @@ package de.storchp.opentracks.osmplugin.map
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
-import android.graphics.Color
 import android.location.Location
 import android.util.Log
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import androidx.core.graphics.createBitmap
 import de.storchp.opentracks.osmplugin.R
 import de.storchp.opentracks.osmplugin.map.model.Trackpoint
 import de.storchp.opentracks.osmplugin.utils.UnitConversions
@@ -101,9 +102,9 @@ object MapUtils {
                 idx = current[0] + 1
                 while (idx < current[1]) {
                     dist = distance(
-                        trackpoints[idx].latLong!!,
-                        trackpoints[current[0]].latLong!!,
-                        trackpoints[current[1]].latLong!!
+                        trackpoints[idx].latLong,
+                        trackpoints[current[0]].latLong,
+                        trackpoints[current[1]].latLong
                     )
                     if (dist > maxDist) {
                         maxDist = dist
@@ -179,10 +180,7 @@ object MapUtils {
 
     fun getBitmapFromVectorDrawable(context: Context, drawableId: Int): Bitmap {
         val drawable = ContextCompat.getDrawable(context, drawableId)
-        val bitmap = Bitmap.createBitmap(
-            drawable!!.intrinsicWidth,
-            drawable.intrinsicHeight, Bitmap.Config.ARGB_8888
-        )
+        val bitmap = createBitmap(drawable!!.intrinsicWidth, drawable.intrinsicHeight)
         val canvas = Canvas(bitmap)
         drawable.setBounds(0, 0, canvas.width, canvas.height)
         drawable.draw(canvas)
@@ -191,21 +189,25 @@ object MapUtils {
     }
 
     fun getTrackColorBySpeed(
-        average: Double,
-        averageToMaxSpeed: Double,
-        trackpoint: Trackpoint
+        averageSpeed: Double,
+        maxSpeed: Double,
+        trackpoint: Trackpoint,
+        trackSpeedColors: SpeedColors
     ): Int {
-        var red = 255
-        var green = 255
+        val averageToMaxSpeed = maxSpeed - averageSpeed
         val speed = trackpoint.speed ?: 0.0
-        if (speed == 0.0) {
-            green = 0
-        } else if (speed < average) {
-            green = (255 * speed / average).toInt()
+        return if (speed < averageSpeed) {
+            ColorUtils.blendARGB(
+                trackSpeedColors.low, trackSpeedColors.average,
+                (speed / averageSpeed).toFloat()
+            )
         } else {
-            red = 255 - (255 * (speed - average) / averageToMaxSpeed).toInt()
+            ColorUtils.blendARGB(
+                trackSpeedColors.average, trackSpeedColors.high,
+                ((speed - averageSpeed) / averageToMaxSpeed).toFloat()
+            )
+
         }
-        return Color.argb(255, red, green, 0)
     }
 
     fun createMarkerSymbol(

src/main/kotlin/de/storchp/opentracks/osmplugin/map/SpeedColors.kt

@@ -0,0 +1,3 @@
+package de.storchp.opentracks.osmplugin.map
+
+data class SpeedColors(val low: Int, val average: Int, val high: Int)

src/main/kotlin/de/storchp/opentracks/osmplugin/map/StyleColorCreator.kt

@@ -4,7 +4,6 @@ import android.util.Log
 import de.storchp.opentracks.osmplugin.map.DEFAULT_TRACK_COLOR_MODE
 import de.storchp.opentracks.osmplugin.map.MapData
 import de.storchp.opentracks.osmplugin.map.MapUtils
-import de.storchp.opentracks.osmplugin.map.StyleColorCreator
 import de.storchp.opentracks.osmplugin.map.TrackColorMode
 import de.storchp.opentracks.osmplugin.map.model.Track
 import de.storchp.opentracks.osmplugin.map.model.TrackStatistics
@@ -13,7 +12,6 @@ import de.storchp.opentracks.osmplugin.map.model.TrackpointsDebug
 import de.storchp.opentracks.osmplugin.map.model.Waypoint
 import de.storchp.opentracks.osmplugin.utils.PreferencesUtils
 import org.oscim.core.GeoPoint
-import kotlin.collections.forEach
 
 private val TAG: String = MapDataReader::class.java.getSimpleName()
 
@@ -23,8 +21,9 @@ abstract class MapDataReader(
     private val updateTrackpointsDebug: UpdateTrackpointsDebug,
 ) {
 
-    private val colorCreator = StyleColorCreator()
-    private var trackColor = colorCreator.nextColor()
+    private val trackSpeedColors = PreferencesUtils.getTrackSpeedColors()
+    private val trackColors = PreferencesUtils.getTrackColors()
+    private var trackColor = trackColors.first()
     private var trackpointsDebug = TrackpointsDebug()
     var lastTrackId: Long? = null
         protected set
@@ -53,11 +52,11 @@ abstract class MapDataReader(
 
         val average = trackpointsBySegments.calcAverageSpeed()
         val maxSpeed = trackpointsBySegments.calcMaxSpeed()
-        val averageToMaxSpeed = maxSpeed - average
         var trackColorMode = PreferencesUtils.getTrackColorMode()
         if (isRecording && !trackColorMode.supportsLiveTrack) {
             trackColorMode = DEFAULT_TRACK_COLOR_MODE
         }
+        var trackIndex = 0
 
         trackpointsBySegments.segments.map { trackpoints ->
             if (!update) {
@@ -71,7 +70,8 @@ abstract class MapDataReader(
             trackpoints.forEach { trackpoint ->
                 if (trackpoint.trackId != lastTrackId) {
                     if (trackColorMode == TrackColorMode.BY_TRACK) {
-                        trackColor = colorCreator.nextColor()
+                        trackColor = trackColors[trackIndex % trackColors.size]
+                        trackIndex++
                     }
                     lastTrackId = trackpoint.trackId
                     mapData.resetCurrentPolyline()
@@ -80,8 +80,9 @@ abstract class MapDataReader(
                 if (trackColorMode == TrackColorMode.BY_SPEED) {
                     trackColor = MapUtils.getTrackColorBySpeed(
                         average,
-                        averageToMaxSpeed,
-                        trackpoint
+                        maxSpeed,
+                        trackpoint,
+                        trackSpeedColors,
                     )
                     mapData.addNewPolyline(trackColor, trackpoint)
                 } else {

src/main/kotlin/de/storchp/opentracks/osmplugin/map/reader/MapDataReader.kt

@@ -11,12 +11,11 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
 import androidx.preference.Preference
 import androidx.preference.Preference.SummaryProvider
-import androidx.preference.PreferenceFragmentCompat
+import com.github.koston.preference.ColorPreferenceFragmentCompat
 import de.storchp.opentracks.osmplugin.BuildConfig
 import de.storchp.opentracks.osmplugin.R
 import de.storchp.opentracks.osmplugin.databinding.ActivitySettingsBinding
 import de.storchp.opentracks.osmplugin.download.MAPS_V_5_DOWNLOAD_URI
-import de.storchp.opentracks.osmplugin.settings.SettingsActivity.SettingsFragment
 import de.storchp.opentracks.osmplugin.utils.FileUtil
 import de.storchp.opentracks.osmplugin.utils.PreferencesUtils
 
@@ -43,7 +42,7 @@ class SettingsActivity : AppCompatActivity() {
         setSupportActionBar(binding.toolbar.mapsToolbar)
     }
 
-    class SettingsFragment : PreferenceFragmentCompat() {
+    class SettingsFragment : ColorPreferenceFragmentCompat() {
         private val sharedPreferenceChangeListener =
             OnSharedPreferenceChangeListener { sharedPreferences, key ->
                 if (PreferencesUtils.isKey(R.string.night_mode_key, key)) {

src/main/kotlin/de/storchp/opentracks/osmplugin/settings/SettingsActivity.kt

@@ -11,9 +11,9 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.PreferenceManager
 import de.storchp.opentracks.osmplugin.R
 import de.storchp.opentracks.osmplugin.map.MapMode
+import de.storchp.opentracks.osmplugin.map.SpeedColors
 import de.storchp.opentracks.osmplugin.map.TrackColorMode
 import de.storchp.opentracks.osmplugin.map.toMapMode
-import java.lang.Exception
 
 object PreferencesUtils {
     private val TAG: String = PreferencesUtils::class.java.getSimpleName()
@@ -27,6 +27,46 @@ object PreferencesUtils {
 
     private fun getKey(@StringRes keyId: Int) = resources.getString(keyId)
 
+    fun getTrackColors() =
+        listOf(
+            getInt(
+                R.string.APP_PREF_TRACK_COLOR_1,
+                resources.getColor(R.color.track_color_1_default, null)
+            ),
+            getInt(
+                R.string.APP_PREF_TRACK_COLOR_2,
+                resources.getColor(R.color.track_color_2_default, null)
+            ),
+            getInt(
+                R.string.APP_PREF_TRACK_COLOR_3,
+                resources.getColor(R.color.track_color_3_default, null)
+            ),
+            getInt(
+                R.string.APP_PREF_TRACK_COLOR_4,
+                resources.getColor(R.color.track_color_4_default, null)
+            ),
+            getInt(
+                R.string.APP_PREF_TRACK_COLOR_5,
+                resources.getColor(R.color.track_color_5_default, null)
+            ),
+        )
+
+    fun getTrackSpeedColors() =
+        SpeedColors(
+            getInt(
+                R.string.APP_PREF_TRACK_COLOR_SPEED_LOW,
+                resources.getColor(R.color.track_color_speed_low_default, null)
+            ),
+            getInt(
+                R.string.APP_PREF_TRACK_COLOR_SPEED_AVERAGE,
+                resources.getColor(R.color.track_color_speed_average_default, null)
+            ),
+            getInt(
+                R.string.APP_PREF_TRACK_COLOR_SPEED_HIGH,
+                resources.getColor(R.color.track_color_speed_high_default, null)
+            )
+        )
+
     fun getMapUris(): Set<Uri> {
         return getUris(getKey(R.string.APP_PREF_MAP_FILES))
     }
@@ -96,7 +136,8 @@ object PreferencesUtils {
     }
 
     private fun setUris(keyId: Int, uris: Set<Uri>) {
-        setStringSet(keyId,
+        setStringSet(
+            keyId,
             uris
                 .map { it.toString() }
                 .toSet())