Reverts code style changes introduced in 4dcea979 and 66f4865d

.editorconfig

@@ -1,9 +0,0 @@
-# editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true

app/src/main/java/org/y20k/trackbook/Keys.kt

@@ -44,9 +44,8 @@ object Keys {
     const val ARG_TRACK_ID: String = "ArgTrackId"
 
     // preferences
-    const val PREF_ONE_TIME_HOUSEKEEPING_NECESSARY =
+    const val PREF_ONE_TIME_HOUSEKEEPING_NECESSARY = "ONE_TIME_HOUSEKEEPING_NECESSARY_VERSIONCODE_38" // increment to current app version code to trigger housekeeping that runs only once
-        "ONE_TIME_HOUSEKEEPING_NECESSARY_VERSIONCODE_38" // increment to current app version code to trigger housekeeping that runs only once
+    const val PREF_THEME_SELECTION: String= "prefThemeSelection"
-    const val PREF_THEME_SELECTION: String = "prefThemeSelection"
     const val PREF_CURRENT_BEST_LOCATION_PROVIDER: String = "prefCurrentBestLocationProvider"
     const val PREF_CURRENT_BEST_LOCATION_LATITUDE: String = "prefCurrentBestLocationLatitude"
     const val PREF_CURRENT_BEST_LOCATION_LONGITUDE: String = "prefCurrentBestLocationLongitude"
@@ -78,7 +77,7 @@ object Keys {
     const val DIALOG_EMPTY_PAYLOAD_INT: Int = -1
 
     // folder names
-    const val FOLDER_TEMP: String = "temp"
+    const val FOLDER_TEMP: String  = "temp"
     const val FOLDER_TRACKS: String = "tracks"
     const val FOLDER_GPX: String = "gpx"
 
@@ -96,29 +95,21 @@ object Keys {
     const val DEFAULT_RFC2822_DATE: String = "Thu, 01 Jan 1970 01:00:00 +0100"  // --> Date(0)
     const val ONE_HOUR_IN_MILLISECONDS: Int = 3600000
     const val EMPTY_STRING_RESOURCE: Int = 0
-    const val REQUEST_CURRENT_LOCATION_INTERVAL: Long =
+    const val REQUEST_CURRENT_LOCATION_INTERVAL: Long = 1000L                   // 1 second in milliseconds
-        1000L                   // 1 second in milliseconds
+    const val ADD_WAYPOINT_TO_TRACK_INTERVAL: Long = 15000L                     // 15 seconds in milliseconds
-    const val ADD_WAYPOINT_TO_TRACK_INTERVAL: Long =
+    const val SIGNIFICANT_TIME_DIFFERENCE: Long = 120000L                       // 2 minutes in milliseconds
-        15000L                     // 15 seconds in milliseconds
+    const val STOP_OVER_THRESHOLD: Long = 300000L                               // 5 minutes in milliseconds
-    const val SIGNIFICANT_TIME_DIFFERENCE: Long =
-        120000L                       // 2 minutes in milliseconds
-    const val STOP_OVER_THRESHOLD: Long =
-        300000L                               // 5 minutes in milliseconds
     const val IMPLAUSIBLE_TRACK_START_SPEED: Double = 250.0                     // 250 km/h
-    const val DEFAULT_LATITUDE: Double =
+    const val DEFAULT_LATITUDE: Double = 71.172500                              // latitude Nordkapp, Norway
-        71.172500                              // latitude Nordkapp, Norway
+    const val DEFAULT_LONGITUDE: Double = 25.784444                             // longitude Nordkapp, Norway
-    const val DEFAULT_LONGITUDE: Double =
-        25.784444                             // longitude Nordkapp, Norway
     const val DEFAULT_ACCURACY: Float = 300f                                    // in meters
     const val DEFAULT_ALTITUDE: Double = 0.0
     const val DEFAULT_TIME: Long = 0L
     const val DEFAULT_THRESHOLD_LOCATION_ACCURACY: Int = 30                     // 30 meters
-    const val DEFAULT_THRESHOLD_LOCATION_AGE: Long =
+    const val DEFAULT_THRESHOLD_LOCATION_AGE: Long = 60000000000L               // one minute in nanoseconds
-        60000000000L               // one minute in nanoseconds
     const val DEFAULT_THRESHOLD_DISTANCE: Float = 15f                           // 15 meters
     const val DEFAULT_ZOOM_LEVEL: Double = 16.0
-    const val ALTITUDE_MEASUREMENT_ERROR_THRESHOLD =
+    const val ALTITUDE_MEASUREMENT_ERROR_THRESHOLD = 10 // altitude changes of 10 meter or more (per 15 seconds) are being discarded
-        10 // altitude changes of 10 meter or more (per 15 seconds) are being discarded
     const val REQUEST_CODE_FOREGROUND = 42
 
     // requests

app/src/main/java/org/y20k/trackbook/MainActivity.kt

@@ -69,8 +69,7 @@ class MainActivity : AppCompatActivity() {
 
         // set up views
         setContentView(R.layout.activity_main)
-        navHostFragment =
+        navHostFragment  = supportFragmentManager.findFragmentById(R.id.main_container) as NavHostFragment
-            supportFragmentManager.findFragmentById(R.id.main_container) as NavHostFragment
         bottomNavigationView = findViewById<BottomNavigationView>(R.id.bottom_navigation_view)
         bottomNavigationView.setupWithNavController(navController = navHostFragment.navController)
 
@@ -78,13 +77,12 @@ class MainActivity : AppCompatActivity() {
         navHostFragment.navController.addOnDestinationChangedListener { _, destination, _ ->
             when (destination.id) {
                 R.id.fragment_track -> {
-                    runOnUiThread {
+                    runOnUiThread( Runnable() {
-                        run {
+                        run(){
                             // mark menu item "Tracks" as checked
-                            bottomNavigationView.menu.findItem(R.id.tracklist_fragment)
+                            bottomNavigationView.menu.findItem(R.id.tracklist_fragment).setChecked(true)
-                                .setChecked(true)
                         }
-                    }
+                    })
                 }
                 else -> {
                     // do nothing
@@ -93,8 +91,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         // register listener for changes in shared preferences
-        PreferenceManager.getDefaultSharedPreferences(this as Context)
+        PreferenceManager.getDefaultSharedPreferences(this as Context).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
-            .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
     }
 
 
@@ -102,22 +99,20 @@ class MainActivity : AppCompatActivity() {
     override fun onDestroy() {
         super.onDestroy()
         // unregister listener for changes in shared preferences
-        PreferenceManager.getDefaultSharedPreferences(this as Context)
+        PreferenceManager.getDefaultSharedPreferences(this as Context).unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
-            .unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
     }
 
 
     /*
      * Defines the listener for changes in shared preferences
      */
-    private val sharedPreferenceChangeListener =
+    private val sharedPreferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key ->
-        SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
+        when (key) {
-            when (key) {
+            Keys.PREF_THEME_SELECTION -> {
-                Keys.PREF_THEME_SELECTION -> {
+                AppThemeHelper.setTheme(PreferencesHelper.loadThemeSelection(this@MainActivity))
-                    AppThemeHelper.setTheme(PreferencesHelper.loadThemeSelection(this@MainActivity))
-                }
             }
         }
+    }
     /*
      * End of declaration
      */

app/src/main/java/org/y20k/trackbook/MapFragment.kt

@@ -73,20 +73,9 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark
 
 
     /* Overrides onStop from Fragment */
-    override fun onCreateView(
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
         // initialize layout
-        layout = MapFragmentLayoutHolder(
+        layout = MapFragmentLayoutHolder(activity as Context, this as MapOverlay.MarkerListener, inflater, container, currentBestLocation, trackingState)
-            activity as Context,
-            this as MapOverlay.MarkerListener,
-            inflater,
-            container,
-            currentBestLocation,
-            trackingState
-        )
 
         // set up buttons
         layout.currentLocationButton.setOnClickListener {
@@ -115,22 +104,11 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark
     override fun onStart() {
         super.onStart()
         // request location permission if denied
-        if (ContextCompat.checkSelfPermission(
+        if (ContextCompat.checkSelfPermission(activity as Context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_DENIED) {
-                activity as Context,
+            this.requestPermissions(arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), Keys.REQUEST_CODE_FOREGROUND)
-                Manifest.permission.ACCESS_FINE_LOCATION
-            ) == PackageManager.PERMISSION_DENIED
-        ) {
-            this.requestPermissions(
-                arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
-                Keys.REQUEST_CODE_FOREGROUND
-            )
         }
         // bind to TrackerService
-        activity?.bindService(
+        activity?.bindService(Intent(activity, TrackerService::class.java), connection, Context.BIND_AUTO_CREATE)
-            Intent(activity, TrackerService::class.java),
-            connection,
-            Context.BIND_AUTO_CREATE
-        )
     }
 
 
@@ -164,22 +142,14 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark
 
 
     /* Overrides onRequestPermissionsResult from Fragment */
-    override fun onRequestPermissionsResult(
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray
-    ) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         when (requestCode) {
             Keys.REQUEST_CODE_FOREGROUND -> {
                 if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
                     // permission was granted - re-bind service
                     activity?.unbindService(connection)
-                    activity?.bindService(
+                    activity?.bindService(Intent(activity, TrackerService::class.java), connection, Context.BIND_AUTO_CREATE)
-                        Intent(activity, TrackerService::class.java),
-                        connection,
-                        Context.BIND_AUTO_CREATE
-                    )
                     LogHelper.i(TAG, "Request result: Location permission has been granted.")
                 } else {
                     // permission denied - unbind service
@@ -193,12 +163,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark
 
 
     /* Overrides onYesNoDialog from YesNoDialogListener */
-    override fun onYesNoDialog(
+    override fun onYesNoDialog(type: Int, dialogResult: Boolean, payload: Int, payloadString: String) {
-        type: Int,
-        dialogResult: Boolean,
-        payload: Int,
-        payloadString: String
-    ) {
         super.onYesNoDialog(type, dialogResult, payload, payloadString)
         when (type) {
             Keys.DIALOG_EMPTY_RECORDING -> {
@@ -253,18 +218,11 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark
     /* Saves track - shows dialog, if recording is still empty */
     private fun saveTrack() {
         if (track.wayPoints.isEmpty()) {
-            YesNoDialog(this as YesNoDialog.YesNoDialogListener).show(
+            YesNoDialog(this as YesNoDialog.YesNoDialogListener).show(activity as Context, type = Keys.DIALOG_EMPTY_RECORDING, title = R.string.dialog_error_empty_recording_title, message = R.string.dialog_error_empty_recording_message, yesButton = R.string.dialog_error_empty_recording_action_resume)
-                activity as Context,
-                type = Keys.DIALOG_EMPTY_RECORDING,
-                title = R.string.dialog_error_empty_recording_title,
-                message = R.string.dialog_error_empty_recording_message,
-                yesButton = R.string.dialog_error_empty_recording_action_resume
-            )
         } else {
             GlobalScope.launch {
                 // step 1: create and store filenames for json and gpx files
-                track.trackUriString =
+                track.trackUriString = FileHelper.getTrackFileUri(activity as Context, track).toString()
-                    FileHelper.getTrackFileUri(activity as Context, track).toString()
                 track.gpxUriString = FileHelper.getGpxFileUri(activity as Context, track).toString()
                 // step 2: save track
                 FileHelper.saveTrackSuspended(track, saveGpxToo = true)
@@ -281,7 +239,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark
 
     /* Opens a track in TrackFragment */
     private fun openTrack(tracklistElement: TracklistElement) {
-        val bundle = Bundle()
+        val bundle: Bundle = Bundle()
         bundle.putString(Keys.ARG_TRACK_TITLE, tracklistElement.name)
         bundle.putString(Keys.ARG_TRACK_FILE_URI, tracklistElement.trackUriString)
         bundle.putString(Keys.ARG_GPX_FILE_URI, tracklistElement.gpxUriString)
@@ -293,17 +251,16 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark
     /*
      * Defines the listener for changes in shared preferences
      */
-    private val sharedPreferenceChangeListener =
+    private val sharedPreferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key ->
-        SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
+        when (key) {
-            when (key) {
+            Keys.PREF_TRACKING_STATE -> {
-                Keys.PREF_TRACKING_STATE -> {
+                if (activity != null) {
-                    if (activity != null) {
+                    trackingState = PreferencesHelper.loadTrackingState(activity as Context)
-                        trackingState = PreferencesHelper.loadTrackingState(activity as Context)
+                    layout.updateRecordingButton(trackingState)
-                        layout.updateRecordingButton(trackingState)
-                    }
                 }
             }
         }
+    }
     /*
      * End of declaration
      */
@@ -322,18 +279,15 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark
             trackingState = trackerService.trackingState
             layout.updateRecordingButton(trackingState)
             // register listener for changes in shared preferences
-            PreferenceManager.getDefaultSharedPreferences(activity as Context)
+            PreferenceManager.getDefaultSharedPreferences(activity as Context).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
-                .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
             // start listening for location updates
             handler.removeCallbacks(periodicLocationRequestRunnable)
             handler.postDelayed(periodicLocationRequestRunnable, 0)
         }
-
         override fun onServiceDisconnected(arg0: ComponentName) {
             bound = false
             // unregister listener for changes in shared preferences
-            PreferenceManager.getDefaultSharedPreferences(activity as Context)
+            PreferenceManager.getDefaultSharedPreferences(activity as Context).unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
-                .unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener)
             // stop receiving location updates
             handler.removeCallbacks(periodicLocationRequestRunnable)
         }
@@ -358,9 +312,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark
             layout.markCurrentPosition(currentBestLocation, trackingState)
             layout.overlayCurrentTrack(track, trackingState)
             // center map, if it had not been dragged/zoomed before
-            if (!layout.userInteraction) {
+            if (!layout.userInteraction) { layout.centerMap(currentBestLocation, true)}
-                layout.centerMap(currentBestLocation, true)
-            }
             // show error snackbar if necessary
             layout.toggleLocationErrorBar(gpsProviderActive, networkProviderActive)
             // use the handler to start runnable again after specified delay

app/src/main/java/org/y20k/trackbook/Trackbook.kt

@@ -27,7 +27,7 @@ import org.y20k.trackbook.helpers.PreferencesHelper
 /*
  * Trackbook.class
  */
-class Trackbook : Application() {
+class Trackbook: Application() {
 
 
     /* Define log tag */
@@ -49,4 +49,4 @@ class Trackbook : Application() {
         LogHelper.v(TAG, "Trackbook application terminated.")
     }
 
-}
+}

app/src/main/java/org/y20k/trackbook/core/Track.kt

@@ -32,26 +32,24 @@ import java.util.*
  */
 @Keep
 @Parcelize
-data class Track(
+data class Track (@Expose var trackFormatVersion: Int = Keys.CURRENT_TRACK_FORMAT_VERSION,
-    @Expose var trackFormatVersion: Int = Keys.CURRENT_TRACK_FORMAT_VERSION,
+                  @Expose val wayPoints: MutableList<WayPoint> = mutableListOf<WayPoint>(),
-    @Expose val wayPoints: MutableList<WayPoint> = mutableListOf<WayPoint>(),
+                  @Expose var length: Float = 0f,
-    @Expose var length: Float = 0f,
+                  @Expose var duration: Long = 0L,
-    @Expose var duration: Long = 0L,
+                  @Expose var recordingPaused: Long = 0L,
-    @Expose var recordingPaused: Long = 0L,
+                  @Expose var stepCount: Float = 0f,
-    @Expose var stepCount: Float = 0f,
+                  @Expose var recordingStart: Date = GregorianCalendar.getInstance().time,
-    @Expose var recordingStart: Date = GregorianCalendar.getInstance().time,
+                  @Expose var recordingStop: Date = recordingStart,
-    @Expose var recordingStop: Date = recordingStart,
+                  @Expose var maxAltitude: Double = 0.0,
-    @Expose var maxAltitude: Double = 0.0,
+                  @Expose var minAltitude: Double = 0.0,
-    @Expose var minAltitude: Double = 0.0,
+                  @Expose var positiveElevation: Double = 0.0,
-    @Expose var positiveElevation: Double = 0.0,
+                  @Expose var negativeElevation: Double = 0.0,
-    @Expose var negativeElevation: Double = 0.0,
+                  @Expose var trackUriString: String = String(),
-    @Expose var trackUriString: String = String(),
+                  @Expose var gpxUriString: String = String(),
-    @Expose var gpxUriString: String = String(),
+                  @Expose var latitude: Double = Keys.DEFAULT_LATITUDE,
-    @Expose var latitude: Double = Keys.DEFAULT_LATITUDE,
+                  @Expose var longitude: Double = Keys.DEFAULT_LONGITUDE,
-    @Expose var longitude: Double = Keys.DEFAULT_LONGITUDE,
+                  @Expose var zoomLevel: Double = Keys.DEFAULT_ZOOM_LEVEL,
-    @Expose var zoomLevel: Double = Keys.DEFAULT_ZOOM_LEVEL,
+                  @Expose var name: String = String()): Parcelable {
-    @Expose var name: String = String()
-) : Parcelable {
 
 
     /* Creates a TracklistElement */
@@ -77,4 +75,4 @@ data class Track(
     }
 
 
-}
+}

app/src/main/java/org/y20k/trackbook/core/Tracklist.kt

@@ -31,11 +31,9 @@ import java.util.*
  */
 @Keep
 @Parcelize
-data class Tracklist(
+data class Tracklist (@Expose val tracklistFormatVersion: Int = Keys.CURRENT_TRACKLIST_FORMAT_VERSION,
-    @Expose val tracklistFormatVersion: Int = Keys.CURRENT_TRACKLIST_FORMAT_VERSION,
+                      @Expose val tracklistElements: MutableList<TracklistElement> = mutableListOf<TracklistElement>(),
-    @Expose val tracklistElements: MutableList<TracklistElement> = mutableListOf<TracklistElement>(),
+                      @Expose var modificationDate: Date = Date()): Parcelable {
-    @Expose var modificationDate: Date = Date()
-) : Parcelable {
 
     /* Return trackelement for given track id */
     fun getTrackElement(trackId: Long): TracklistElement? {
@@ -49,11 +47,7 @@ data class Tracklist(
 
     /* Create a deep copy */
     fun deepCopy(): Tracklist {
-        return Tracklist(
+        return Tracklist(tracklistFormatVersion, mutableListOf<TracklistElement>().apply { addAll(tracklistElements) }, modificationDate)
-            tracklistFormatVersion,
-            mutableListOf<TracklistElement>().apply { addAll(tracklistElements) },
-            modificationDate
-        )
     }
 
-}
+}

app/src/main/java/org/y20k/trackbook/core/TracklistElement.kt

@@ -29,20 +29,18 @@ import java.util.*
  */
 @Keep
 @Parcelize
-data class TracklistElement(
+data class TracklistElement(@Expose var name: String,
-    @Expose var name: String,
+                            @Expose val date: Date,
-    @Expose val date: Date,
+                            @Expose val dateString: String,
-    @Expose val dateString: String,
+                            @Expose val durationString: String,
-    @Expose val durationString: String,
+                            @Expose val length: Float,
-    @Expose val length: Float,
+                            @Expose val trackUriString: String,
-    @Expose val trackUriString: String,
+                            @Expose val gpxUriString: String,
-    @Expose val gpxUriString: String,
+                            @Expose var starred: Boolean = false): Parcelable {
-    @Expose var starred: Boolean = false
-) : Parcelable {
 
     /* Returns unique ID for TracklistElement - currently the start date */
     fun getTrackId(): Long {
         return date.time
     }
 
-}
+}

app/src/main/java/org/y20k/trackbook/core/WayPoint.kt

@@ -29,18 +29,16 @@ import kotlinx.android.parcel.Parcelize
  */
 @Keep
 @Parcelize
-data class WayPoint(
+data class WayPoint(@Expose val provider: String,
-    @Expose val provider: String,
+                    @Expose val latitude: Double,
-    @Expose val latitude: Double,
+                    @Expose val longitude: Double,
-    @Expose val longitude: Double,
+                    @Expose val altitude: Double,
-    @Expose val altitude: Double,
+                    @Expose val accuracy: Float,
-    @Expose val accuracy: Float,
+                    @Expose val time: Long,
-    @Expose val time: Long,
+                    @Expose val distanceToStartingPoint: Float = 0f,
-    @Expose val distanceToStartingPoint: Float = 0f,
+                    @Expose val numberSatellites: Int = 0,
-    @Expose val numberSatellites: Int = 0,
+                    @Expose var isStopOver: Boolean = false,
-    @Expose var isStopOver: Boolean = false,
+                    @Expose var starred: Boolean = false): Parcelable {
-    @Expose var starred: Boolean = false
-) : Parcelable {
 
 
     /* Converts WayPoint into Location */
@@ -54,4 +52,4 @@ data class WayPoint(
         return location
     }
 
-}
+}

app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt

@@ -30,7 +30,7 @@ import org.y20k.trackbook.helpers.LogHelper
 /*
  * RenameTrackDialog class
  */
-class RenameTrackDialog(private var renameTrackListener: RenameTrackListener) {
+class RenameTrackDialog (private var renameTrackListener: RenameTrackListener) {
 
     /* Interface used to communicate back to activity */
     interface RenameTrackListener {
@@ -45,7 +45,7 @@ class RenameTrackDialog(private var renameTrackListener: RenameTrackListener) {
     /* Construct and show dialog */
     fun show(context: Context, trackName: String) {
         // prepare dialog builder
-        val builder = MaterialAlertDialogBuilder(context)
+        val builder: MaterialAlertDialogBuilder = MaterialAlertDialogBuilder(context)
 
         // get input field
         val inflater = LayoutInflater.from(context)
@@ -78,4 +78,4 @@ class RenameTrackDialog(private var renameTrackListener: RenameTrackListener) {
         builder.show()
     }
 
-}
+}

app/src/main/java/org/y20k/trackbook/helpers/AppThemeHelper.kt

@@ -99,4 +99,6 @@ object AppThemeHelper {
     }
 
 
-}
+
+
+}

app/src/main/java/org/y20k/trackbook/helpers/DateTimeHelper.kt

@@ -34,24 +34,22 @@ object DateTimeHelper {
 
     /* Converts milliseconds to mm:ss or hh:mm:ss */
     fun convertToReadableTime(context: Context, milliseconds: Long): String {
-        val timeString: String
+        var timeString: String = String()
         val hours: Long = TimeUnit.MILLISECONDS.toHours(milliseconds)
-        val minutes: Long =
+        val minutes: Long = TimeUnit.MILLISECONDS.toMinutes(milliseconds) % TimeUnit.HOURS.toMinutes(1)
-            TimeUnit.MILLISECONDS.toMinutes(milliseconds) % TimeUnit.HOURS.toMinutes(1)
+        val seconds: Long = TimeUnit.MILLISECONDS.toSeconds(milliseconds) % TimeUnit.MINUTES.toSeconds(1)
-        val seconds: Long =
-            TimeUnit.MILLISECONDS.toSeconds(milliseconds) % TimeUnit.MINUTES.toSeconds(1)
         val h: String = context.getString(R.string.abbreviation_hours)
         val m: String = context.getString(R.string.abbreviation_minutes)
         val s: String = context.getString(R.string.abbreviation_seconds)
 
-        timeString = when (milliseconds >= Keys.ONE_HOUR_IN_MILLISECONDS) {
+        when (milliseconds >= Keys.ONE_HOUR_IN_MILLISECONDS) {
             // CASE: format hh:mm:ss
             true -> {
-                "$hours $h $minutes $m $seconds $s"
+                timeString = "$hours $h $minutes $m $seconds $s"
             }
             // CASE: format mm:ss
             false -> {
-                "$minutes $m $seconds $s"
+                timeString = "$minutes $m $seconds $s"
             }
         }
         return timeString
@@ -60,7 +58,7 @@ object DateTimeHelper {
 
     /* Create sortable string for date - used for filenames  */
     fun convertToSortableDateString(date: Date): String {
-        val dateFormat = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US)
+        val dateFormat: SimpleDateFormat = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US)
         return dateFormat.format(date)
     }
 
@@ -72,20 +70,14 @@ object DateTimeHelper {
 
 
     /* Creates a readable string date and time - used in the UI */
-    fun convertToReadableDateAndTime(
+    fun convertToReadableDateAndTime(date: Date, dateStyle: Int = DateFormat.SHORT, timeStyle: Int = DateFormat.SHORT): String {
-        date: Date,
+        return "${DateFormat.getDateInstance(dateStyle, Locale.getDefault()).format(date)} ${DateFormat.getTimeInstance(timeStyle, Locale.getDefault()).format(date)}"
-        dateStyle: Int = DateFormat.SHORT,
-        timeStyle: Int = DateFormat.SHORT
-    ): String {
-        return "${DateFormat.getDateInstance(dateStyle, Locale.getDefault())
-            .format(date)} ${DateFormat.getTimeInstance(timeStyle, Locale.getDefault())
-            .format(date)}"
     }
 
 
     /* Calculates time difference between two locations */
-    fun calculateTimeDistance(previousLocation: Location?, location: Location): Long {
+    fun calculateTimeDistance(previousLocation: Location?, location: Location): Long  {
-        var timeDifference = 0L
+        var timeDifference: Long = 0L
         // two data points needed to calculate time difference
         if (previousLocation != null) {
             // get time difference
@@ -95,4 +87,4 @@ object DateTimeHelper {
     }
 
 
-}
+}

app/src/main/java/org/y20k/trackbook/helpers/LengthUnitHelper.kt

@@ -89,51 +89,45 @@ object LengthUnitHelper {
     /* Determines which unit system the device is using (metric or imperial) */
     fun useImperialUnits(): Boolean {
         // America (US), Liberia (LR), Myanmar(MM) use the imperial system
-        val imperialSystemCountries = listOf("US", "LR", "MM")
+        val imperialSystemCountries = Arrays.asList("US", "LR", "MM")
         val countryCode = Locale.getDefault().country
         return imperialSystemCountries.contains(countryCode)
     }
 
 
     /* Converts for the given unit System distance and duration values to a readable velocity string */
-    fun convertToVelocityString(
+    fun convertToVelocityString(trackDuration: Long, trackRecordingPause: Long, trackLength: Float, useImperialUnits: Boolean = false) : String {
-        trackDuration: Long,
+        var speed: String = "0"
-        trackRecordingPause: Long,
-        trackLength: Float,
-        useImperialUnits: Boolean = false
-    ): String {
-        var speed = "0"
 
         // duration minus pause in seconds
         val duration: Long = (trackDuration - trackRecordingPause) / 1000L
 
         if (duration > 0L) {
             // speed in km/h / mph
-            val velocity: Double =
+            val velocity: Double = convertMetersPerSecond((trackLength / duration), useImperialUnits)
-                convertMetersPerSecond((trackLength / duration), useImperialUnits)
             // create readable speed string
             var bd: BigDecimal = BigDecimal.valueOf(velocity)
             bd = bd.setScale(1, RoundingMode.HALF_UP)
             speed = bd.toPlainString()
         }
 
-        return when (useImperialUnits) {
+        when (useImperialUnits) {
-            true -> "$speed mph"
+            true -> return "$speed mph"
-            false -> "$speed km/h"
+            false -> return "$speed km/h"
         }
     }
 
 
     /* Coverts meters per second to either km/h or mph */
     fun convertMetersPerSecond(metersPerSecond: Float, useImperial: Boolean = false): Double {
-        return if (useImperial) {
+        if (useImperial) {
             // mph
-            metersPerSecond * 2.2369362920544
+            return metersPerSecond * 2.2369362920544
         } else {
             // km/h
-            metersPerSecond * 3.6
+            return metersPerSecond * 3.6
         }
     }
 
 
-}
+}

app/src/main/java/org/y20k/trackbook/helpers/MapOverlay.kt

@@ -21,8 +21,6 @@ package org.y20k.trackbook.helpers
 import android.content.Context
 import android.graphics.drawable.Drawable
 import android.location.Location
-import android.os.Build
-import android.os.VibrationEffect
 import android.os.Vibrator
 import android.widget.Toast
 import androidx.core.content.ContextCompat
@@ -40,7 +38,7 @@ import java.util.*
 /*
  * MapHelper class
  */
-class MapOverlay(private var markerListener: MarkerListener) {
+class MapOverlay (private var markerListener: MarkerListener)  {
 
     /* Interface used to communicate back to activity/fragment */
     interface MarkerListener {
@@ -53,11 +51,7 @@ class MapOverlay(private var markerListener: MarkerListener) {
 
 
     /* Creates icon overlay for current position (used in MapFragment) */
-    fun createMyLocationOverlay(
+    fun createMyLocationOverlay(context: Context, location: Location, trackingState: Int): ItemizedIconOverlay<OverlayItem> {
-        context: Context,
-        location: Location,
-        trackingState: Int
-    ): ItemizedIconOverlay<OverlayItem> {
 
         val overlayItems = ArrayList<OverlayItem>()
         val locationIsOld = LocationHelper.isOldLocation(location)
@@ -67,41 +61,22 @@ class MapOverlay(private var markerListener: MarkerListener) {
         when (trackingState) {
             // CASE: Tracking active
             Keys.STATE_TRACKING_ACTIVE -> {
-                newMarker = when (locationIsOld) {
+                when (locationIsOld) {
-                    true -> ContextCompat.getDrawable(
+                    true -> newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_location_red_grey_24dp)!!
-                        context,
+                    false -> newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_location_red_24dp)!!
-                        R.drawable.ic_marker_location_red_grey_24dp
-                    )!!
-                    false -> ContextCompat.getDrawable(
-                        context,
-                        R.drawable.ic_marker_location_red_24dp
-                    )!!
                 }
             }
             // CASE. Tracking is NOT active
             else -> {
-                newMarker = when (locationIsOld) {
+                when (locationIsOld) {
-                    true -> ContextCompat.getDrawable(
+                    true -> newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_location_blue_grey_24dp)!!
-                        context,
+                    false -> newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_location_blue_24dp)!!
-                        R.drawable.ic_marker_location_blue_grey_24dp
-                    )!!
-                    false -> ContextCompat.getDrawable(
-                        context,
-                        R.drawable.ic_marker_location_blue_24dp
-                    )!!
                 }
             }
         }
 
         // add marker to list of overlay items
-        val overlayItem = createOverlayItem(
+        val overlayItem = createOverlayItem(context, location.latitude, location.longitude, location.accuracy, location.provider, location.time)
-            context,
-            location.latitude,
-            location.longitude,
-            location.accuracy,
-            location.provider,
-            location.time
-        )
         overlayItem.setMarker(newMarker)
         overlayItems.add(overlayItem)
 
@@ -111,11 +86,7 @@ class MapOverlay(private var markerListener: MarkerListener) {
 
 
     /* Creates icon overlay for track */
-    fun createTrackOverlay(
+    fun createTrackOverlay(context: Context, track: Track, trackingState: Int): ItemizedIconOverlay<OverlayItem> {
-        context: Context,
-        track: Track,
-        trackingState: Int
-    ): ItemizedIconOverlay<OverlayItem> {
 
         val overlayItems = ArrayList<OverlayItem>()
         val wayPoints = track.wayPoints
@@ -128,55 +99,28 @@ class MapOverlay(private var markerListener: MarkerListener) {
             when (trackingState) {
                 // CASE: Recording is active
                 Keys.STATE_TRACKING_ACTIVE -> {
-                    newMarker = when {
+                    if (wayPoint.starred) {
-                        wayPoint.starred -> {
+                        newMarker = ContextCompat.getDrawable(context, R.drawable.ic_star_red_24dp)!!
-                            ContextCompat.getDrawable(context, R.drawable.ic_star_red_24dp)!!
+                    } else if (wayPoint.isStopOver) {
-                        }
+                        newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_track_location_grey_24dp)!!
-                        wayPoint.isStopOver -> {
+                    } else {
-                            ContextCompat.getDrawable(
+                        newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_track_location_red_24dp)!!
-                                context,
-                                R.drawable.ic_marker_track_location_grey_24dp
-                            )!!
-                        }
-                        else -> {
-                            ContextCompat.getDrawable(
-                                context,
-                                R.drawable.ic_marker_track_location_red_24dp
-                            )!!
-                        }
                     }
                 }
                 // CASE: Recording is paused/stopped
                 else -> {
-                    newMarker = when {
+                    if (wayPoint.starred) {
-                        wayPoint.starred -> {
+                        newMarker = ContextCompat.getDrawable(context, R.drawable.ic_star_blue_24dp)!!
-                            ContextCompat.getDrawable(context, R.drawable.ic_star_blue_24dp)!!
+                    } else if (wayPoint.isStopOver) {
-                        }
+                        newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_track_location_grey_24dp)!!
-                        wayPoint.isStopOver -> {
+                    } else {
-                            ContextCompat.getDrawable(
+                        newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_track_location_blue_24dp)!!
-                                context,
-                                R.drawable.ic_marker_track_location_grey_24dp
-                            )!!
-                        }
-                        else -> {
-                            ContextCompat.getDrawable(
-                                context,
-                                R.drawable.ic_marker_track_location_blue_24dp
-                            )!!
-                        }
                     }
                 }
             }
 
             // create overlay item and add to list of overlay items
-            val overlayItem = createOverlayItem(
+            val overlayItem = createOverlayItem(context, wayPoint.latitude, wayPoint.longitude, wayPoint.accuracy, wayPoint.provider, wayPoint.time)
-                context,
-                wayPoint.latitude,
-                wayPoint.longitude,
-                wayPoint.accuracy,
-                wayPoint.provider,
-                wayPoint.time
-            )
             overlayItem.setMarker(newMarker)
             overlayItems.add(overlayItem)
         }
@@ -187,60 +131,30 @@ class MapOverlay(private var markerListener: MarkerListener) {
 
 
     /* Creates a marker overlay item */
-    private fun createOverlayItem(
+    private fun createOverlayItem(context: Context, latitude: Double, longitude: Double, accuracy: Float, provider: String, time: Long): OverlayItem {
-        context: Context,
+        val title: String = "${context.getString(R.string.marker_description_time)}: ${SimpleDateFormat.getTimeInstance(SimpleDateFormat.MEDIUM, Locale.getDefault()).format(time)}"
-        latitude: Double,
-        longitude: Double,
-        accuracy: Float,
-        provider: String,
-        time: Long
-    ): OverlayItem {
-        val title =
-            "${context.getString(R.string.marker_description_time)}: ${SimpleDateFormat.getTimeInstance(
-                SimpleDateFormat.MEDIUM,
-                Locale.getDefault()
-            ).format(time)}"
         //val description: String = "${context.getString(R.string.marker_description_accuracy)}: ${DecimalFormat("#0.00").format(accuracy)} (${provider})"
-        val description =
+        val description: String = "${context.getString(R.string.marker_description_time)}: ${SimpleDateFormat.getTimeInstance(SimpleDateFormat.MEDIUM, Locale.getDefault()).format(time)} | ${context.getString(R.string.marker_description_accuracy)}: ${DecimalFormat("#0.00").format(accuracy)} (${provider})"
-            "${context.getString(R.string.marker_description_time)}: ${SimpleDateFormat.getTimeInstance(
+        val position: GeoPoint = GeoPoint(latitude, longitude)
-                SimpleDateFormat.MEDIUM,
-                Locale.getDefault()
-            )
-                .format(time)} | ${context.getString(R.string.marker_description_accuracy)}: ${DecimalFormat(
-                "#0.00"
-            ).format(accuracy)} (${provider})"
-        val position = GeoPoint(latitude, longitude)
         return OverlayItem(title, description, position)
     }
 
 
     /* Creates an overlay */
-    private fun createOverlay(
+    private fun createOverlay(context: Context, overlayItems: ArrayList<OverlayItem>): ItemizedIconOverlay<OverlayItem> {
-        context: Context,
-        overlayItems: ArrayList<OverlayItem>
-    ): ItemizedIconOverlay<OverlayItem> {
         return ItemizedIconOverlay<OverlayItem>(context, overlayItems,
             object : ItemizedIconOverlay.OnItemGestureListener<OverlayItem> {
                 override fun onItemSingleTapUp(index: Int, item: OverlayItem): Boolean {
                     markerListener.onMarkerTapped(item.point.latitude, item.point.longitude)
                     return true
                 }
-
                 override fun onItemLongPress(index: Int, item: OverlayItem): Boolean {
                     val v = context.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    v.vibrate(50)
-                        v.vibrate(
-                            VibrationEffect.createOneShot(
-                                50, VibrationEffect.DEFAULT_AMPLITUDE
-                            )
-                        )
-                    } else {
-                        v.vibrate(50)
-                    }
                     Toast.makeText(context, item.snippet, Toast.LENGTH_LONG).show()
                     return true
                 }
             })
     }
 
-}
+}

app/src/main/res/drawable/ic_clear_white_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/trackbook_white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+        android:fillColor="@color/trackbook_white" />
 </vector>

app/src/main/res/drawable/ic_compass_needle_black_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/trackbook_black"
-        android:pathData="M21,3L3,10.53v0.98l6.84,2.65L12.48,21h0.98L21,3z" />
+        android:pathData="M21,3L3,10.53v0.98l6.84,2.65L12.48,21h0.98L21,3z"/>
 </vector>

app/src/main/res/drawable/ic_current_location_24dp.xml

@@ -1,9 +1,9 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/location_button_background"
-        android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
+        android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
 </vector>

app/src/main/res/drawable/ic_delete_24dp.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
+  <path
-        android:fillColor="@color/icon_default"
+      android:fillColor="@color/icon_default"
-        android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
+      android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z"/>
 </vector>

app/src/main/res/drawable/ic_edit_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/icon_default"
-        android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z" />
+        android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z"/>
 </vector>

app/src/main/res/drawable/ic_fiber_manual_record_red_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#DC2B00"
+        android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
-        android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0" />
+        android:fillColor="#DC2B00"/>
 </vector>

app/src/main/res/drawable/ic_fiber_manual_record_white_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/trackbook_white"
+        android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
-        android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0" />
+        android:fillColor="@color/trackbook_white" />
 </vector>

app/src/main/res/drawable/ic_gps_24dp.xml

@@ -1,9 +1,9 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/icon_default"
-        android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
+        android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
 </vector>

app/src/main/res/drawable/ic_info_24dp.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
+  <path
-        android:fillColor="@color/icon_default"
+      android:fillColor="@color/icon_default"
-        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+      android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
 </vector>

app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml

@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:height="24dp"
-    android:height="24dp"
+        android:viewportHeight="96.0"
-    android:viewportWidth="96.0"
+        android:viewportWidth="96.0"
-    android:viewportHeight="96.0">
+        android:width="24dp">
     <path
         android:fillAlpha="0.33"
         android:fillColor="@color/trackbook_blue"
-        android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0" />
+        android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
     <path
         android:fillColor="@color/trackbook_grey_light"
-        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" />
+        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
 </vector>

app/src/main/res/drawable/ic_marker_location_red_24dp.xml

@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:height="24dp"
-    android:height="24dp"
+        android:viewportHeight="96.0"
-    android:viewportWidth="96.0"
+        android:viewportWidth="96.0"
-    android:viewportHeight="96.0">
+        android:width="24dp">
     <path
         android:fillAlpha="0.33"
         android:fillColor="@color/trackbook_red"
-        android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0" />
+        android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
     <path
         android:fillColor="@color/trackbook_red"
-        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" />
+        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
 </vector>

app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml

@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:height="24dp"
-    android:height="24dp"
+        android:viewportHeight="96.0"
-    android:viewportWidth="96.0"
+        android:viewportWidth="96.0"
-    android:viewportHeight="96.0">
+        android:width="24dp">
     <path
         android:fillAlpha="0.33"
         android:fillColor="@color/trackbook_red"
-        android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0" />
+        android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0"/>
     <path
         android:fillColor="@color/trackbook_grey_light"
-        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" />
+        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
 </vector>

app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml

@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:height="24dp"
-    android:height="24dp"
+        android:viewportHeight="96.0"
-    android:viewportWidth="96.0"
+        android:viewportWidth="96.0"
-    android:viewportHeight="96.0">
+        android:width="24dp">
 
     <path
         android:fillColor="@color/trackbook_blue"
-        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" />
+        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
 </vector>

app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml

@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:height="24dp"
-    android:height="24dp"
+        android:viewportHeight="96.0"
-    android:viewportWidth="96.0"
+        android:viewportWidth="96.0"
-    android:viewportHeight="96.0">
+        android:width="24dp">
 
     <path
         android:fillColor="@color/trackbook_grey_light"
-        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" />
+        android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"/>
 </vector>

app/src/main/res/drawable/ic_notebook_black_24dp.xml

@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:viewportHeight="96.0"
-    android:height="24dp"
     android:viewportWidth="96.0"
-    android:viewportHeight="96.0">
+    android:height="24dp"
+    android:width="24dp">
     <path
         android:fillColor="@color/trackbook_black"
-        android:pathData="M44,12.99L20.69,8.74L5.12,5.89C2.29,5.38 0,7.44 0,10.49v67.38c0,3.06 2.29,5.96 5.12,6.47l15.57,2.85l22.19,4.05L44,91.46V12.99z" />
+        android:pathData="M44,12.99L20.69,8.74L5.12,5.89C2.29,5.38 0,7.44 0,10.49v67.38c0,3.06 2.29,5.96 5.12,6.47l15.57,2.85l22.19,4.05L44,91.46V12.99z"/>
     <path
         android:fillColor="@color/trackbook_black"
-        android:pathData="M90.88,5.89L75.31,8.74L53.12,12.79L52,12.99v78.46l23.31,-4.26l15.57,-2.85c2.83,-0.52 5.12,-3.41 5.12,-6.47V10.49C96,7.44 93.71,5.38 90.88,5.89z" />
+        android:pathData="M90.88,5.89L75.31,8.74L53.12,12.79L52,12.99v78.46l23.31,-4.26l15.57,-2.85c2.83,-0.52 5.12,-3.41 5.12,-6.47V10.49C96,7.44 93.71,5.38 90.88,5.89z"/>
 </vector>

app/src/main/res/drawable/ic_notification_action_resume_36dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
     android:height="36dp"
+    android:viewportHeight="24.0"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:width="36dp">
     <path
         android:fillColor="@color/trackbook_black"
-        android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0" />
+        android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"/>
-</vector>
+</vector>

app/src/main/res/drawable/ic_notification_action_show_36dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
     android:height="36dp"
+    android:viewportHeight="24.0"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:width="36dp">
     <path
         android:fillColor="@color/trackbook_black"
-        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z" />
+        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
 </vector>

app/src/main/res/drawable/ic_notification_action_stop_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
     android:height="36dp"
+    android:viewportHeight="24.0"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:width="36dp">
     <path
         android:fillColor="@color/trackbook_black"
-        android:pathData="M6,6h12v12H6z" />
+        android:pathData="M6,6h12v12H6z"/>
 </vector>

app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml

@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
     android:height="48dp"
+    android:viewportHeight="192.0"
     android:viewportWidth="192.0"
-    android:viewportHeight="192.0">
+    android:width="48dp" >
     <path
         android:fillColor="@color/trackbook_blue"
-        android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0" />
+        android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0"/>
     <path
         android:fillColor="@color/trackbook_red_dark"
-        android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z" />
+        android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z"/>
 </vector>

app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml

@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
     android:height="48dp"
+    android:viewportHeight="192.0"
     android:viewportWidth="192.0"
-    android:viewportHeight="192.0">
+    android:width="48dp" >
     <path
         android:fillColor="@color/trackbook_blue"
-        android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0" />
+        android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0"/>
     <path
         android:fillColor="@color/trackbook_white"
-        android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z" />
+        android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z"/>
 </vector>

app/src/main/res/drawable/ic_notification_icon_small_24dp.xml

@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:viewportHeight="96.0"
-    android:height="24dp"
     android:viewportWidth="96.0"
-    android:viewportHeight="96.0">
+    android:height="24dp"
+    android:width="24dp">
     <path
         android:fillColor="@color/trackbook_white"
-        android:pathData="M44,12.99L20.69,8.74L5.12,5.89C2.29,5.38 0,7.44 0,10.49v67.38c0,3.06 2.29,5.96 5.12,6.47l15.57,2.85l22.19,4.05L44,91.46V12.99z" />
+        android:pathData="M44,12.99L20.69,8.74L5.12,5.89C2.29,5.38 0,7.44 0,10.49v67.38c0,3.06 2.29,5.96 5.12,6.47l15.57,2.85l22.19,4.05L44,91.46V12.99z"/>
     <path
         android:fillColor="@color/trackbook_white"
-        android:pathData="M90.88,5.89L75.31,8.74L53.12,12.79L52,12.99v78.46l23.31,-4.26l15.57,-2.85c2.83,-0.52 5.12,-3.41 5.12,-6.47V10.49C96,7.44 93.71,5.38 90.88,5.89z" />
+        android:pathData="M90.88,5.89L75.31,8.74L53.12,12.79L52,12.99v78.46l23.31,-4.26l15.57,-2.85c2.83,-0.52 5.12,-3.41 5.12,-6.47V10.49C96,7.44 93.71,5.38 90.88,5.89z"/>
 </vector>

app/src/main/res/drawable/ic_remove_circle_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/trackbook_white"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13L7,13v-2h10v2z" />
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13L7,13v-2h10v2z"/>
 </vector>

app/src/main/res/drawable/ic_save_24dp.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
+  <path
-        android:fillColor="@color/icon_default"
+      android:fillColor="@color/icon_default"
-        android:pathData="M19,12v7L5,19v-7L3,12v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2zM13,12.67l2.59,-2.58L17,11.5l-5,5 -5,-5 1.41,-1.41L11,12.67L11,3h2z" />
+      android:pathData="M19,12v7L5,19v-7L3,12v7c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2zM13,12.67l2.59,-2.58L17,11.5l-5,5 -5,-5 1.41,-1.41L11,12.67L11,3h2z"/>
 </vector>

app/src/main/res/drawable/ic_save_white_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/trackbook_white"
-        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
+        android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
 </vector>

app/src/main/res/drawable/ic_settings_black_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24"
+        android:viewportWidth="24"
-    android:viewportHeight="24">
+        android:viewportHeight="24">
     <path
         android:fillColor="@color/trackbook_black"
-        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z" />
+        android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
 </vector>

app/src/main/res/drawable/ic_square_foot_24px.xml

@@ -3,7 +3,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
+  <path
-        android:fillColor="@color/icon_default"
+      android:fillColor="@color/icon_default"
-        android:pathData="M17.66,17.66l-1.06,1.06l-0.71,-0.71l1.06,-1.06l-1.94,-1.94l-1.06,1.06l-0.71,-0.71l1.06,-1.06l-1.94,-1.94l-1.06,1.06l-0.71,-0.71l1.06,-1.06L9.7,9.7l-1.06,1.06l-0.71,-0.71l1.06,-1.06L7.05,7.05L5.99,8.11L5.28,7.4l1.06,-1.06L4,4v14c0,1.1 0.9,2 2,2h14L17.66,17.66zM7,17v-5.76L12.76,17H7z" />
+      android:pathData="M17.66,17.66l-1.06,1.06l-0.71,-0.71l1.06,-1.06l-1.94,-1.94l-1.06,1.06l-0.71,-0.71l1.06,-1.06l-1.94,-1.94l-1.06,1.06l-0.71,-0.71l1.06,-1.06L9.7,9.7l-1.06,1.06l-0.71,-0.71l1.06,-1.06L7.05,7.05L5.99,8.11L5.28,7.4l1.06,-1.06L4,4v14c0,1.1 0.9,2 2,2h14L17.66,17.66zM7,17v-5.76L12.76,17H7z"/>
 </vector>

app/src/main/res/drawable/ic_star_outline_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/icon_lightweight"
-        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
+        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
 </vector>

app/src/main/res/drawable/ic_timeline_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/icon_default"
-        android:pathData="M21,6L3,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,8h2v4h2L7,8h2v4h2L11,8h2v4h2L15,8h2v4h2L19,8h2v8z" />
+        android:pathData="M21,6L3,6c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,8h2v4h2L7,8h2v4h2L11,8h2v4h2L15,8h2v4h2L19,8h2v8z"/>
 </vector>

app/src/main/res/drawable/ic_undo_24dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+        android:width="24dp"
-    android:height="24dp"
+        android:height="24dp"
-    android:viewportWidth="24.0"
+        android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/icon_default"
-        android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z" />
+        android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
 </vector>

app/src/main/res/drawable/selector_bottom_navigation.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/bottom_navigation_element" android:state_checked="false" />
+    <item android:state_checked="false" android:color="@color/bottom_navigation_element" />
-    <item android:color="@color/bottom_navigation_element_selected" android:state_checked="true" />
+    <item android:state_checked="true" android:color="@color/bottom_navigation_element_selected" />
 </selector>

app/src/main/res/drawable/shape_statistics_background_collapsed.xml

@@ -2,20 +2,17 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:bottom="-2dp"
+        android:top="0dp"
         android:left="-2dp"
         android:right="-2dp"
-        android:top="0dp">
+        android:bottom="-2dp">
 
-        <shape android:shape="rectangle">
+        <shape
+            android:shape="rectangle">
 
             <solid android:color="@color/statistic_sheet_background_collapsed" />
-            <corners
+            <corners android:topLeftRadius="20dp" android:topRightRadius="20dp" />
-                android:topLeftRadius="20dp"
+            <stroke android:width="1dp" android:color="@color/statistic_sheet_background_border"/>
-                android:topRightRadius="20dp" />
-            <stroke
-                android:width="1dp"
-                android:color="@color/statistic_sheet_background_border" />
 
         </shape>
 

app/src/main/res/drawable/shape_statistics_background_expanded.xml

@@ -2,20 +2,17 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:bottom="-2dp"
+        android:top="0dp"
         android:left="-2dp"
         android:right="-2dp"
-        android:top="0dp">
+        android:bottom="-2dp">
 
-        <shape android:shape="rectangle">
+        <shape
+            android:shape="rectangle">
 
             <solid android:color="@color/statistic_sheet_background_expanded" />
-            <corners
+            <corners android:topLeftRadius="20dp" android:topRightRadius="20dp" />
-                android:topLeftRadius="20dp"
+            <stroke android:width="1dp" android:color="@color/statistic_sheet_background_border"/>
-                android:topRightRadius="20dp" />
-            <stroke
-                android:width="1dp"
-                android:color="@color/statistic_sheet_background_border" />
 
         </shape>
 

app/src/main/res/layout/dialog_generic_with_details.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -53,4 +54,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/dialog_details_link" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/dialog_rename_track.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -28,4 +29,4 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_track.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -42,4 +43,4 @@
 
     </androidx.core.widget.NestedScrollView>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_tracklist.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,26 +8,26 @@
     android:background="@color/app_window_background"
     tools:context=".TracklistFragment">
 
-    <androidx.recyclerview.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/track_element_list"
+            android:id="@+id/track_element_list"
-        android:layout_width="match_parent"
+            android:layout_width="match_parent"
-        android:layout_height="0dp"
+            android:layout_height="0dp"
-        android:layout_marginTop="28dp"
+            android:layout_marginTop="28dp"
-        android:layout_marginBottom="4dp"
+            android:layout_marginBottom="4dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <!-- ONBOARDING -->
+        <!-- ONBOARDING -->
-    <include
+        <include
-        layout="@layout/track_onboarding"
+            layout="@layout/track_onboarding"
-        android:layout_width="0dp"
+            android:layout_width="0dp"
-        android:layout_height="match_parent"
+            android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/track_element_list"
+            app:layout_constraintTop_toBottomOf="@+id/track_element_list"
-        tools:visibility="gone" />
+            tools:visibility="gone" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/track_onboarding.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/track_list_onboarding"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:id="@+id/track_list_onboarding">
 
     <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/navigation/nav_graph_main.xml

@@ -27,7 +27,7 @@
     <fragment
         android:id="@+id/settings_fragment"
         android:name="org.y20k.trackbook.SettingsFragment"
-        android:label="Settings" />
+        android:label="Settings"/>
 
     <!-- TRACKS (LIST OF TRACKS) -->
     <fragment
@@ -46,11 +46,11 @@
         android:id="@+id/fragment_track"
         android:name="org.y20k.trackbook.TrackFragment"
         android:label="Track"
-        tools:layout="@layout/fragment_track">
+        tools:layout="@layout/fragment_track" >
         <argument
             android:name="delete_track_id"
-            android:defaultValue="-1L"
+            app:argType="long"
-            app:argType="long" />
+            android:defaultValue="-1L" />
     </fragment>
 
 </navigation>

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- placeholder text - todo remove -->
+  <!-- placeholder text - todo remove -->
-    <!-- App Name -->
+  <!-- App Name -->
-    <string name="app_name">Trackbook</string>
+  <string name="app_name">Trackbook</string>
-    <!-- please do not translate app_name - transcription into different alphabet types is fine though -->
+  <!-- please do not translate app_name - transcription into different alphabet types is fine though -->
-    <!-- Tabs -->
+  <!-- Tabs -->
-    <string name="tab_map">地图</string>
+  <string name="tab_map">地图</string>
-    <string name="tab_tracks">记录</string>
+  <string name="tab_tracks">记录</string>
-    <string name="tab_settings">设置</string>
+  <string name="tab_settings">设置</string>
-    <!-- Notification -->
+  <!-- Notification -->
-    <string name="notification_title_trackbook_running">Trackbook 正在运行</string>
+  <string name="notification_title_trackbook_running">Trackbook 正在运行</string>
-    <string name="notification_title_trackbook_not_running">Trackbook 已暂停</string>
+  <string name="notification_title_trackbook_not_running">Trackbook 已暂停</string>
-    <string name="notification_stop">暂停</string>
+  <string name="notification_stop">暂停</string>
-    <string name="notification_resume">恢复</string>
+  <string name="notification_resume">恢复</string>
-    <string name="notification_show">显示</string>
+  <string name="notification_show">显示</string>
-    <string name="notification_channel_recording_name">运动记录状态</string>
+  <string name="notification_channel_recording_name">运动记录状态</string>
-    <string name="notification_channel_recording_description">显示持续时间和距离.停止移动录制的选项.</string>
+  <string name="notification_channel_recording_description">显示持续时间和距离.停止移动录制的选项.</string>
-    <!-- Snackbar Messages -->
+  <!-- Snackbar Messages -->
-    <string name="snackbar_message_location_offline">位置服务已关闭，Trackbook 将不会运行.</string>
+  <string name="snackbar_message_location_offline">位置服务已关闭，Trackbook 将不会运行.</string>
-    <string name="snackbar_message_location_permission_denied">位置权限未被授予 Trackbook 无法工作.</string>
+  <string name="snackbar_message_location_permission_denied">位置权限未被授予 Trackbook 无法工作.</string>
-    <!-- FAB Sub Menu -->
+  <!-- FAB Sub Menu -->
-    <string name="fab_sub_menu_clear">删除</string>
+  <string name="fab_sub_menu_clear">删除</string>
-    <string name="fab_sub_menu_save">保存</string>
+  <string name="fab_sub_menu_save">保存</string>
-    <string name="fab_sub_menu_resume">恢复</string>
+  <string name="fab_sub_menu_resume">恢复</string>
-    <!-- Dialogs -->
+  <!-- Dialogs -->
-    <string name="dialog_generic_button_cancel">取消</string>
+  <string name="dialog_generic_button_cancel">取消</string>
-    <string name="dialog_generic_button_okay">OK</string>
+  <string name="dialog_generic_button_okay">OK</string>
-    <string name="dialog_generic_details_button">显示详情</string>
+  <string name="dialog_generic_details_button">显示详情</string>
-    <string name="dialog_error_empty_recording_title">无法保存</string>
+  <string name="dialog_error_empty_recording_title">无法保存</string>
-    <string name="dialog_error_empty_recording_message">Trackbook目前没有记录到任何航点.</string>
+  <string name="dialog_error_empty_recording_message">Trackbook目前没有记录到任何航点.</string>
-    <string name="dialog_error_empty_recording_action_resume">恢复记录</string>
+  <string name="dialog_error_empty_recording_action_resume">恢复记录</string>
-    <string name="dialog_rename_track_button">重命名</string>
+  <string name="dialog_rename_track_button">重命名</string>
-    <string name="dialog_rename_track_input_hint">输入一个新名称</string>
+  <string name="dialog_rename_track_input_hint">输入一个新名称</string>
-    <string name="dialog_share_gpx">分享GPX文件到</string>
+  <string name="dialog_share_gpx">分享GPX文件到</string>
-    <string name="dialog_yes_no_positive_button_default">是</string>
+  <string name="dialog_yes_no_positive_button_default">是</string>
-    <string name="dialog_yes_no_positive_button_delete_recording">删除</string>
+  <string name="dialog_yes_no_positive_button_delete_recording">删除</string>
-    <string name="dialog_yes_no_message_delete_recording">删除此记录？</string>
+  <string name="dialog_yes_no_message_delete_recording">删除此记录？</string>
-    <!-- Toast Messages -->
+  <!-- Toast Messages -->
-    <string name="toast_message_elevation_info">提示：海拔数据的准确性取决于您的设备.测量整个路线的上坡和下坡海拔.</string>
+  <string name="toast_message_elevation_info">提示：海拔数据的准确性取决于您的设备.测量整个路线的上坡和下坡海拔.</string>
-    <string name="toast_message_install_file_helper">请先安装一个文件管理器或GPX轨迹查看器.</string>
+  <string name="toast_message_install_file_helper">请先安装一个文件管理器或GPX轨迹查看器.</string>
     <!-- Map Markers -->
-    <string name="marker_description_time">时间</string>
+  <string name="marker_description_time">时间</string>
-    <string name="marker_description_accuracy">误差</string>
+  <string name="marker_description_accuracy">误差</string>
-    <!-- Statistics Sheet -->
+  <!-- Statistics Sheet -->
-    <string name="statistics_sheet_p_distance">总里程:</string>
+  <string name="statistics_sheet_p_distance">总里程:</string>
-    <string name="statistics_sheet_p_steps">步数:</string>
+  <string name="statistics_sheet_p_steps">步数:</string>
-    <string name="statistics_sheet_p_steps_no_pedometer">计步器不可用</string>
+  <string name="statistics_sheet_p_steps_no_pedometer">计步器不可用</string>
-    <string name="statistics_sheet_p_waypoints">航点数量:</string>
+  <string name="statistics_sheet_p_waypoints">航点数量:</string>
-    <string name="statistics_sheet_p_duration">用时:</string>
+  <string name="statistics_sheet_p_duration">用时:</string>
-    <string name="statistics_sheet_p_recording_start">追踪开始:</string>
+  <string name="statistics_sheet_p_recording_start">追踪开始:</string>
-    <string name="statistics_sheet_p_recording_stop">追踪结束:</string>
+  <string name="statistics_sheet_p_recording_stop">追踪结束:</string>
-    <string name="statistics_sheet_p_max_altitude">最高航点:</string>
+  <string name="statistics_sheet_p_max_altitude">最高航点:</string>
-    <string name="statistics_sheet_p_min_altitude">最低航点:</string>
+  <string name="statistics_sheet_p_min_altitude">最低航点:</string>
-    <string name="statistics_sheet_p_positive_elevation">海拔(上坡):</string>
+  <string name="statistics_sheet_p_positive_elevation">海拔(上坡):</string>
-    <string name="statistics_sheet_p_negative_elevation">海拔(下坡):</string>
+  <string name="statistics_sheet_p_negative_elevation">海拔(下坡):</string>
-    <!-- Menu Actions -->
+  <!-- Menu Actions -->
-    <!-- Onboarding Layout -->
+  <!-- Onboarding Layout -->
-    <string name="layout_onboarding_description_app_icon">Trackbook 应用图标</string>
+  <string name="layout_onboarding_description_app_icon">Trackbook 应用图标</string>
-    <!-- Track Tab Onboarding -->
+  <!-- Track Tab Onboarding -->
-    <string name="track_list_onboarding_h1_part_1">你的运动记录</string>
+  <string name="track_list_onboarding_h1_part_1">你的运动记录</string>
-    <string name="track_list_onboarding_h1_part_2">... 会显示在这里.</string>
+  <string name="track_list_onboarding_h1_part_2">... 会显示在这里.</string>
-    <!-- Settings -->
+  <!-- Settings -->
-    <string name="pref_accuracy_threshold_summary">丢弃误差大于</string>
+  <string name="pref_accuracy_threshold_summary">丢弃误差大于</string>
-    <string name="pref_accuracy_threshold_title">误差的阈值</string>
+  <string name="pref_accuracy_threshold_title">误差的阈值</string>
-    <string name="pref_advanced_title">高级</string>
+  <string name="pref_advanced_title">高级</string>
-    <string name="pref_general_title">一般</string>
+  <string name="pref_general_title">一般</string>
-    <string name="pref_gps_only_title">仅限于GPS</string>
+  <string name="pref_gps_only_title">仅限于GPS</string>
-    <string name="pref_gps_only_summary_gps_and_network">当前使用GPS和网络进行定位.</string>
+  <string name="pref_gps_only_summary_gps_and_network">当前使用GPS和网络进行定位.</string>
-    <string name="pref_gps_only_summary_gps_only">当前使用GPS进行定位.</string>
+  <string name="pref_gps_only_summary_gps_only">当前使用GPS进行定位.</string>
-    <string name="pref_imperial_measurement_units_summary_metric">当前使用公制单位(千米,米).</string>
+  <string name="pref_imperial_measurement_units_summary_metric">当前使用公制单位(千米,米).</string>
-    <string name="pref_imperial_measurement_units_summary_imperial">当前使用英制单位(英里,英尺).</string>
+  <string name="pref_imperial_measurement_units_summary_imperial">当前使用英制单位(英里,英尺).</string>
-    <string name="pref_imperial_measurement_units_title">使用英制</string>
+  <string name="pref_imperial_measurement_units_title">使用英制</string>
-    <string name="pref_reset_advanced_summary">高级设置重置为默认值.</string>
+  <string name="pref_reset_advanced_summary">高级设置重置为默认值.</string>
-    <string name="pref_reset_advanced_title">重置</string>
+  <string name="pref_reset_advanced_title">重置</string>
-    <!-- Abbreviations -->
+  <!-- Abbreviations -->
-    <string name="abbreviation_hours">时</string>
+  <string name="abbreviation_hours">时</string>
-    <string name="abbreviation_minutes">分</string>
+  <string name="abbreviation_minutes">分</string>
-    <string name="abbreviation_seconds">秒</string>
+  <string name="abbreviation_seconds">秒</string>
-    <!-- Descriptions -->
+  <!-- Descriptions -->
-    <string name="descr_map_current_track">航迹图</string>
+  <string name="descr_map_current_track">航迹图</string>
-    <string name="descr_map_last_track">最后一个轨迹的航迹图</string>
+  <string name="descr_map_last_track">最后一个轨迹的航迹图</string>
-    <string name="descr_fab_main_start">开始录制按钮</string>
+  <string name="descr_fab_main_start">开始录制按钮</string>
-    <string name="descr_fab_sub_menu_button_save">保存按钮</string>
+  <string name="descr_fab_sub_menu_button_save">保存按钮</string>
-    <string name="descr_fab_sub_menu_button_clear">删除按钮</string>
+  <string name="descr_fab_sub_menu_button_clear">删除按钮</string>
-    <string name="descr_fab_sub_menu_button_resume">恢复按钮</string>
+  <string name="descr_fab_sub_menu_button_resume">恢复按钮</string>
-    <string name="descr_mark_starred_button">加星按钮</string>
+  <string name="descr_mark_starred_button">加星按钮</string>
-    <string name="descr_statistics_sheet_delete_button">删除记录按钮</string>
+  <string name="descr_statistics_sheet_delete_button">删除记录按钮</string>
-    <string name="descr_statistics_sheet_edit_button">记录编辑按钮</string>
+  <string name="descr_statistics_sheet_edit_button">记录编辑按钮</string>
-    <string name="descr_statistics_sheet_save_button">以GPX文件分享按钮</string>
+  <string name="descr_statistics_sheet_save_button">以GPX文件分享按钮</string>
-    <!-- Sample Text -->
+  <!-- Sample Text -->
-    <string name="sample_text_track_data" translatable="false">23.0 km • 5 时 23 分 42 秒</string>
+  <string name="sample_text_track_data" translatable="false">23.0 km • 5 时 23 分 42 秒</string>
-    <string name="sample_text_track_name" translatable="false">1969年7月20日</string>
+  <string name="sample_text_track_name" translatable="false">1969年7月20日</string>
-    <string name="sample_text_default_data" translatable="false">轨迹数据丢失</string>
+  <string name="sample_text_default_data" translatable="false">轨迹数据丢失</string>
 </resources>

app/src/main/res/values/dimens.xml

@@ -1,9 +1,6 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
-
+    <item name="custom_match_parent" type="dimen">-1</item> <!-- CUSTOM MATCH_PARENT - see https://developer.android.com/reference/android/view/ViewGroup.LayoutParams.html#MATCH_PARENT -->
-    <!-- CUSTOM MATCH_PARENT - see https://developer.android.com/reference/android/view/ViewGroup.LayoutParams.html#MATCH_PARENT -->
-    <item name="custom_match_parent" type="dimen">-1</item>
-
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="bottom_sheet_width">@dimen/custom_match_parent</dimen>
 </resources>

app/src/main/res/values/styles.xml

@@ -20,11 +20,9 @@
         <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
     </style>
-
     <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
         <item name="android:textColor">@color/text_default</item>
     </style>
-
     <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
         <item name="android:textColor">@color/text_default</item>
     </style>

app/src/main/res/xml/provider_paths.xml

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
-    <external-path
+    <external-path name="external_files" path="."/>
-        name="external_files"
+</paths>
-        path="." />
-</paths>