refactor classes and packages

pstorch · pstorch · commit 749d6acbf3fd · 2024-10-18T11:25:10.000+02:00
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
         <activity android:name=".settings.DirectoryChooserActivity$MapDirectoryChooserActivity" />
         <activity android:name=".settings.DirectoryChooserActivity$ThemeDirectoryChooserActivity" />
         <activity
-            android:name=".MapsActivity"
+            android:name=".map.MapsActivity"
             android:launchMode="singleTask"
             android:supportsPictureInPicture="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/BaseActivity.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/BaseActivity.kt
@@ -16,7 +16,7 @@ import de.storchp.opentracks.osmplugin.settings.SettingsActivity
 abstract class BaseActivity : AppCompatActivity() {
     fun onCreateOptionsMenu(menu: Menu, showInfo: Boolean) {
         super.onCreateOptionsMenu(menu)
-        menuInflater.inflate(R.menu.maps, menu)
+        menuInflater.inflate(R.menu.map, menu)
 
         MenuCompat.setGroupDividerEnabled(menu, true)
         menu.findItem(R.id.map_info).isVisible = showInfo
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/dashboardapi/Trackpoint.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/dashboardapi/Trackpoint.kt
@@ -2,7 +2,7 @@ package de.storchp.opentracks.osmplugin.dashboardapi
 
 import android.content.ContentResolver
 import android.net.Uri
-import de.storchp.opentracks.osmplugin.utils.MapUtils
+import de.storchp.opentracks.osmplugin.map.MapUtils
 import de.storchp.opentracks.osmplugin.utils.TrackpointsDebug
 import org.oscim.core.GeoPoint
 
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/dashboardapi/Waypoint.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/dashboardapi/Waypoint.kt
@@ -2,7 +2,7 @@ package de.storchp.opentracks.osmplugin.dashboardapi
 
 import android.content.ContentResolver
 import android.net.Uri
-import de.storchp.opentracks.osmplugin.utils.MapUtils
+import de.storchp.opentracks.osmplugin.map.MapUtils
 import org.oscim.core.GeoPoint
 import java.net.URLDecoder
 import java.util.regex.Pattern
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapActivity.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapActivity.kt
@@ -1,4 +1,4 @@
-package de.storchp.opentracks.osmplugin
+package de.storchp.opentracks.osmplugin.map
 
 import android.content.DialogInterface
 import android.content.Intent
@@ -25,21 +25,18 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.view.children
 import androidx.documentfile.provider.DocumentFile
-import de.storchp.opentracks.osmplugin.MapsActivity.OpenTracksContentObserver
+import de.storchp.opentracks.osmplugin.BaseActivity
+import de.storchp.opentracks.osmplugin.BuildConfig
+import de.storchp.opentracks.osmplugin.MainActivity
+import de.storchp.opentracks.osmplugin.R
 import de.storchp.opentracks.osmplugin.dashboardapi.APIConstants
 import de.storchp.opentracks.osmplugin.dashboardapi.TrackReader
 import de.storchp.opentracks.osmplugin.dashboardapi.TrackpointReader
 import de.storchp.opentracks.osmplugin.dashboardapi.TrackpointsBySegments
 import de.storchp.opentracks.osmplugin.dashboardapi.WaypointReader
 import de.storchp.opentracks.osmplugin.databinding.ActivityMapsBinding
-import de.storchp.opentracks.osmplugin.maps.MovementDirection
-import de.storchp.opentracks.osmplugin.maps.StyleColorCreator
-import de.storchp.opentracks.osmplugin.utils.DEFAULT_TRACK_COLOR_MORE
-import de.storchp.opentracks.osmplugin.utils.MapMode
-import de.storchp.opentracks.osmplugin.utils.MapUtils
+import de.storchp.opentracks.osmplugin.map.MapsActivity.OpenTracksContentObserver
 import de.storchp.opentracks.osmplugin.utils.PreferencesUtils
-import de.storchp.opentracks.osmplugin.utils.TrackColorMode
-import de.storchp.opentracks.osmplugin.utils.TrackStatistics
 import de.storchp.opentracks.osmplugin.utils.TrackpointsDebug
 import okhttp3.Cache
 import okhttp3.OkHttpClient
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapMode.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapMode.kt
@@ -1,6 +1,5 @@
-package de.storchp.opentracks.osmplugin.utils
+package de.storchp.opentracks.osmplugin.map
 
-import de.storchp.opentracks.osmplugin.maps.MovementDirection
 import java.lang.IllegalArgumentException
 
 enum class MapMode {
@@ -13,7 +12,7 @@ enum class MapMode {
     };
 
     abstract fun getHeading(movementDirection: MovementDirection): Float
-    
+
 }
 
 fun String.toMapMode(defaultValue: MapMode) =
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapUtils.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/map/MapUtils.kt
@@ -1,4 +1,4 @@
-package de.storchp.opentracks.osmplugin.utils
+package de.storchp.opentracks.osmplugin.map
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat
 import de.storchp.opentracks.osmplugin.R
 import de.storchp.opentracks.osmplugin.dashboardapi.Trackpoint
 import de.storchp.opentracks.osmplugin.dashboardapi.Waypoint
-import de.storchp.opentracks.osmplugin.maps.MovementDirection
+import de.storchp.opentracks.osmplugin.utils.UnitConversions
 import org.oscim.android.canvas.AndroidBitmap
 import org.oscim.core.GeoPoint
 import org.oscim.layers.marker.MarkerItem
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/map/MovementDirection.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/map/MovementDirection.kt
@@ -1,6 +1,5 @@
-package de.storchp.opentracks.osmplugin.maps
+package de.storchp.opentracks.osmplugin.map
 
-import de.storchp.opentracks.osmplugin.utils.MapUtils
 import org.oscim.core.GeoPoint
 
 class MovementDirection {
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/map/StyleColorCreator.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/map/StyleColorCreator.kt
@@ -1,4 +1,4 @@
-package de.storchp.opentracks.osmplugin.maps
+package de.storchp.opentracks.osmplugin.map
 
 import org.oscim.backend.canvas.Color
 import kotlin.math.floor
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/map/TrackColorMode.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/map/TrackColorMode.kt
@@ -0,0 +1,9 @@
+package de.storchp.opentracks.osmplugin.map
+
+val DEFAULT_TRACK_COLOR_MORE: TrackColorMode = TrackColorMode.BY_TRACK
+
+enum class TrackColorMode(val supportsLiveTrack: Boolean) {
+    UNI(true),
+    BY_TRACK(true),
+    BY_SPEED(false);
+}
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/map/TrackStatistics.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/map/TrackStatistics.kt
@@ -1,4 +1,4 @@
-package de.storchp.opentracks.osmplugin.utils
+package de.storchp.opentracks.osmplugin.map
 
 import de.storchp.opentracks.osmplugin.dashboardapi.Track
 import kotlin.math.max
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/FileItem.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/FileItem.kt
@@ -1,4 +1,4 @@
-package de.storchp.opentracks.osmplugin.utils
+package de.storchp.opentracks.osmplugin.settings
 
 import android.net.Uri
 import androidx.documentfile.provider.DocumentFile
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/MapItemAdapter.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/MapItemAdapter.kt
@@ -1,4 +1,4 @@
-package de.storchp.opentracks.osmplugin.utils
+package de.storchp.opentracks.osmplugin.settings
 
 import android.app.Activity
 import android.net.Uri
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/MapSelectionActivity.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/MapSelectionActivity.kt
@@ -17,9 +17,7 @@ import de.storchp.opentracks.osmplugin.R
 import de.storchp.opentracks.osmplugin.databinding.ActivityMapSelectionBinding
 import de.storchp.opentracks.osmplugin.databinding.MapItemBinding
 import de.storchp.opentracks.osmplugin.download.DownloadActivity.DownloadType
-import de.storchp.opentracks.osmplugin.utils.FileItem
 import de.storchp.opentracks.osmplugin.utils.FileUtil
-import de.storchp.opentracks.osmplugin.utils.MapItemAdapter
 import de.storchp.opentracks.osmplugin.utils.PreferencesUtils
 import java.nio.file.Files
 
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/ThemeItemAdapter.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/ThemeItemAdapter.kt
@@ -1,4 +1,4 @@
-package de.storchp.opentracks.osmplugin.utils
+package de.storchp.opentracks.osmplugin.settings
 
 import android.app.Activity
 import android.net.Uri
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/ThemeSelectionActivity.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/settings/ThemeSelectionActivity.kt
@@ -19,10 +19,8 @@ import de.storchp.opentracks.osmplugin.databinding.ActivityThemeSelectionBinding
 import de.storchp.opentracks.osmplugin.databinding.ThemeItemBinding
 import de.storchp.opentracks.osmplugin.download.DownloadActivity.DownloadType
 import de.storchp.opentracks.osmplugin.settings.ThemeSelectionActivity.MapThemeDirScanner
-import de.storchp.opentracks.osmplugin.utils.FileItem
 import de.storchp.opentracks.osmplugin.utils.FileUtil
 import de.storchp.opentracks.osmplugin.utils.PreferencesUtils
-import de.storchp.opentracks.osmplugin.utils.ThemeItemAdapter
 import org.oscim.theme.ZipXmlThemeResourceProvider
 import java.io.BufferedInputStream
 import java.io.File
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/utils/PreferencesUtils.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/utils/PreferencesUtils.kt
@@ -10,6 +10,9 @@ import androidx.annotation.StringRes
 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.TrackColorMode
+import de.storchp.opentracks.osmplugin.map.toMapMode
 import java.lang.Exception
 
 object PreferencesUtils {
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/utils/StatisticElement.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/utils/StatisticElement.kt
@@ -2,6 +2,7 @@ package de.storchp.opentracks.osmplugin.utils
 
 import android.content.Context
 import de.storchp.opentracks.osmplugin.R
+import de.storchp.opentracks.osmplugin.map.TrackStatistics
 import java.lang.IllegalArgumentException
 
 enum class StatisticElement {
diff --git a/src/main/kotlin/de/storchp/opentracks/osmplugin/utils/TrackColorMode.kt b/src/main/kotlin/de/storchp/opentracks/osmplugin/utils/TrackColorMode.kt
diff --git a/src/main/res/drawable/baseline_settings_24.xml b/src/main/res/drawable/baseline_settings_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#666666" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="#666666" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+    
+</vector>
diff --git a/src/main/res/menu/map.xml b/src/main/res/menu/map.xml
@@ -5,11 +5,14 @@
     <item
         android:id="@+id/action_settings"
         android:title="@string/action_settings"
-        app:showAsAction="never" />
+        app:showAsAction="ifRoom"
+        android:iconTint="@color/design_default_color_on_primary"
+        android:icon="@drawable/baseline_settings_24" />
 
     <item
         android:id="@+id/map_info"
         android:title="@string/map_info_menu"
+        android:iconTint="@color/design_default_color_on_primary"
         android:icon="@drawable/ic_info_gray_24px" />
 
 </menu>
diff --git a/src/test/kotlin/de/storchp/opentracks/osmplugin/utils/MapUtilsTest.kt b/src/test/kotlin/de/storchp/opentracks/osmplugin/utils/MapUtilsTest.kt
@@ -1,5 +1,6 @@
 package de.storchp.opentracks.osmplugin.utils
 
+import de.storchp.opentracks.osmplugin.map.MapUtils
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.storchp.opentracks.osmplugin.maps`
	`1`	`+package de.storchp.opentracks.osmplugin.map`
`2`	`2`
`3`	`3`	`import org.oscim.backend.canvas.Color`
`4`	`4`	`import kotlin.math.floor`