From 4dcea97982967d6c511f61f6e14b426d11cad221 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Fri, 31 Jul 2020 20:06:53 -0400 Subject: [PATCH] Adjust codestyle to an .editorconfig --- .editorconfig | 9 + app/src/main/AndroidManifest.xml | 41 ++-- app/src/main/java/org/y20k/trackbook/Keys.kt | 31 +-- .../java/org/y20k/trackbook/MainActivity.kt | 27 +-- .../java/org/y20k/trackbook/MapFragment.kt | 88 +++++++-- .../org/y20k/trackbook/SettingsFragment.kt | 73 +++++-- .../java/org/y20k/trackbook/TrackFragment.kt | 79 ++++++-- .../main/java/org/y20k/trackbook/Trackbook.kt | 4 +- .../java/org/y20k/trackbook/TrackerService.kt | 132 ++++++++++--- .../trackbook/TrackingToggleTileService.kt | 25 +-- .../org/y20k/trackbook/TracklistFragment.kt | 37 +++- .../java/org/y20k/trackbook/core/Track.kt | 40 ++-- .../java/org/y20k/trackbook/core/Tracklist.kt | 16 +- .../y20k/trackbook/core/TracklistElement.kt | 20 +- .../java/org/y20k/trackbook/core/WayPoint.kt | 24 +-- .../org/y20k/trackbook/dialogs/ErrorDialog.kt | 22 ++- .../trackbook/dialogs/RenameTrackDialog.kt | 4 +- .../org/y20k/trackbook/dialogs/YesNoDialog.kt | 59 +++--- .../extensions/SharedPreferencesExt.kt | 6 +- .../y20k/trackbook/helpers/AppThemeHelper.kt | 4 +- .../y20k/trackbook/helpers/DateTimeHelper.kt | 20 +- .../org/y20k/trackbook/helpers/FileHelper.kt | 78 ++++++-- .../trackbook/helpers/LengthUnitHelper.kt | 12 +- .../y20k/trackbook/helpers/LocationHelper.kt | 57 ++++-- .../org/y20k/trackbook/helpers/MapOverlay.kt | 108 +++++++++-- .../trackbook/helpers/NotificationHelper.kt | 84 +++++--- .../trackbook/helpers/PreferencesHelper.kt | 36 +++- .../org/y20k/trackbook/helpers/TrackHelper.kt | 76 ++++++-- .../org/y20k/trackbook/helpers/UiHelper.kt | 68 +++++-- .../trackbook/tracklist/TracklistAdapter.kt | 35 +++- .../trackbook/ui/MapFragmentLayoutHolder.kt | 33 +++- .../trackbook/ui/TrackFragmentLayoutHolder.kt | 68 +++++-- .../main/res/drawable/ic_bug_report_24dp.xml | 6 +- .../main/res/drawable/ic_clear_white_24dp.xml | 12 +- .../drawable/ic_compass_needle_black_24dp.xml | 10 +- .../res/drawable/ic_current_location_24dp.xml | 12 +- app/src/main/res/drawable/ic_delete_24dp.xml | 6 +- app/src/main/res/drawable/ic_edit_24dp.xml | 10 +- .../ic_fiber_manual_record_red_24dp.xml | 12 +- .../ic_fiber_manual_record_white_24dp.xml | 12 +- app/src/main/res/drawable/ic_gps_24dp.xml | 12 +- app/src/main/res/drawable/ic_info_24dp.xml | 6 +- .../drawable/ic_marker_location_blue_24dp.xml | 12 +- .../ic_marker_location_blue_grey_24dp.xml | 12 +- .../drawable/ic_marker_location_red_24dp.xml | 12 +- .../ic_marker_location_red_grey_24dp.xml | 12 +- .../ic_marker_track_location_blue_24dp.xml | 10 +- .../ic_marker_track_location_grey_24dp.xml | 10 +- .../ic_marker_track_location_red_24dp.xml | 10 +- .../res/drawable/ic_notebook_black_24dp.xml | 10 +- .../ic_notification_action_resume_36dp.xml | 8 +- .../ic_notification_action_show_36dp.xml | 6 +- .../ic_notification_action_stop_24dp.xml | 6 +- ...cation_icon_large_tracking_active_48dp.xml | 8 +- ...ation_icon_large_tracking_stopped_48dp.xml | 8 +- .../ic_notification_icon_small_24dp.xml | 10 +- .../res/drawable/ic_remove_circle_24dp.xml | 10 +- app/src/main/res/drawable/ic_save_24dp.xml | 6 +- .../main/res/drawable/ic_save_white_24dp.xml | 10 +- .../res/drawable/ic_settings_black_24dp.xml | 10 +- .../main/res/drawable/ic_smartphone_24dp.xml | 10 +- .../main/res/drawable/ic_square_foot_24px.xml | 6 +- .../main/res/drawable/ic_star_blue_24dp.xml | 10 +- .../main/res/drawable/ic_star_filled_24dp.xml | 10 +- .../res/drawable/ic_star_outline_24dp.xml | 10 +- .../main/res/drawable/ic_star_red_24dp.xml | 10 +- .../main/res/drawable/ic_timeline_24dp.xml | 10 +- app/src/main/res/drawable/ic_undo_24dp.xml | 10 +- .../drawable/selector_bottom_navigation.xml | 4 +- .../shape_statistics_background_collapsed.xml | 15 +- .../shape_statistics_background_expanded.xml | 15 +- .../layout/dialog_generic_with_details.xml | 5 +- .../main/res/layout/dialog_rename_track.xml | 5 +- app/src/main/res/layout/fragment_map.xml | 6 +- app/src/main/res/layout/fragment_track.xml | 5 +- .../main/res/layout/fragment_tracklist.xml | 43 ++--- app/src/main/res/layout/track_onboarding.xml | 7 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 +- .../main/res/navigation/nav_graph_main.xml | 8 +- app/src/main/res/values-zh-rCN/strings.xml | 182 +++++++++--------- app/src/main/res/values/colors.xml | 10 +- app/src/main/res/values/dimens.xml | 5 +- app/src/main/res/values/styles.xml | 2 + app/src/main/res/xml/provider_paths.xml | 6 +- 85 files changed, 1367 insertions(+), 723 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b1b9eb9 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +# editorconfig.org +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a3398c8..9c1e41e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,10 +1,11 @@ + package="org.y20k.trackbook"> - + @@ -19,26 +20,26 @@ + android:name=".Trackbook" + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:supportsRtl="true" + android:theme="@style/AppTheme"> - - + + + android:exported="false" + android:foregroundServiceType="location"> @@ -49,8 +50,8 @@ @@ -59,13 +60,13 @@ + android:name="androidx.core.content.FileProvider" + android:authorities="${applicationId}.provider" + android:exported="false" + android:grantUriPermissions="true"> + android:name="android.support.FILE_PROVIDER_PATHS" + android:resource="@xml/provider_paths" /> diff --git a/app/src/main/java/org/y20k/trackbook/Keys.kt b/app/src/main/java/org/y20k/trackbook/Keys.kt index 30a3609..cdd27c5 100644 --- a/app/src/main/java/org/y20k/trackbook/Keys.kt +++ b/app/src/main/java/org/y20k/trackbook/Keys.kt @@ -44,8 +44,9 @@ object Keys { const val ARG_TRACK_ID: String = "ArgTrackId" // preferences - 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 - const val PREF_THEME_SELECTION: String= "prefThemeSelection" + 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 + 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" @@ -77,7 +78,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" @@ -95,21 +96,29 @@ 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 = 1000L // 1 second in milliseconds - const val ADD_WAYPOINT_TO_TRACK_INTERVAL: Long = 15000L // 15 seconds 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 REQUEST_CURRENT_LOCATION_INTERVAL: Long = + 1000L // 1 second in milliseconds + const val ADD_WAYPOINT_TO_TRACK_INTERVAL: Long = + 15000L // 15 seconds 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 = 71.172500 // latitude Nordkapp, Norway - const val DEFAULT_LONGITUDE: Double = 25.784444 // longitude Nordkapp, Norway + const val DEFAULT_LATITUDE: Double = + 71.172500 // latitude 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 = 60000000000L // one minute in nanoseconds + const val DEFAULT_THRESHOLD_LOCATION_AGE: Long = + 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 = 10 // altitude changes of 10 meter or more (per 15 seconds) are being discarded + const val ALTITUDE_MEASUREMENT_ERROR_THRESHOLD = + 10 // altitude changes of 10 meter or more (per 15 seconds) are being discarded const val REQUEST_CODE_FOREGROUND = 42 // requests diff --git a/app/src/main/java/org/y20k/trackbook/MainActivity.kt b/app/src/main/java/org/y20k/trackbook/MainActivity.kt index 9f70971..abbd183 100644 --- a/app/src/main/java/org/y20k/trackbook/MainActivity.kt +++ b/app/src/main/java/org/y20k/trackbook/MainActivity.kt @@ -69,7 +69,8 @@ class MainActivity : AppCompatActivity() { // set up views setContentView(R.layout.activity_main) - navHostFragment = supportFragmentManager.findFragmentById(R.id.main_container) as NavHostFragment + navHostFragment = + supportFragmentManager.findFragmentById(R.id.main_container) as NavHostFragment bottomNavigationView = findViewById(R.id.bottom_navigation_view) bottomNavigationView.setupWithNavController(navController = navHostFragment.navController) @@ -77,10 +78,11 @@ class MainActivity : AppCompatActivity() { navHostFragment.navController.addOnDestinationChangedListener { _, destination, _ -> when (destination.id) { R.id.fragment_track -> { - runOnUiThread( Runnable() { - run(){ + runOnUiThread(Runnable() { + run() { // mark menu item "Tracks" as checked - bottomNavigationView.menu.findItem(R.id.tracklist_fragment).setChecked(true) + bottomNavigationView.menu.findItem(R.id.tracklist_fragment) + .setChecked(true) } }) } @@ -91,7 +93,8 @@ class MainActivity : AppCompatActivity() { } // register listener for changes in shared preferences - PreferenceManager.getDefaultSharedPreferences(this as Context).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) + PreferenceManager.getDefaultSharedPreferences(this as Context) + .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) } @@ -99,20 +102,22 @@ class MainActivity : AppCompatActivity() { override fun onDestroy() { super.onDestroy() // unregister listener for changes in shared preferences - PreferenceManager.getDefaultSharedPreferences(this as Context).unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) + PreferenceManager.getDefaultSharedPreferences(this as Context) + .unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) } /* * Defines the listener for changes in shared preferences */ - private val sharedPreferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key -> - when (key) { - Keys.PREF_THEME_SELECTION -> { - AppThemeHelper.setTheme(PreferencesHelper.loadThemeSelection(this@MainActivity)) + private val sharedPreferenceChangeListener = + SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key -> + when (key) { + Keys.PREF_THEME_SELECTION -> { + AppThemeHelper.setTheme(PreferencesHelper.loadThemeSelection(this@MainActivity)) + } } } - } /* * End of declaration */ diff --git a/app/src/main/java/org/y20k/trackbook/MapFragment.kt b/app/src/main/java/org/y20k/trackbook/MapFragment.kt index d9f6ce0..cb59078 100644 --- a/app/src/main/java/org/y20k/trackbook/MapFragment.kt +++ b/app/src/main/java/org/y20k/trackbook/MapFragment.kt @@ -73,9 +73,20 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark /* Overrides onStop from Fragment */ - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { // initialize layout - layout = MapFragmentLayoutHolder(activity as Context, this as MapOverlay.MarkerListener, inflater, container, currentBestLocation, trackingState) + layout = MapFragmentLayoutHolder( + activity as Context, + this as MapOverlay.MarkerListener, + inflater, + container, + currentBestLocation, + trackingState + ) // set up buttons layout.currentLocationButton.setOnClickListener { @@ -104,11 +115,22 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark override fun onStart() { super.onStart() // request location permission if denied - if (ContextCompat.checkSelfPermission(activity as Context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_DENIED) { - this.requestPermissions(arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), Keys.REQUEST_CODE_FOREGROUND) + if (ContextCompat.checkSelfPermission( + activity as Context, + 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(Intent(activity, TrackerService::class.java), connection, Context.BIND_AUTO_CREATE) + activity?.bindService( + Intent(activity, TrackerService::class.java), + connection, + Context.BIND_AUTO_CREATE + ) } @@ -142,14 +164,22 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark /* Overrides onRequestPermissionsResult from Fragment */ - override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { + override fun onRequestPermissionsResult( + requestCode: Int, + permissions: Array, + 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(Intent(activity, TrackerService::class.java), connection, Context.BIND_AUTO_CREATE) + activity?.bindService( + 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 @@ -163,7 +193,12 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark /* Overrides onYesNoDialog from YesNoDialogListener */ - override fun onYesNoDialog(type: Int, dialogResult: Boolean, payload: Int, payloadString: String) { + override fun onYesNoDialog( + type: Int, + dialogResult: Boolean, + payload: Int, + payloadString: String + ) { super.onYesNoDialog(type, dialogResult, payload, payloadString) when (type) { Keys.DIALOG_EMPTY_RECORDING -> { @@ -218,11 +253,18 @@ 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(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) + 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 + ) } else { GlobalScope.launch { // step 1: create and store filenames for json and gpx files - track.trackUriString = FileHelper.getTrackFileUri(activity as Context, track).toString() + track.trackUriString = + 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) @@ -251,16 +293,17 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlay.Mark /* * Defines the listener for changes in shared preferences */ - private val sharedPreferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key -> - when (key) { - Keys.PREF_TRACKING_STATE -> { - if (activity != null) { - trackingState = PreferencesHelper.loadTrackingState(activity as Context) - layout.updateRecordingButton(trackingState) + private val sharedPreferenceChangeListener = + SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key -> + when (key) { + Keys.PREF_TRACKING_STATE -> { + if (activity != null) { + trackingState = PreferencesHelper.loadTrackingState(activity as Context) + layout.updateRecordingButton(trackingState) + } } } } - } /* * End of declaration */ @@ -279,15 +322,18 @@ 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).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) + PreferenceManager.getDefaultSharedPreferences(activity as Context) + .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).unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) + PreferenceManager.getDefaultSharedPreferences(activity as Context) + .unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) // stop receiving location updates handler.removeCallbacks(periodicLocationRequestRunnable) } @@ -312,7 +358,9 @@ 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) { layout.centerMap(currentBestLocation, true)} + if (!layout.userInteraction) { + layout.centerMap(currentBestLocation, true) + } // show error snackbar if necessary layout.toggleLocationErrorBar(gpsProviderActive, networkProviderActive) // use the handler to start runnable again after specified delay diff --git a/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt b/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt index ed33fc7..9e0ff9b 100644 --- a/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt +++ b/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt @@ -72,12 +72,16 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList preferenceGpsOnly.setDefaultValue(false) // set up "Use Imperial Measurements" preference - val preferenceImperialMeasurementUnits: SwitchPreferenceCompat = SwitchPreferenceCompat(activity as Context) - preferenceImperialMeasurementUnits.title = getString(R.string.pref_imperial_measurement_units_title) + val preferenceImperialMeasurementUnits: SwitchPreferenceCompat = + SwitchPreferenceCompat(activity as Context) + preferenceImperialMeasurementUnits.title = + getString(R.string.pref_imperial_measurement_units_title) preferenceImperialMeasurementUnits.setIcon(R.drawable.ic_square_foot_24px) preferenceImperialMeasurementUnits.key = Keys.PREF_USE_IMPERIAL_UNITS - preferenceImperialMeasurementUnits.summaryOn = getString(R.string.pref_imperial_measurement_units_summary_imperial) - preferenceImperialMeasurementUnits.summaryOff = getString(R.string.pref_imperial_measurement_units_summary_metric) + preferenceImperialMeasurementUnits.summaryOn = + getString(R.string.pref_imperial_measurement_units_summary_imperial) + preferenceImperialMeasurementUnits.summaryOff = + getString(R.string.pref_imperial_measurement_units_summary_metric) preferenceImperialMeasurementUnits.setDefaultValue(LengthUnitHelper.useImperialUnits()) // set up "App Theme" preference @@ -85,13 +89,27 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList preferenceThemeSelection.title = getString(R.string.pref_theme_selection_title) preferenceThemeSelection.setIcon(R.drawable.ic_smartphone_24dp) preferenceThemeSelection.key = Keys.PREF_THEME_SELECTION - preferenceThemeSelection.summary = "${getString(R.string.pref_theme_selection_summary)} ${AppThemeHelper.getCurrentTheme(activity as Context)}" - preferenceThemeSelection.entries = arrayOf(getString(R.string.pref_theme_selection_mode_device_default), getString(R.string.pref_theme_selection_mode_light), getString(R.string.pref_theme_selection_mode_dark)) - preferenceThemeSelection.entryValues = arrayOf(Keys.STATE_THEME_FOLLOW_SYSTEM, Keys.STATE_THEME_LIGHT_MODE, Keys.STATE_THEME_DARK_MODE) + preferenceThemeSelection.summary = + "${getString(R.string.pref_theme_selection_summary)} ${AppThemeHelper.getCurrentTheme( + activity as Context + )}" + preferenceThemeSelection.entries = arrayOf( + getString(R.string.pref_theme_selection_mode_device_default), + getString(R.string.pref_theme_selection_mode_light), + getString(R.string.pref_theme_selection_mode_dark) + ) + preferenceThemeSelection.entryValues = arrayOf( + Keys.STATE_THEME_FOLLOW_SYSTEM, + Keys.STATE_THEME_LIGHT_MODE, + Keys.STATE_THEME_DARK_MODE + ) preferenceThemeSelection.setOnPreferenceChangeListener { preference, newValue -> if (preference is ListPreference) { val index: Int = preference.entryValues.indexOf(newValue) - preferenceThemeSelection.summary = "${getString(R.string.pref_theme_selection_summary)} ${preference.entries.get(index)}" + preferenceThemeSelection.summary = + "${getString(R.string.pref_theme_selection_summary)} ${preference.entries.get( + index + )}" return@setOnPreferenceChangeListener true } else { return@setOnPreferenceChangeListener false @@ -103,8 +121,13 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList preferenceDeleteNonStarred.title = getString(R.string.pref_delete_non_starred_title) preferenceDeleteNonStarred.setIcon(R.drawable.ic_delete_24dp) preferenceDeleteNonStarred.summary = getString(R.string.pref_delete_non_starred_summary) - preferenceDeleteNonStarred.setOnPreferenceClickListener{ - YesNoDialog(this as YesNoDialog.YesNoDialogListener).show(context = activity as Context, type = Keys.DIALOG_DELETE_NON_STARRED, message = R.string.dialog_yes_no_message_delete_non_starred, yesButton = R.string.dialog_yes_no_positive_button_delete_non_starred) + preferenceDeleteNonStarred.setOnPreferenceClickListener { + YesNoDialog(this as YesNoDialog.YesNoDialogListener).show( + context = activity as Context, + type = Keys.DIALOG_DELETE_NON_STARRED, + message = R.string.dialog_yes_no_message_delete_non_starred, + yesButton = R.string.dialog_yes_no_positive_button_delete_non_starred + ) return@setOnPreferenceClickListener true } @@ -123,7 +146,7 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList preferenceResetAdvanced.title = getString(R.string.pref_reset_advanced_title) preferenceResetAdvanced.setIcon(R.drawable.ic_undo_24dp) preferenceResetAdvanced.summary = getString(R.string.pref_reset_advanced_summary) - preferenceResetAdvanced.setOnPreferenceClickListener{ + preferenceResetAdvanced.setOnPreferenceClickListener { preferenceAccuracyThreshold.value = Keys.DEFAULT_THRESHOLD_LOCATION_ACCURACY return@setOnPreferenceClickListener true } @@ -132,14 +155,21 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList val preferenceAppVersion: Preference = Preference(context) preferenceAppVersion.title = getString(R.string.pref_app_version_title) preferenceAppVersion.setIcon(R.drawable.ic_info_24dp) - preferenceAppVersion.summary = "${getString(R.string.pref_app_version_summary)} ${BuildConfig.VERSION_NAME} (${getString( - R.string.app_version_name)})" + preferenceAppVersion.summary = + "${getString(R.string.pref_app_version_summary)} ${BuildConfig.VERSION_NAME} (${getString( + R.string.app_version_name + )})" preferenceAppVersion.setOnPreferenceClickListener { // copy to clipboard val clip: ClipData = ClipData.newPlainText("simple text", preferenceAppVersion.summary) - val cm: ClipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + val cm: ClipboardManager = + context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager cm.setPrimaryClip(clip) - Toast.makeText(activity as Context, R.string.toast_message_copied_to_clipboard, Toast.LENGTH_LONG).show() + Toast.makeText( + activity as Context, + R.string.toast_message_copied_to_clipboard, + Toast.LENGTH_LONG + ).show() return@setOnPreferenceClickListener true } @@ -163,7 +193,8 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList preferenceCategoryGeneral.title = getString(R.string.pref_general_title) preferenceCategoryGeneral.contains(preferenceImperialMeasurementUnits) preferenceCategoryGeneral.contains(preferenceGpsOnly) - val preferenceCategoryMaintenance: PreferenceCategory = PreferenceCategory(activity as Context) + val preferenceCategoryMaintenance: PreferenceCategory = + PreferenceCategory(activity as Context) preferenceCategoryMaintenance.title = getString(R.string.pref_maintenance_title) preferenceCategoryMaintenance.contains(preferenceDeleteNonStarred) @@ -195,7 +226,12 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList /* Overrides onYesNoDialog from YesNoDialogListener */ - override fun onYesNoDialog(type: Int, dialogResult: Boolean, payload: Int, payloadString: String) { + override fun onYesNoDialog( + type: Int, + dialogResult: Boolean, + payload: Int, + payloadString: String + ) { when (type) { Keys.DIALOG_DELETE_NON_STARRED -> { when (dialogResult) { @@ -218,7 +254,8 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList val uiScope = CoroutineScope(Dispatchers.Main + backgroundJob) uiScope.launch { var tracklist: Tracklist = FileHelper.readTracklist(context) - val deferred: Deferred = async { FileHelper.deleteNonStarredSuspended(context, tracklist) } + val deferred: Deferred = + async { FileHelper.deleteNonStarredSuspended(context, tracklist) } // wait for result and store in tracklist tracklist = deferred.await() backgroundJob.cancel() diff --git a/app/src/main/java/org/y20k/trackbook/TrackFragment.kt b/app/src/main/java/org/y20k/trackbook/TrackFragment.kt index d33305d..4150d9f 100644 --- a/app/src/main/java/org/y20k/trackbook/TrackFragment.kt +++ b/app/src/main/java/org/y20k/trackbook/TrackFragment.kt @@ -46,7 +46,8 @@ import org.y20k.trackbook.helpers.TrackHelper import org.y20k.trackbook.ui.TrackFragmentLayoutHolder -class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDialog.YesNoDialogListener, MapOverlay.MarkerListener { +class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, + YesNoDialog.YesNoDialogListener, MapOverlay.MarkerListener { /* Define log tag */ private val TAG: String = LogHelper.makeLogTag(TrackFragment::class.java) @@ -61,7 +62,8 @@ class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDi override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) // get track - val fileUriString: String = arguments?.getString(Keys.ARG_TRACK_FILE_URI, String()) ?: String() + val fileUriString: String = + arguments?.getString(Keys.ARG_TRACK_FILE_URI, String()) ?: String() if (fileUriString.isNotBlank()) { track = FileHelper.readTrack(activity as Context, Uri.parse(fileUriString)) } else { @@ -71,9 +73,19 @@ class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDi /* Overrides onCreateView from Fragment */ - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { // initialize layout - layout = TrackFragmentLayoutHolder(activity as Context, this as MapOverlay.MarkerListener, inflater, container, track) + layout = TrackFragmentLayoutHolder( + activity as Context, + this as MapOverlay.MarkerListener, + inflater, + container, + track + ) // set up share button layout.shareButton.setOnClickListener { @@ -87,12 +99,21 @@ class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDi } // set up delete button layout.deleteButton.setOnClickListener { - val dialogMessage: String = "${getString(R.string.dialog_yes_no_message_delete_recording)}\n\n- ${layout.trackNameView.text}" - YesNoDialog(this@TrackFragment as YesNoDialog.YesNoDialogListener).show(context = activity as Context, type = Keys.DIALOG_DELETE_TRACK, messageString = dialogMessage, yesButton = R.string.dialog_yes_no_positive_button_delete_recording) + val dialogMessage: String = + "${getString(R.string.dialog_yes_no_message_delete_recording)}\n\n- ${layout.trackNameView.text}" + YesNoDialog(this@TrackFragment as YesNoDialog.YesNoDialogListener).show( + context = activity as Context, + type = Keys.DIALOG_DELETE_TRACK, + messageString = dialogMessage, + yesButton = R.string.dialog_yes_no_positive_button_delete_recording + ) } // set up rename button layout.editButton.setOnClickListener { - RenameTrackDialog(this as RenameTrackDialog.RenameTrackListener).show(activity as Context, layout.trackNameView.text.toString()) + RenameTrackDialog(this as RenameTrackDialog.RenameTrackListener).show( + activity as Context, + layout.trackNameView.text.toString() + ) } return layout.rootView @@ -125,8 +146,18 @@ class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDi val targetUri: Uri? = data.data if (targetUri != null) { // copy file async (= fire & forget - no return value needed) - GlobalScope.launch { FileHelper.saveCopyOfFileSuspended( activity as Context, originalFileUri = sourceUri, targetFileUri = targetUri) } - Toast.makeText(activity as Context, R.string.toast_message_save_gpx, Toast.LENGTH_LONG).show() + GlobalScope.launch { + FileHelper.saveCopyOfFileSuspended( + activity as Context, + originalFileUri = sourceUri, + targetFileUri = targetUri + ) + } + Toast.makeText( + activity as Context, + R.string.toast_message_save_gpx, + Toast.LENGTH_LONG + ).show() } } } @@ -139,7 +170,13 @@ class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDi /* Overrides onRenameTrackDialog from RenameTrackDialog */ override fun onRenameTrackDialog(textInput: String) { // rename track async (= fire & forget - no return value needed) - GlobalScope.launch { FileHelper.renameTrackSuspended(activity as Context, layout.track, textInput) } + GlobalScope.launch { + FileHelper.renameTrackSuspended( + activity as Context, + layout.track, + textInput + ) + } // update name in layout layout.track.name = textInput layout.trackNameView.text = textInput @@ -147,7 +184,12 @@ class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDi /* Overrides onYesNoDialog from YesNoDialogListener */ - override fun onYesNoDialog(type: Int, dialogResult: Boolean, payload: Int, payloadString: String) { + override fun onYesNoDialog( + type: Int, + dialogResult: Boolean, + payload: Int, + payloadString: String + ) { when (type) { Keys.DIALOG_DELETE_TRACK -> { when (dialogResult) { @@ -189,7 +231,11 @@ class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDi if (packageManager != null && intent.resolveActivity(packageManager) != null) { startActivityForResult(intent, Keys.REQUEST_SAVE_GPX) } else { - Toast.makeText(activity as Context, R.string.toast_message_install_file_helper, Toast.LENGTH_LONG).show() + Toast.makeText( + activity as Context, + R.string.toast_message_install_file_helper, + Toast.LENGTH_LONG + ).show() } } @@ -197,7 +243,11 @@ class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDi /* Share track as GPX via share sheet */ private fun shareGpxTrack() { val gpxFile = Uri.parse(layout.track.gpxUriString).toFile() - val gpxShareUri = FileProvider.getUriForFile(this.activity as Context, "${requireActivity().applicationContext.packageName}.provider", gpxFile) + val gpxShareUri = FileProvider.getUriForFile( + this.activity as Context, + "${requireActivity().applicationContext.packageName}.provider", + gpxFile + ) val shareIntent: Intent = Intent.createChooser(Intent().apply { action = Intent.ACTION_SEND data = gpxShareUri @@ -211,7 +261,8 @@ class TrackFragment : Fragment(), RenameTrackDialog.RenameTrackListener, YesNoDi if (packageManager != null && shareIntent.resolveActivity(packageManager) != null) { startActivity(shareIntent) } else { - Toast.makeText(activity, R.string.toast_message_install_file_helper, Toast.LENGTH_LONG).show() + Toast.makeText(activity, R.string.toast_message_install_file_helper, Toast.LENGTH_LONG) + .show() } } diff --git a/app/src/main/java/org/y20k/trackbook/Trackbook.kt b/app/src/main/java/org/y20k/trackbook/Trackbook.kt index cc9615d..af38515 100644 --- a/app/src/main/java/org/y20k/trackbook/Trackbook.kt +++ b/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.") } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.kt b/app/src/main/java/org/y20k/trackbook/TrackerService.kt index 224810c..510f28d 100644 --- a/app/src/main/java/org/y20k/trackbook/TrackerService.kt +++ b/app/src/main/java/org/y20k/trackbook/TrackerService.kt @@ -48,7 +48,7 @@ import kotlin.coroutines.CoroutineContext /* * TrackerService class */ -class TrackerService(): Service(), CoroutineScope, SensorEventListener { +class TrackerService() : Service(), CoroutineScope, SensorEventListener { /* Define log tag */ private val TAG: String = LogHelper.makeLogTag(TrackerService::class.java) @@ -101,7 +101,8 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { currentBestLocation = LocationHelper.getLastKnownLocation(this) track = FileHelper.readTrack(this, FileHelper.getTempFileUri(this)) backgroundJob = Job() - PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) + PreferenceManager.getDefaultSharedPreferences(this) + .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) } @@ -111,16 +112,19 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { // SERVICE RESTART (via START_STICKY) if (intent == null) { if (trackingState == Keys.STATE_TRACKING_ACTIVE) { - LogHelper.w(TAG, "Trackbook has been killed by the operating system. Trying to resume recording.") + LogHelper.w( + TAG, + "Trackbook has been killed by the operating system. Trying to resume recording." + ) resumeTracking() } - // ACTION STOP + // ACTION STOP } else if (Keys.ACTION_STOP == intent.action) { stopTracking() - // ACTION START + // ACTION START } else if (Keys.ACTION_START == intent.action) { startTracking() - // ACTION RESUME + // ACTION RESUME } else if (Keys.ACTION_RESUME == intent.action) { resumeTracking() } @@ -172,7 +176,8 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { // remove notification stopForeground(true) // stop listening for changes in shared preferences - PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) + PreferenceManager.getDefaultSharedPreferences(this) + .unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) // stop receiving location updates removeGpsLocationListener() removeNetworkLocationListener() @@ -193,7 +198,8 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { if (sensorEvent != null) { if (stepCountOffset == 0f) { // store steps previously recorded by the system - stepCountOffset = (sensorEvent.values[0] - 1) - track.stepCount // subtract any steps recorded during this session in case the app was killed + stepCountOffset = + (sensorEvent.values[0] - 1) - track.stepCount // subtract any steps recorded during this session in case the app was killed } // calculate step count - subtract steps previously recorded steps = sensorEvent.values[0] - stepCountOffset @@ -215,7 +221,8 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { // set resumed flag resumed = true // calculate length of recording break - track.recordingPaused = track.recordingPaused + TrackHelper.calculateDurationOfPause(track.recordingStop) + track.recordingPaused = + track.recordingPaused + TrackHelper.calculateDurationOfPause(track.recordingStop) // start tracking startTracking(newTrack = false) } @@ -301,20 +308,27 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { currentBestLocation = location } } + override fun onProviderEnabled(provider: String) { LogHelper.v(TAG, "onProviderEnabled $provider") when (provider) { - LocationManager.GPS_PROVIDER -> gpsProviderActive = LocationHelper.isGpsEnabled(locationManager) - LocationManager.NETWORK_PROVIDER -> networkProviderActive = LocationHelper.isNetworkEnabled(locationManager) + LocationManager.GPS_PROVIDER -> gpsProviderActive = + LocationHelper.isGpsEnabled(locationManager) + LocationManager.NETWORK_PROVIDER -> networkProviderActive = + LocationHelper.isNetworkEnabled(locationManager) } } + override fun onProviderDisabled(provider: String) { LogHelper.v(TAG, "onProviderDisabled $provider") when (provider) { - LocationManager.GPS_PROVIDER -> gpsProviderActive = LocationHelper.isGpsEnabled(locationManager) - LocationManager.NETWORK_PROVIDER -> networkProviderActive = LocationHelper.isNetworkEnabled(locationManager) + LocationManager.GPS_PROVIDER -> gpsProviderActive = + LocationHelper.isGpsEnabled(locationManager) + LocationManager.NETWORK_PROVIDER -> networkProviderActive = + LocationHelper.isNetworkEnabled(locationManager) } } + override fun onStatusChanged(p0: String?, p1: Int, p2: Bundle?) { // deprecated method } @@ -329,13 +343,25 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { // check if Network provider is available if (gpsProviderActive) { // check for location permission - if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { + if (ContextCompat.checkSelfPermission( + this, + Manifest.permission.ACCESS_FINE_LOCATION + ) == PackageManager.PERMISSION_GRANTED + ) { // adds GPS location listener - locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0f,gpsLocationListener) + locationManager.requestLocationUpdates( + LocationManager.GPS_PROVIDER, + 0, + 0f, + gpsLocationListener + ) gpsLocationListenerRegistered = true LogHelper.v(TAG, "Added GPS location listener.") } else { - LogHelper.w(TAG, "Unable to add GPS location listener. Location permission is not granted.") + LogHelper.w( + TAG, + "Unable to add GPS location listener. Location permission is not granted." + ) } } else { LogHelper.w(TAG, "Unable to add GPS location listener.") @@ -353,50 +379,83 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { // check if Network provider is available if (networkProviderActive && !gpsOnly) { // check for location permission - if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { + if (ContextCompat.checkSelfPermission( + this, + Manifest.permission.ACCESS_FINE_LOCATION + ) == PackageManager.PERMISSION_GRANTED + ) { // adds Network location listener - locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0f, networkLocationListener) + locationManager.requestLocationUpdates( + LocationManager.NETWORK_PROVIDER, + 0, + 0f, + networkLocationListener + ) networkLocationListenerRegistered = true LogHelper.v(TAG, "Added Network location listener.") } else { - LogHelper.w(TAG, "Unable to add Network location listener. Location permission is not granted.") + LogHelper.w( + TAG, + "Unable to add Network location listener. Location permission is not granted." + ) } } else { LogHelper.w(TAG, "Unable to add Network location listener.") } } else { - LogHelper.v(TAG, "Skipping registration. Network location listener has already been added.") + LogHelper.v( + TAG, + "Skipping registration. Network location listener has already been added." + ) } } /* Adds location listeners to location manager */ fun removeGpsLocationListener() { - if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { + if (ContextCompat.checkSelfPermission( + this, + Manifest.permission.ACCESS_FINE_LOCATION + ) == PackageManager.PERMISSION_GRANTED + ) { locationManager.removeUpdates(gpsLocationListener) gpsLocationListenerRegistered = false LogHelper.v(TAG, "Removed GPS location listener.") } else { - LogHelper.w(TAG, "Unable to remove GPS location listener. Location permission is needed.") + LogHelper.w( + TAG, + "Unable to remove GPS location listener. Location permission is needed." + ) } } /* Adds location listeners to location manager */ fun removeNetworkLocationListener() { - if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { + if (ContextCompat.checkSelfPermission( + this, + Manifest.permission.ACCESS_FINE_LOCATION + ) == PackageManager.PERMISSION_GRANTED + ) { locationManager.removeUpdates(gpsLocationListener) networkLocationListenerRegistered = false LogHelper.v(TAG, "Removed Network location listener.") } else { - LogHelper.w(TAG, "Unable to remove Network location listener. Location permission is needed.") + LogHelper.w( + TAG, + "Unable to remove Network location listener. Location permission is needed." + ) } } /* Registers a step counter listener */ private fun startStepCounter() { - val stepCounterAvailable = sensorManager.registerListener(this, sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER), SensorManager.SENSOR_DELAY_UI) + val stepCounterAvailable = sensorManager.registerListener( + this, + sensorManager.getDefaultSensor(Sensor.TYPE_STEP_COUNTER), + SensorManager.SENSOR_DELAY_UI + ) if (!stepCounterAvailable) { LogHelper.w(TAG, "Pedometer sensor not available.") track.stepCount = -1f @@ -406,7 +465,12 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { /* Displays / updates notification */ private fun displayNotification(): Notification { - val notification: Notification = notificationHelper.createNotification(trackingState, track.length, track.duration, useImperial) + val notification: Notification = notificationHelper.createNotification( + trackingState, + track.length, + track.duration, + useImperial + ) notificationManager.notify(Keys.TRACKER_SERVICE_NOTIFICATION_ID, notification) return notification } @@ -415,7 +479,8 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { /* * Defines the listener for changes in shared preferences */ - private val sharedPreferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key -> + private val sharedPreferenceChangeListener = + SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key -> when (key) { // preference "Restrict to GPS" Keys.PREF_GPS_ONLY -> { @@ -431,7 +496,8 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { } // preference "Accuracy Threshold" Keys.PREF_LOCATION_ACCURACY_THRESHOLD -> { - locationAccuracyThreshold = PreferencesHelper.loadAccuracyThreshold(this@TrackerService) + locationAccuracyThreshold = + PreferencesHelper.loadAccuracyThreshold(this@TrackerService) } } } @@ -457,7 +523,13 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { private val periodicTrackUpdate: Runnable = object : Runnable { override fun run() { // add waypoint to track - step count is continuously updated in onSensorChanged - val result: Pair = TrackHelper.addWayPointToTrack(this@TrackerService, track, currentBestLocation, locationAccuracyThreshold, resumed) + val result: Pair = TrackHelper.addWayPointToTrack( + this@TrackerService, + track, + currentBestLocation, + locationAccuracyThreshold, + resumed + ) // get track from result track = result.first // check if waypoint was successfully added (= result.second) @@ -478,4 +550,4 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { */ -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/TrackingToggleTileService.kt b/app/src/main/java/org/y20k/trackbook/TrackingToggleTileService.kt index 3234150..29622fa 100644 --- a/app/src/main/java/org/y20k/trackbook/TrackingToggleTileService.kt +++ b/app/src/main/java/org/y20k/trackbook/TrackingToggleTileService.kt @@ -31,7 +31,7 @@ import org.y20k.trackbook.helpers.PreferencesHelper /* * TrackingToggleTileService class */ -class TrackingToggleTileService(): TileService() { +class TrackingToggleTileService() : TileService() { /* Define log tag */ private val TAG: String = LogHelper.makeLogTag(TrackingToggleTileService::class.java) @@ -66,7 +66,8 @@ class TrackingToggleTileService(): TileService() { // set up tile updateTile() // register listener for changes in shared preferences - PreferenceManager.getDefaultSharedPreferences(this@TrackingToggleTileService).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) + PreferenceManager.getDefaultSharedPreferences(this@TrackingToggleTileService) + .registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) } @@ -84,7 +85,8 @@ class TrackingToggleTileService(): TileService() { override fun onStopListening() { super.onStopListening() // unregister listener for changes in shared preferences - PreferenceManager.getDefaultSharedPreferences(this@TrackingToggleTileService).unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) + PreferenceManager.getDefaultSharedPreferences(this@TrackingToggleTileService) + .unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener) } @@ -138,19 +140,18 @@ class TrackingToggleTileService(): TileService() { /* * Defines the listener for changes in shared preferences */ - private val sharedPreferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key -> - when (key) { - Keys.PREF_TRACKING_STATE -> { - trackingState = PreferencesHelper.loadTrackingState(this) - updateTile() + private val sharedPreferenceChangeListener = + SharedPreferences.OnSharedPreferenceChangeListener { sharedPreferences, key -> + when (key) { + Keys.PREF_TRACKING_STATE -> { + trackingState = PreferencesHelper.loadTrackingState(this) + updateTile() + } } } - } /* * End of declaration */ - - -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/TracklistFragment.kt b/app/src/main/java/org/y20k/trackbook/TracklistFragment.kt index b673e8e..26166f1 100644 --- a/app/src/main/java/org/y20k/trackbook/TracklistFragment.kt +++ b/app/src/main/java/org/y20k/trackbook/TracklistFragment.kt @@ -40,7 +40,8 @@ import org.y20k.trackbook.tracklist.TracklistAdapter /* * TracklistFragment class */ -class TracklistFragment : Fragment(), TracklistAdapter.TracklistAdapterListener, YesNoDialog.YesNoDialogListener { +class TracklistFragment : Fragment(), TracklistAdapter.TracklistAdapterListener, + YesNoDialog.YesNoDialogListener { /* Define log tag */ private val TAG: String = LogHelper.makeLogTag(TracklistFragment::class.java) @@ -61,7 +62,11 @@ class TracklistFragment : Fragment(), TracklistAdapter.TracklistAdapterListener, /* Overrides onCreateView from Fragment */ - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { // find views val rootView = inflater.inflate(R.layout.fragment_tracklist, container, false) trackElementList = rootView.findViewById(R.id.track_element_list) @@ -77,8 +82,17 @@ class TracklistFragment : Fragment(), TracklistAdapter.TracklistAdapterListener, override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { // ask user val adapterPosition: Int = viewHolder.adapterPosition - val dialogMessage: String = "${getString(R.string.dialog_yes_no_message_delete_recording)}\n\n- ${tracklistAdapter.getTrackName(adapterPosition)}" - YesNoDialog(this@TracklistFragment as YesNoDialog.YesNoDialogListener).show(context = activity as Context, type = Keys.DIALOG_DELETE_TRACK, messageString = dialogMessage, yesButton = R.string.dialog_yes_no_positive_button_delete_recording, payload = adapterPosition) + val dialogMessage: String = + "${getString(R.string.dialog_yes_no_message_delete_recording)}\n\n- ${tracklistAdapter.getTrackName( + adapterPosition + )}" + YesNoDialog(this@TracklistFragment as YesNoDialog.YesNoDialogListener).show( + context = activity as Context, + type = Keys.DIALOG_DELETE_TRACK, + messageString = dialogMessage, + yesButton = R.string.dialog_yes_no_positive_button_delete_recording, + payload = adapterPosition + ) } } val itemTouchHelper = ItemTouchHelper(swipeHandler) @@ -103,13 +117,18 @@ class TracklistFragment : Fragment(), TracklistAdapter.TracklistAdapterListener, /* Overrides onYesNoDialog from YesNoDialogListener */ - override fun onYesNoDialog(type: Int, dialogResult: Boolean, payload: Int, payloadString: String) { + override fun onYesNoDialog( + type: Int, + dialogResult: Boolean, + payload: Int, + payloadString: String + ) { when (type) { Keys.DIALOG_DELETE_TRACK -> { when (dialogResult) { // user tapped remove track true -> { - toggleOnboardingLayout(tracklistAdapter.itemCount -1) + toggleOnboardingLayout(tracklistAdapter.itemCount - 1) tracklistAdapter.removeTrack(activity as Context, payload) } // user tapped cancel @@ -139,11 +158,11 @@ class TracklistFragment : Fragment(), TracklistAdapter.TracklistAdapterListener, } - /* * Inner class: custom LinearLayoutManager that overrides onLayoutCompleted */ - inner class CustomLinearLayoutManager(context: Context): LinearLayoutManager(context, VERTICAL, false) { + inner class CustomLinearLayoutManager(context: Context) : + LinearLayoutManager(context, VERTICAL, false) { override fun supportsPredictiveItemAnimations(): Boolean { return true @@ -157,7 +176,7 @@ class TracklistFragment : Fragment(), TracklistAdapter.TracklistAdapterListener, if (deleteTrackId != -1L) { val position: Int = tracklistAdapter.findPosition(deleteTrackId) tracklistAdapter.removeTrack(this@TracklistFragment.activity as Context, position) - toggleOnboardingLayout(tracklistAdapter.itemCount -1) + toggleOnboardingLayout(tracklistAdapter.itemCount - 1) } } diff --git a/app/src/main/java/org/y20k/trackbook/core/Track.kt b/app/src/main/java/org/y20k/trackbook/core/Track.kt index 361911b..2096ac1 100644 --- a/app/src/main/java/org/y20k/trackbook/core/Track.kt +++ b/app/src/main/java/org/y20k/trackbook/core/Track.kt @@ -32,24 +32,26 @@ import java.util.* */ @Keep @Parcelize -data class Track (@Expose var trackFormatVersion: Int = Keys.CURRENT_TRACK_FORMAT_VERSION, - @Expose val wayPoints: MutableList = mutableListOf(), - @Expose var length: Float = 0f, - @Expose var duration: Long = 0L, - @Expose var recordingPaused: Long = 0L, - @Expose var stepCount: Float = 0f, - @Expose var recordingStart: Date = GregorianCalendar.getInstance().time, - @Expose var recordingStop: Date = recordingStart, - @Expose var maxAltitude: Double = 0.0, - @Expose var minAltitude: Double = 0.0, - @Expose var positiveElevation: Double = 0.0, - @Expose var negativeElevation: Double = 0.0, - @Expose var trackUriString: String = String(), - @Expose var gpxUriString: String = String(), - @Expose var latitude: Double = Keys.DEFAULT_LATITUDE, - @Expose var longitude: Double = Keys.DEFAULT_LONGITUDE, - @Expose var zoomLevel: Double = Keys.DEFAULT_ZOOM_LEVEL, - @Expose var name: String = String()): Parcelable { +data class Track( + @Expose var trackFormatVersion: Int = Keys.CURRENT_TRACK_FORMAT_VERSION, + @Expose val wayPoints: MutableList = mutableListOf(), + @Expose var length: Float = 0f, + @Expose var duration: Long = 0L, + @Expose var recordingPaused: Long = 0L, + @Expose var stepCount: Float = 0f, + @Expose var recordingStart: Date = GregorianCalendar.getInstance().time, + @Expose var recordingStop: Date = recordingStart, + @Expose var maxAltitude: Double = 0.0, + @Expose var minAltitude: Double = 0.0, + @Expose var positiveElevation: Double = 0.0, + @Expose var negativeElevation: Double = 0.0, + @Expose var trackUriString: String = String(), + @Expose var gpxUriString: String = String(), + @Expose var latitude: Double = Keys.DEFAULT_LATITUDE, + @Expose var longitude: Double = Keys.DEFAULT_LONGITUDE, + @Expose var zoomLevel: Double = Keys.DEFAULT_ZOOM_LEVEL, + @Expose var name: String = String() +) : Parcelable { /* Creates a TracklistElement */ @@ -75,4 +77,4 @@ data class Track (@Expose var trackFormatVersion: Int = Keys.CURRENT_TRACK_FORMA } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/core/Tracklist.kt b/app/src/main/java/org/y20k/trackbook/core/Tracklist.kt index 8944ed8..780231b 100644 --- a/app/src/main/java/org/y20k/trackbook/core/Tracklist.kt +++ b/app/src/main/java/org/y20k/trackbook/core/Tracklist.kt @@ -31,9 +31,11 @@ import java.util.* */ @Keep @Parcelize -data class Tracklist (@Expose val tracklistFormatVersion: Int = Keys.CURRENT_TRACKLIST_FORMAT_VERSION, - @Expose val tracklistElements: MutableList = mutableListOf(), - @Expose var modificationDate: Date = Date()): Parcelable { +data class Tracklist( + @Expose val tracklistFormatVersion: Int = Keys.CURRENT_TRACKLIST_FORMAT_VERSION, + @Expose val tracklistElements: MutableList = mutableListOf(), + @Expose var modificationDate: Date = Date() +) : Parcelable { /* Return trackelement for given track id */ fun getTrackElement(trackId: Long): TracklistElement? { @@ -47,7 +49,11 @@ data class Tracklist (@Expose val tracklistFormatVersion: Int = Keys.CURRENT_TRA /* Create a deep copy */ fun deepCopy(): Tracklist { - return Tracklist(tracklistFormatVersion, mutableListOf().apply { addAll(tracklistElements) }, modificationDate) + return Tracklist( + tracklistFormatVersion, + mutableListOf().apply { addAll(tracklistElements) }, + modificationDate + ) } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/core/TracklistElement.kt b/app/src/main/java/org/y20k/trackbook/core/TracklistElement.kt index baa7e5a..bab7cd7 100644 --- a/app/src/main/java/org/y20k/trackbook/core/TracklistElement.kt +++ b/app/src/main/java/org/y20k/trackbook/core/TracklistElement.kt @@ -29,18 +29,20 @@ import java.util.* */ @Keep @Parcelize -data class TracklistElement(@Expose var name: String, - @Expose val date: Date, - @Expose val dateString: String, - @Expose val durationString: String, - @Expose val length: Float, - @Expose val trackUriString: String, - @Expose val gpxUriString: String, - @Expose var starred: Boolean = false): Parcelable { +data class TracklistElement( + @Expose var name: String, + @Expose val date: Date, + @Expose val dateString: String, + @Expose val durationString: String, + @Expose val length: Float, + @Expose val trackUriString: String, + @Expose val gpxUriString: String, + @Expose var starred: Boolean = false +) : Parcelable { /* Returns unique ID for TracklistElement - currently the start date */ fun getTrackId(): Long { return date.time } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/core/WayPoint.kt b/app/src/main/java/org/y20k/trackbook/core/WayPoint.kt index d3bf6b0..6f4da89 100644 --- a/app/src/main/java/org/y20k/trackbook/core/WayPoint.kt +++ b/app/src/main/java/org/y20k/trackbook/core/WayPoint.kt @@ -29,16 +29,18 @@ import kotlinx.android.parcel.Parcelize */ @Keep @Parcelize -data class WayPoint(@Expose val provider: String, - @Expose val latitude: Double, - @Expose val longitude: Double, - @Expose val altitude: Double, - @Expose val accuracy: Float, - @Expose val time: Long, - @Expose val distanceToStartingPoint: Float = 0f, - @Expose val numberSatellites: Int = 0, - @Expose var isStopOver: Boolean = false, - @Expose var starred: Boolean = false): Parcelable { +data class WayPoint( + @Expose val provider: String, + @Expose val latitude: Double, + @Expose val longitude: Double, + @Expose val altitude: Double, + @Expose val accuracy: Float, + @Expose val time: Long, + @Expose val distanceToStartingPoint: Float = 0f, + @Expose val numberSatellites: Int = 0, + @Expose var isStopOver: Boolean = false, + @Expose var starred: Boolean = false +) : Parcelable { /* Converts WayPoint into Location */ @@ -52,4 +54,4 @@ data class WayPoint(@Expose val provider: String, return location } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/dialogs/ErrorDialog.kt b/app/src/main/java/org/y20k/trackbook/dialogs/ErrorDialog.kt index 48864c9..5ae28dd 100644 --- a/app/src/main/java/org/y20k/trackbook/dialogs/ErrorDialog.kt +++ b/app/src/main/java/org/y20k/trackbook/dialogs/ErrorDialog.kt @@ -38,9 +38,15 @@ object ErrorDialog { /* Construct and show dialog */ - fun show(context: Context, errorTitle: Int, errorMessage: Int, errorDetails: String = String()) { + fun show( + context: Context, + errorTitle: Int, + errorMessage: Int, + errorDetails: String = String() + ) { // prepare dialog builder - val builder: MaterialAlertDialogBuilder = MaterialAlertDialogBuilder(context, R.style.AlertDialogTheme) + val builder: MaterialAlertDialogBuilder = + MaterialAlertDialogBuilder(context, R.style.AlertDialogTheme) // set title builder.setTitle(context.getString(errorTitle)) @@ -81,12 +87,14 @@ object ErrorDialog { errorMessageView.text = context.getString(errorMessage) // add okay button - builder.setPositiveButton(R.string.dialog_generic_button_okay, DialogInterface.OnClickListener { _, _ -> - // listen for click on okay button - // do nothing - }) + builder.setPositiveButton( + R.string.dialog_generic_button_okay, + DialogInterface.OnClickListener { _, _ -> + // listen for click on okay button + // do nothing + }) // display error dialog builder.show() } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt b/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt index 0e700a5..81b2219 100644 --- a/app/src/main/java/org/y20k/trackbook/dialogs/RenameTrackDialog.kt +++ b/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 { @@ -78,4 +78,4 @@ class RenameTrackDialog (private var renameTrackListener: RenameTrackListener) { builder.show() } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/dialogs/YesNoDialog.kt b/app/src/main/java/org/y20k/trackbook/dialogs/YesNoDialog.kt index 83c391e..7999d65 100644 --- a/app/src/main/java/org/y20k/trackbook/dialogs/YesNoDialog.kt +++ b/app/src/main/java/org/y20k/trackbook/dialogs/YesNoDialog.kt @@ -24,7 +24,7 @@ import org.y20k.trackbook.helpers.LogHelper /* * YesNoDialog class */ -class YesNoDialog (private var yesNoDialogListener: YesNoDialogListener) { +class YesNoDialog(private var yesNoDialogListener: YesNoDialogListener) { /* Interface used to communicate back to activity */ interface YesNoDialogListener { @@ -37,35 +37,46 @@ class YesNoDialog (private var yesNoDialogListener: YesNoDialogListener) { private val TAG = LogHelper.makeLogTag(YesNoDialog::class.java.simpleName) - - - /* Construct and show dialog - variant: message from string */ - fun show(context: Context, - type: Int, - title: Int = Keys.EMPTY_STRING_RESOURCE, - message: Int, - yesButton: Int = R.string.dialog_yes_no_positive_button_default, - noButton: Int = R.string.dialog_generic_button_cancel, - payload: Int = Keys.DIALOG_EMPTY_PAYLOAD_INT, - payloadString: String = Keys.DIALOG_EMPTY_PAYLOAD_STRING) { + fun show( + context: Context, + type: Int, + title: Int = Keys.EMPTY_STRING_RESOURCE, + message: Int, + yesButton: Int = R.string.dialog_yes_no_positive_button_default, + noButton: Int = R.string.dialog_generic_button_cancel, + payload: Int = Keys.DIALOG_EMPTY_PAYLOAD_INT, + payloadString: String = Keys.DIALOG_EMPTY_PAYLOAD_STRING + ) { // extract string from message resource and feed into main show method - show(context, type, title, context.getString(message), yesButton, noButton, payload, payloadString) + show( + context, + type, + title, + context.getString(message), + yesButton, + noButton, + payload, + payloadString + ) } /* Construct and show dialog */ - fun show(context: Context, - type: Int, - title: Int = Keys.EMPTY_STRING_RESOURCE, - messageString: String, - yesButton: Int = R.string.dialog_yes_no_positive_button_default, - noButton: Int = R.string.dialog_generic_button_cancel, - payload: Int = Keys.DIALOG_EMPTY_PAYLOAD_INT, - payloadString: String = Keys.DIALOG_EMPTY_PAYLOAD_STRING) { + fun show( + context: Context, + type: Int, + title: Int = Keys.EMPTY_STRING_RESOURCE, + messageString: String, + yesButton: Int = R.string.dialog_yes_no_positive_button_default, + noButton: Int = R.string.dialog_generic_button_cancel, + payload: Int = Keys.DIALOG_EMPTY_PAYLOAD_INT, + payloadString: String = Keys.DIALOG_EMPTY_PAYLOAD_STRING + ) { // prepare dialog builder - val builder: MaterialAlertDialogBuilder = MaterialAlertDialogBuilder(context, R.style.AlertDialogTheme) + val builder: MaterialAlertDialogBuilder = + MaterialAlertDialogBuilder(context, R.style.AlertDialogTheme) // set title and message builder.setMessage(messageString) @@ -87,11 +98,11 @@ class YesNoDialog (private var yesNoDialogListener: YesNoDialogListener) { } // handle outside-click as "no" - builder.setOnCancelListener(){ + builder.setOnCancelListener() { yesNoDialogListener.onYesNoDialog(type, false, payload, payloadString) } // display dialog builder.show() } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/extensions/SharedPreferencesExt.kt b/app/src/main/java/org/y20k/trackbook/extensions/SharedPreferencesExt.kt index b4836eb..3bde38c 100644 --- a/app/src/main/java/org/y20k/trackbook/extensions/SharedPreferencesExt.kt +++ b/app/src/main/java/org/y20k/trackbook/extensions/SharedPreferencesExt.kt @@ -22,8 +22,10 @@ import android.content.SharedPreferences /* Puts a Double value in SharedPreferences */ -fun SharedPreferences.Editor.putDouble(key: String, double: Double) = putLong(key, java.lang.Double.doubleToRawLongBits(double)) +fun SharedPreferences.Editor.putDouble(key: String, double: Double) = + putLong(key, java.lang.Double.doubleToRawLongBits(double)) /* gets a Double value from SharedPreferences */ -fun SharedPreferences.getDouble(key: String, default: Double) = java.lang.Double.longBitsToDouble(getLong(key, java.lang.Double.doubleToRawLongBits(default))) \ No newline at end of file +fun SharedPreferences.getDouble(key: String, default: Double) = + java.lang.Double.longBitsToDouble(getLong(key, java.lang.Double.doubleToRawLongBits(default))) diff --git a/app/src/main/java/org/y20k/trackbook/helpers/AppThemeHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/AppThemeHelper.kt index 9500951..160e856 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/AppThemeHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/AppThemeHelper.kt @@ -99,6 +99,4 @@ object AppThemeHelper { } - - -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/helpers/DateTimeHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/DateTimeHelper.kt index 3cadcae..ab92bcf 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/DateTimeHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/DateTimeHelper.kt @@ -36,8 +36,10 @@ object DateTimeHelper { fun convertToReadableTime(context: Context, milliseconds: Long): String { var timeString: String = String() val hours: Long = TimeUnit.MILLISECONDS.toHours(milliseconds) - val minutes: Long = TimeUnit.MILLISECONDS.toMinutes(milliseconds) % TimeUnit.HOURS.toMinutes(1) - val seconds: Long = TimeUnit.MILLISECONDS.toSeconds(milliseconds) % TimeUnit.MINUTES.toSeconds(1) + val minutes: Long = + TimeUnit.MILLISECONDS.toMinutes(milliseconds) % TimeUnit.HOURS.toMinutes(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) @@ -70,13 +72,19 @@ object DateTimeHelper { /* Creates a readable string date and time - used in the UI */ - fun convertToReadableDateAndTime(date: 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)}" + fun convertToReadableDateAndTime( + date: 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: Long = 0L // two data points needed to calculate time difference if (previousLocation != null) { @@ -87,4 +95,4 @@ object DateTimeHelper { } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/helpers/FileHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/FileHelper.kt index 647ff05..6417526 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/FileHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/FileHelper.kt @@ -48,10 +48,10 @@ object FileHelper { /* Return an InputStream for given Uri */ fun getTextFileStream(context: Context, uri: Uri): InputStream? { - var stream : InputStream? = null + var stream: InputStream? = null try { stream = context.contentResolver.openInputStream(uri) - } catch (e : Exception) { + } catch (e: Exception) { e.printStackTrace() } return stream @@ -154,16 +154,19 @@ object FileHelper { /* Creates Uri for Gpx file of a track */ - fun getGpxFileUri(context: Context, track: Track): Uri = File(context.getExternalFilesDir(Keys.FOLDER_GPX), getGpxFileName(track)).toUri() + fun getGpxFileUri(context: Context, track: Track): Uri = + File(context.getExternalFilesDir(Keys.FOLDER_GPX), getGpxFileName(track)).toUri() /* Creates file name for Gpx file of a track */ - fun getGpxFileName(track: Track): String = DateTimeHelper.convertToSortableDateString(track.recordingStart) + Keys.GPX_FILE_EXTENSION + fun getGpxFileName(track: Track): String = + DateTimeHelper.convertToSortableDateString(track.recordingStart) + Keys.GPX_FILE_EXTENSION /* Creates Uri for json track file */ fun getTrackFileUri(context: Context, track: Track): Uri { - val fileName: String = DateTimeHelper.convertToSortableDateString(track.recordingStart) + Keys.TRACKBOOK_FILE_EXTENSION + val fileName: String = + DateTimeHelper.convertToSortableDateString(track.recordingStart) + Keys.TRACKBOOK_FILE_EXTENSION return File(context.getExternalFilesDir(Keys.FOLDER_TRACKS), fileName).toUri() } @@ -175,7 +178,11 @@ object FileHelper { /* Suspend function: Wrapper for saveTracklist */ - suspend fun addTrackAndSaveTracklistSuspended(context: Context, track: Track, modificationDate: Date = track.recordingStop) { + suspend fun addTrackAndSaveTracklistSuspended( + context: Context, + track: Track, + modificationDate: Date = track.recordingStop + ) { return suspendCoroutine { cont -> val tracklist: Tracklist = readTracklist(context) tracklist.tracklistElements.add(track.toTracklistElement(context)) @@ -193,7 +200,11 @@ object FileHelper { /* Suspend function: Wrapper for saveTracklist */ - suspend fun saveTracklistSuspended(context: Context, tracklist: Tracklist, modificationDate: Date) { + suspend fun saveTracklistSuspended( + context: Context, + tracklist: Tracklist, + modificationDate: Date + ) { return suspendCoroutine { cont -> cont.resume(saveTracklist(context, tracklist, modificationDate)) } @@ -217,7 +228,11 @@ object FileHelper { /* Suspend function: Wrapper for deleteTrack */ - suspend fun deleteTrackSuspended(context: Context, position: Int, tracklist: Tracklist): Tracklist { + suspend fun deleteTrackSuspended( + context: Context, + position: Int, + tracklist: Tracklist + ): Tracklist { return suspendCoroutine { cont -> cont.resume(deleteTrack(context, position, tracklist)) } @@ -240,14 +255,19 @@ object FileHelper { /* Suspend function: Wrapper for readTracklist */ suspend fun readTracklistSuspended(context: Context): Tracklist { - return suspendCoroutine {cont -> + return suspendCoroutine { cont -> cont.resume(readTracklist(context)) } } /* Suspend function: Wrapper for copyFile */ - suspend fun saveCopyOfFileSuspended(context: Context, originalFileUri: Uri, targetFileUri: Uri, deleteOriginal: Boolean = false) { + suspend fun saveCopyOfFileSuspended( + context: Context, + originalFileUri: Uri, + targetFileUri: Uri, + deleteOriginal: Boolean = false + ) { return suspendCoroutine { cont -> cont.resume(copyFile(context, originalFileUri, targetFileUri, deleteOriginal)) } @@ -304,7 +324,6 @@ object FileHelper { } - /* Renames track */ private fun renameTrack(context: Context, track: Track, newName: String) { // search track in tracklist @@ -329,13 +348,17 @@ object FileHelper { /* Deletes multiple tracks */ - private fun deleteTracks(context: Context, tracklistElements: MutableList, tracklist: Tracklist): Tracklist { + private fun deleteTracks( + context: Context, + tracklistElements: MutableList, + tracklist: Tracklist + ): Tracklist { tracklistElements.forEach { tracklistElement -> // delete track files tracklistElement.trackUriString.toUri().toFile().delete() tracklistElement.gpxUriString.toUri().toFile().delete() } - tracklist.tracklistElements.removeAll{ tracklistElements.contains(it) } + tracklist.tracklistElements.removeAll { tracklistElements.contains(it) } saveTracklist(context, tracklist, GregorianCalendar.getInstance().time) return tracklist } @@ -348,14 +371,23 @@ object FileHelper { tracklistElement.trackUriString.toUri().toFile().delete() tracklistElement.gpxUriString.toUri().toFile().delete() // remove track element from list - tracklist.tracklistElements.removeIf { TrackHelper.getTrackId(it) == TrackHelper.getTrackId(tracklistElement) } + tracklist.tracklistElements.removeIf { + TrackHelper.getTrackId(it) == TrackHelper.getTrackId( + tracklistElement + ) + } saveTracklist(context, tracklist, GregorianCalendar.getInstance().time) return tracklist } /* Copies file to specified target */ - private fun copyFile(context: Context, originalFileUri: Uri, targetFileUri: Uri, deleteOriginal: Boolean = false) { + private fun copyFile( + context: Context, + originalFileUri: Uri, + targetFileUri: Uri, + deleteOriginal: Boolean = false + ) { val inputStream = context.contentResolver.openInputStream(originalFileUri) val outputStream = context.contentResolver.openOutputStream(targetFileUri) if (outputStream != null) { @@ -389,7 +421,6 @@ object FileHelper { } - /* Converts byte value into a human readable format */ // Source: https://programming.guide/java/formatting-byte-size-to-human-readable-format.html fun getReadableByteCount(bytes: Long, si: Boolean = true): String { @@ -430,7 +461,8 @@ object FileHelper { val builder: StringBuilder = StringBuilder() reader.forEachLine { builder.append(it) - builder.append("\n") } + builder.append("\n") + } stream.close() return builder.toString() } @@ -444,8 +476,14 @@ object FileHelper { /* Writes given bitmap as image file to storage */ - private fun writeImageFile(context: Context, bitmap: Bitmap, file: File, format: Bitmap.CompressFormat = Bitmap.CompressFormat.JPEG, quality: Int = 75) { - if (file.exists()) file.delete () + private fun writeImageFile( + context: Context, + bitmap: Bitmap, + file: File, + format: Bitmap.CompressFormat = Bitmap.CompressFormat.JPEG, + quality: Int = 75 + ) { + if (file.exists()) file.delete() try { val out = FileOutputStream(file) bitmap.compress(format, quality, out) @@ -456,4 +494,4 @@ object FileHelper { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/helpers/LengthUnitHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/LengthUnitHelper.kt index d2f6e4c..7c11a73 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/LengthUnitHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/LengthUnitHelper.kt @@ -96,7 +96,12 @@ object LengthUnitHelper { /* Converts for the given unit System distance and duration values to a readable velocity string */ - fun convertToVelocityString(trackDuration: Long, trackRecordingPause: Long, trackLength: Float, useImperialUnits: Boolean = false) : String { + fun convertToVelocityString( + trackDuration: Long, + trackRecordingPause: Long, + trackLength: Float, + useImperialUnits: Boolean = false + ): String { var speed: String = "0" // duration minus pause in seconds @@ -104,7 +109,8 @@ object LengthUnitHelper { if (duration > 0L) { // speed in km/h / mph - val velocity: Double = convertMetersPerSecond((trackLength / duration), useImperialUnits) + val velocity: Double = + convertMetersPerSecond((trackLength / duration), useImperialUnits) // create readable speed string var bd: BigDecimal = BigDecimal.valueOf(velocity) bd = bd.setScale(1, RoundingMode.HALF_UP) @@ -130,4 +136,4 @@ object LengthUnitHelper { } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/helpers/LocationHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/LocationHelper.kt index 3a6584a..3e164d0 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/LocationHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/LocationHelper.kt @@ -62,10 +62,19 @@ object LocationHelper { // get last location that Trackbook has stored var lastKnownLocation: Location = PreferencesHelper.loadCurrentBestLocation(context) // try to get the last location the system has stored - it is probably more recent - if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { - val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager - val lastKnownLocationGps: Location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER) ?: lastKnownLocation - val lastKnownLocationNetwork: Location = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER) ?: lastKnownLocation + if (ContextCompat.checkSelfPermission( + context, + Manifest.permission.ACCESS_FINE_LOCATION + ) == PackageManager.PERMISSION_GRANTED + ) { + val locationManager = + context.getSystemService(Context.LOCATION_SERVICE) as LocationManager + val lastKnownLocationGps: Location = + locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER) + ?: lastKnownLocation + val lastKnownLocationNetwork: Location = + locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER) + ?: lastKnownLocation when (isBetterLocation(lastKnownLocationGps, lastKnownLocationNetwork)) { true -> lastKnownLocation = lastKnownLocationGps false -> lastKnownLocation = lastKnownLocationNetwork @@ -87,7 +96,7 @@ object LocationHelper { // check whether the new location fix is newer or older val timeDelta: Long = location.time - currentBestLocation.time val isSignificantlyNewer: Boolean = timeDelta > Keys.SIGNIFICANT_TIME_DIFFERENCE - val isSignificantlyOlder:Boolean = timeDelta < -Keys.SIGNIFICANT_TIME_DIFFERENCE + val isSignificantlyOlder: Boolean = timeDelta < -Keys.SIGNIFICANT_TIME_DIFFERENCE when { // if it's been more than two minutes since the current location, use the new location because the user has likely moved @@ -136,7 +145,6 @@ object LocationHelper { } - /* Checks if given location is new */ fun isRecentEnough(location: Location): Boolean { val locationAge: Long = SystemClock.elapsedRealtimeNanos() - location.elapsedRealtimeNanos @@ -148,8 +156,10 @@ object LocationHelper { fun isAccurateEnough(location: Location, locationAccuracyThreshold: Int): Boolean { val isAccurate: Boolean when (location.provider) { - LocationManager.GPS_PROVIDER -> isAccurate = location.accuracy < locationAccuracyThreshold - else -> isAccurate = location.accuracy < locationAccuracyThreshold + 10 // a bit more relaxed when location comes from network provider + LocationManager.GPS_PROVIDER -> isAccurate = + location.accuracy < locationAccuracyThreshold + else -> isAccurate = + location.accuracy < locationAccuracyThreshold + 10 // a bit more relaxed when location comes from network provider } return isAccurate } @@ -158,14 +168,25 @@ object LocationHelper { /* Checks if the first location of track is plausible */ fun isFirstLocationPlausible(secondLocation: Location, track: Track): Boolean { // speed in km/h - val speed: Double = calculateSpeed(firstLocation = track.wayPoints[0].toLocation(), secondLocation = secondLocation, firstTimestamp = track.recordingStart.time, secondTimestamp = GregorianCalendar.getInstance().time.time) + val speed: Double = calculateSpeed( + firstLocation = track.wayPoints[0].toLocation(), + secondLocation = secondLocation, + firstTimestamp = track.recordingStart.time, + secondTimestamp = GregorianCalendar.getInstance().time.time + ) // plausible = speed under 250 km/h return speed < Keys.IMPLAUSIBLE_TRACK_START_SPEED } /* Calculates speed */ - private fun calculateSpeed(firstLocation: Location, secondLocation: Location, firstTimestamp: Long, secondTimestamp: Long, useImperial: Boolean = false): Double { + private fun calculateSpeed( + firstLocation: Location, + secondLocation: Location, + firstTimestamp: Long, + secondTimestamp: Long, + useImperial: Boolean = false + ): Double { // time difference in seconds val timeDifference: Long = (secondTimestamp - firstTimestamp) / 1000L // distance in meters @@ -194,7 +215,7 @@ object LocationHelper { /* Calculates distance in meters between two locations */ - fun calculateDistance(previousLocation: Location?, location: Location): Float { + fun calculateDistance(previousLocation: Location?, location: Location): Float { var distance: Float = 0f // two data points needed to calculate distance if (previousLocation != null) { @@ -206,20 +227,26 @@ object LocationHelper { /* Calculate elevation differences */ - fun calculateElevationDifferences(previousLocation: Location?, location: Location, track: Track): Pair { + fun calculateElevationDifferences( + previousLocation: Location?, + location: Location, + track: Track + ): Pair { // store current values var positiveElevation: Double = track.positiveElevation var negativeElevation: Double = track.negativeElevation if (previousLocation != null) { // factor is bigger than 1 if the time stamp difference is larger than the movement recording interval - val timeDifferenceFactor: Long = (location.time - previousLocation.time) / Keys.ADD_WAYPOINT_TO_TRACK_INTERVAL + val timeDifferenceFactor: Long = + (location.time - previousLocation.time) / Keys.ADD_WAYPOINT_TO_TRACK_INTERVAL // get elevation difference and sum it up val altitudeDifference: Double = location.altitude - previousLocation.altitude if (altitudeDifference > 0 && altitudeDifference < Keys.ALTITUDE_MEASUREMENT_ERROR_THRESHOLD * timeDifferenceFactor && location.altitude != Keys.DEFAULT_ALTITUDE) { positiveElevation = track.positiveElevation + altitudeDifference // upwards movement } if (altitudeDifference < 0 && altitudeDifference > -Keys.ALTITUDE_MEASUREMENT_ERROR_THRESHOLD * timeDifferenceFactor && location.altitude != Keys.DEFAULT_ALTITUDE) { - negativeElevation = track.negativeElevation + altitudeDifference // downwards movement + negativeElevation = + track.negativeElevation + altitudeDifference // downwards movement } } return Pair(positiveElevation, negativeElevation) @@ -234,4 +261,4 @@ object LocationHelper { } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/helpers/MapOverlay.kt b/app/src/main/java/org/y20k/trackbook/helpers/MapOverlay.kt index 8fcb595..02c552e 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/MapOverlay.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/MapOverlay.kt @@ -38,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 { @@ -51,7 +51,11 @@ class MapOverlay (private var markerListener: MarkerListener) { /* Creates icon overlay for current position (used in MapFragment) */ - fun createMyLocationOverlay(context: Context, location: Location, trackingState: Int): ItemizedIconOverlay { + fun createMyLocationOverlay( + context: Context, + location: Location, + trackingState: Int + ): ItemizedIconOverlay { val overlayItems = ArrayList() val locationIsOld = LocationHelper.isOldLocation(location) @@ -62,21 +66,38 @@ class MapOverlay (private var markerListener: MarkerListener) { // CASE: Tracking active Keys.STATE_TRACKING_ACTIVE -> { when (locationIsOld) { - true -> newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_location_red_grey_24dp)!! - false -> newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_location_red_24dp)!! + true -> newMarker = ContextCompat.getDrawable( + context, + R.drawable.ic_marker_location_red_grey_24dp + )!! + false -> newMarker = + ContextCompat.getDrawable(context, R.drawable.ic_marker_location_red_24dp)!! } } // CASE. Tracking is NOT active else -> { when (locationIsOld) { - true -> newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_location_blue_grey_24dp)!! - false -> newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_location_blue_24dp)!! + true -> newMarker = ContextCompat.getDrawable( + context, + R.drawable.ic_marker_location_blue_grey_24dp + )!! + false -> newMarker = ContextCompat.getDrawable( + context, + R.drawable.ic_marker_location_blue_24dp + )!! } } } // add marker to list of overlay items - val overlayItem = createOverlayItem(context, location.latitude, location.longitude, location.accuracy, location.provider, location.time) + val overlayItem = createOverlayItem( + context, + location.latitude, + location.longitude, + location.accuracy, + location.provider, + location.time + ) overlayItem.setMarker(newMarker) overlayItems.add(overlayItem) @@ -86,7 +107,11 @@ class MapOverlay (private var markerListener: MarkerListener) { /* Creates icon overlay for track */ - fun createTrackOverlay(context: Context, track: Track, trackingState: Int): ItemizedIconOverlay { + fun createTrackOverlay( + context: Context, + track: Track, + trackingState: Int + ): ItemizedIconOverlay { val overlayItems = ArrayList() val wayPoints = track.wayPoints @@ -100,27 +125,48 @@ class MapOverlay (private var markerListener: MarkerListener) { // CASE: Recording is active Keys.STATE_TRACKING_ACTIVE -> { if (wayPoint.starred) { - newMarker = ContextCompat.getDrawable(context, R.drawable.ic_star_red_24dp)!! + newMarker = + 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)!! + newMarker = ContextCompat.getDrawable( + context, + R.drawable.ic_marker_track_location_grey_24dp + )!! } else { - newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_track_location_red_24dp)!! + newMarker = ContextCompat.getDrawable( + context, + R.drawable.ic_marker_track_location_red_24dp + )!! } } // CASE: Recording is paused/stopped else -> { if (wayPoint.starred) { - newMarker = ContextCompat.getDrawable(context, R.drawable.ic_star_blue_24dp)!! + newMarker = + 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)!! + newMarker = ContextCompat.getDrawable( + context, + R.drawable.ic_marker_track_location_grey_24dp + )!! } else { - newMarker = ContextCompat.getDrawable(context, R.drawable.ic_marker_track_location_blue_24dp)!! + newMarker = ContextCompat.getDrawable( + context, + R.drawable.ic_marker_track_location_blue_24dp + )!! } } } // create overlay item and add to list of overlay items - val overlayItem = createOverlayItem(context, wayPoint.latitude, wayPoint.longitude, wayPoint.accuracy, wayPoint.provider, wayPoint.time) + val overlayItem = createOverlayItem( + context, + wayPoint.latitude, + wayPoint.longitude, + wayPoint.accuracy, + wayPoint.provider, + wayPoint.time + ) overlayItem.setMarker(newMarker) overlayItems.add(overlayItem) } @@ -131,23 +177,45 @@ class MapOverlay (private var markerListener: MarkerListener) { /* Creates a marker overlay item */ - private fun createOverlayItem(context: Context, latitude: Double, longitude: Double, accuracy: Float, provider: String, time: Long): OverlayItem { - val title: String = "${context.getString(R.string.marker_description_time)}: ${SimpleDateFormat.getTimeInstance(SimpleDateFormat.MEDIUM, Locale.getDefault()).format(time)}" + private fun createOverlayItem( + context: Context, + latitude: Double, + longitude: Double, + accuracy: Float, + provider: String, + time: Long + ): OverlayItem { + val title: String = + "${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: 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})" + 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})" val position: GeoPoint = GeoPoint(latitude, longitude) return OverlayItem(title, description, position) } /* Creates an overlay */ - private fun createOverlay(context: Context, overlayItems: ArrayList): ItemizedIconOverlay { + private fun createOverlay( + context: Context, + overlayItems: ArrayList + ): ItemizedIconOverlay { return ItemizedIconOverlay(context, overlayItems, object : ItemizedIconOverlay.OnItemGestureListener { 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 v.vibrate(50) @@ -157,4 +225,4 @@ class MapOverlay (private var markerListener: MarkerListener) { }) } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt index 23157bc..99398a2 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt @@ -41,11 +41,17 @@ class NotificationHelper(private val trackerService: TrackerService) { /* Main class variables */ - private val notificationManager: NotificationManager = trackerService.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + private val notificationManager: NotificationManager = + trackerService.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager /* Creates notification */ - fun createNotification(trackingState: Int, trackLength: Float, duration: Long, useImperial: Boolean): Notification { + fun createNotification( + trackingState: Int, + trackLength: Float, + duration: Long, + useImperial: Boolean + ): Notification { // create notification channel if necessary if (shouldCreateNotificationChannel()) { @@ -53,7 +59,8 @@ class NotificationHelper(private val trackerService: TrackerService) { } // Build notification - val builder = NotificationCompat.Builder(trackerService, Keys.NOTIFICATION_CHANNEL_RECORDING) + val builder = + NotificationCompat.Builder(trackerService, Keys.NOTIFICATION_CHANNEL_RECORDING) builder.setContentIntent(showActionPendingIntent) builder.setSmallIcon(R.drawable.ic_notification_icon_small_24dp) builder.setContentText(getContentString(trackerService, duration, trackLength, useImperial)) @@ -63,13 +70,23 @@ class NotificationHelper(private val trackerService: TrackerService) { Keys.STATE_TRACKING_ACTIVE -> { builder.setContentTitle(trackerService.getString(R.string.notification_title_trackbook_running)) builder.addAction(stopAction) - builder.setLargeIcon(AppCompatResources.getDrawable(trackerService, R.drawable.ic_notification_icon_large_tracking_active_48dp)!!.toBitmap()) + builder.setLargeIcon( + AppCompatResources.getDrawable( + trackerService, + R.drawable.ic_notification_icon_large_tracking_active_48dp + )!!.toBitmap() + ) } else -> { builder.setContentTitle(trackerService.getString(R.string.notification_title_trackbook_not_running)) builder.addAction(resumeAction) builder.addAction(showAction) - builder.setLargeIcon(AppCompatResources.getDrawable(trackerService, R.drawable.ic_notification_icon_large_tracking_stopped_48dp)!!.toBitmap()) + builder.setLargeIcon( + AppCompatResources.getDrawable( + trackerService, + R.drawable.ic_notification_icon_large_tracking_stopped_48dp + )!!.toBitmap() + ) } } @@ -79,56 +96,77 @@ class NotificationHelper(private val trackerService: TrackerService) { /* Build context text for notification builder */ - private fun getContentString(context: Context, duration: Long, trackLength: Float, useImperial: Boolean): String { - return "${LengthUnitHelper.convertDistanceToString(trackLength, useImperial)} • ${DateTimeHelper.convertToReadableTime(context, duration)}" + private fun getContentString( + context: Context, + duration: Long, + trackLength: Float, + useImperial: Boolean + ): String { + return "${LengthUnitHelper.convertDistanceToString( + trackLength, + useImperial + )} • ${DateTimeHelper.convertToReadableTime(context, duration)}" } /* Checks if notification channel should be created */ - private fun shouldCreateNotificationChannel() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !nowPlayingChannelExists() + private fun shouldCreateNotificationChannel() = + Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !nowPlayingChannelExists() /* Checks if notification channel exists */ @RequiresApi(Build.VERSION_CODES.O) - private fun nowPlayingChannelExists() = notificationManager.getNotificationChannel(Keys.NOTIFICATION_CHANNEL_RECORDING) != null + private fun nowPlayingChannelExists() = + notificationManager.getNotificationChannel(Keys.NOTIFICATION_CHANNEL_RECORDING) != null /* Create a notification channel */ @RequiresApi(Build.VERSION_CODES.O) private fun createNotificationChannel() { - val notificationChannel = NotificationChannel(Keys.NOTIFICATION_CHANNEL_RECORDING, + val notificationChannel = NotificationChannel( + Keys.NOTIFICATION_CHANNEL_RECORDING, trackerService.getString(R.string.notification_channel_recording_name), - NotificationManager.IMPORTANCE_LOW) - .apply { description = trackerService.getString(R.string.notification_channel_recording_description) } + NotificationManager.IMPORTANCE_LOW + ) + .apply { + description = + trackerService.getString(R.string.notification_channel_recording_description) + } notificationManager.createNotificationChannel(notificationChannel) } /* Notification pending intents */ private val stopActionPendingIntent = PendingIntent.getService( - trackerService,14, - Intent(trackerService, TrackerService::class.java).setAction(Keys.ACTION_STOP),0) + trackerService, 14, + Intent(trackerService, TrackerService::class.java).setAction(Keys.ACTION_STOP), 0 + ) private val resumeActionPendingIntent = PendingIntent.getService( trackerService, 16, - Intent(trackerService, TrackerService::class.java).setAction(Keys.ACTION_RESUME),0) - private val showActionPendingIntent: PendingIntent? = TaskStackBuilder.create(trackerService).run { - addNextIntentWithParentStack(Intent(trackerService, MainActivity::class.java)) - getPendingIntent(10, PendingIntent.FLAG_UPDATE_CURRENT) - } + Intent(trackerService, TrackerService::class.java).setAction(Keys.ACTION_RESUME), 0 + ) + private val showActionPendingIntent: PendingIntent? = + TaskStackBuilder.create(trackerService).run { + addNextIntentWithParentStack(Intent(trackerService, MainActivity::class.java)) + getPendingIntent(10, PendingIntent.FLAG_UPDATE_CURRENT) + } /* Notification actions */ private val stopAction = NotificationCompat.Action( R.drawable.ic_notification_action_stop_24dp, trackerService.getString(R.string.notification_stop), - stopActionPendingIntent) + stopActionPendingIntent + ) private val resumeAction = NotificationCompat.Action( R.drawable.ic_notification_action_resume_36dp, trackerService.getString(R.string.notification_resume), - resumeActionPendingIntent) + resumeActionPendingIntent + ) private val showAction = NotificationCompat.Action( R.drawable.ic_notification_action_show_36dp, trackerService.getString(R.string.notification_show), - showActionPendingIntent) + showActionPendingIntent + ) -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/helpers/PreferencesHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/PreferencesHelper.kt index 40bba24..e7d442c 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/PreferencesHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/PreferencesHelper.kt @@ -80,7 +80,10 @@ object PreferencesHelper { // get preferences val settings = PreferenceManager.getDefaultSharedPreferences(context) // load length unit system - return settings.getBoolean(Keys.PREF_USE_IMPERIAL_UNITS, LengthUnitHelper.useImperialUnits()) + return settings.getBoolean( + Keys.PREF_USE_IMPERIAL_UNITS, + LengthUnitHelper.useImperialUnits() + ) } @@ -97,7 +100,10 @@ object PreferencesHelper { // get preferences val settings = PreferenceManager.getDefaultSharedPreferences(context) // load tracking state - return settings.getInt(Keys.PREF_LOCATION_ACCURACY_THRESHOLD, Keys.DEFAULT_THRESHOLD_LOCATION_ACCURACY) + return settings.getInt( + Keys.PREF_LOCATION_ACCURACY_THRESHOLD, + Keys.DEFAULT_THRESHOLD_LOCATION_ACCURACY + ) } @@ -105,15 +111,23 @@ object PreferencesHelper { fun loadCurrentBestLocation(context: Context): Location { // get preferences val settings = PreferenceManager.getDefaultSharedPreferences(context) - val provider: String = settings.getString(Keys.PREF_CURRENT_BEST_LOCATION_PROVIDER, LocationManager.NETWORK_PROVIDER) ?: LocationManager.NETWORK_PROVIDER + val provider: String = settings.getString( + Keys.PREF_CURRENT_BEST_LOCATION_PROVIDER, + LocationManager.NETWORK_PROVIDER + ) ?: LocationManager.NETWORK_PROVIDER // create location val currentBestLocation: Location = Location(provider) // load location attributes - currentBestLocation.latitude = settings.getDouble(Keys.PREF_CURRENT_BEST_LOCATION_LATITUDE, Keys.DEFAULT_LATITUDE) - currentBestLocation.longitude = settings.getDouble(Keys.PREF_CURRENT_BEST_LOCATION_LONGITUDE, Keys.DEFAULT_LONGITUDE) - currentBestLocation.accuracy = settings.getFloat(Keys.PREF_CURRENT_BEST_LOCATION_ACCURACY, Keys.DEFAULT_ACCURACY) - currentBestLocation.altitude = settings.getDouble(Keys.PREF_CURRENT_BEST_LOCATION_ALTITUDE, Keys.DEFAULT_ALTITUDE) - currentBestLocation.time = settings.getLong(Keys.PREF_CURRENT_BEST_LOCATION_TIME, Keys.DEFAULT_TIME) + currentBestLocation.latitude = + settings.getDouble(Keys.PREF_CURRENT_BEST_LOCATION_LATITUDE, Keys.DEFAULT_LATITUDE) + currentBestLocation.longitude = + settings.getDouble(Keys.PREF_CURRENT_BEST_LOCATION_LONGITUDE, Keys.DEFAULT_LONGITUDE) + currentBestLocation.accuracy = + settings.getFloat(Keys.PREF_CURRENT_BEST_LOCATION_ACCURACY, Keys.DEFAULT_ACCURACY) + currentBestLocation.altitude = + settings.getDouble(Keys.PREF_CURRENT_BEST_LOCATION_ALTITUDE, Keys.DEFAULT_ALTITUDE) + currentBestLocation.time = + settings.getLong(Keys.PREF_CURRENT_BEST_LOCATION_TIME, Keys.DEFAULT_TIME) return currentBestLocation } @@ -135,7 +149,9 @@ object PreferencesHelper { /* Load currently selected app theme */ fun loadThemeSelection(context: Context): String { - return PreferenceManager.getDefaultSharedPreferences(context).getString(Keys.PREF_THEME_SELECTION, Keys.STATE_THEME_FOLLOW_SYSTEM) ?: Keys.STATE_THEME_FOLLOW_SYSTEM + return PreferenceManager.getDefaultSharedPreferences(context) + .getString(Keys.PREF_THEME_SELECTION, Keys.STATE_THEME_FOLLOW_SYSTEM) + ?: Keys.STATE_THEME_FOLLOW_SYSTEM } @@ -154,4 +170,4 @@ object PreferencesHelper { editor.apply() } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/helpers/TrackHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/TrackHelper.kt index 9e525cc..8724a9e 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/TrackHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/TrackHelper.kt @@ -48,7 +48,13 @@ object TrackHelper { /* Adds given locatiom as waypoint to track */ - fun addWayPointToTrack(context: Context, track: Track, location: Location, locationAccuracyThreshold: Int, resumed: Boolean): Pair { + fun addWayPointToTrack( + context: Context, + track: Track, + location: Location, + locationAccuracyThreshold: Int, + resumed: Boolean + ): Pair { // get previous location val previousLocation: Location? var numberOfWayPoints: Int = track.wayPoints.size @@ -58,7 +64,11 @@ object TrackHelper { previousLocation = null } // CASE: Second location - check if first location was plausible & remove implausible location - else if (numberOfWayPoints == 1 && !LocationHelper.isFirstLocationPlausible(location, track)) { + else if (numberOfWayPoints == 1 && !LocationHelper.isFirstLocationPlausible( + location, + track + ) + ) { previousLocation = null numberOfWayPoints = 0 track.wayPoints.removeAt(0) @@ -76,8 +86,8 @@ object TrackHelper { // add only if recent and accurate and different val shouldBeAdded: Boolean = (LocationHelper.isRecentEnough(location) && - LocationHelper.isAccurateEnough(location, locationAccuracyThreshold) && - LocationHelper.isDifferentEnough(previousLocation, location)) + LocationHelper.isAccurateEnough(location, locationAccuracyThreshold) && + LocationHelper.isDifferentEnough(previousLocation, location)) // // Debugging for shouldBeAdded - remove for production // val recentEnough: Boolean = LocationHelper.isRecentEnough(location) @@ -95,7 +105,8 @@ object TrackHelper { if (shouldBeAdded) { // update distance (do not update if resumed -> we do not want to add values calculated during a recording pause) if (!resumed) { - track.length = track.length + LocationHelper.calculateDistance(previousLocation, location) + track.length = + track.length + LocationHelper.calculateDistance(previousLocation, location) } if (location.altitude != 0.0) { @@ -105,12 +116,23 @@ object TrackHelper { track.minAltitude = location.altitude } else { // calculate elevation values (upwards / downwards movements) - val elevationDifferences: Pair = LocationHelper.calculateElevationDifferences(previousLocation, location, track) + val elevationDifferences: Pair = + LocationHelper.calculateElevationDifferences( + previousLocation, + location, + track + ) // check if any differences were calculated - if (elevationDifferences != Pair(track.positiveElevation, track.negativeElevation)) { + if (elevationDifferences != Pair( + track.positiveElevation, + track.negativeElevation + ) + ) { // update altitude values - if (location.altitude > track.maxAltitude) track.maxAltitude = location.altitude - if (location.altitude < track.minAltitude) track.minAltitude = location.altitude + if (location.altitude > track.maxAltitude) track.maxAltitude = + location.altitude + if (location.altitude < track.minAltitude) track.minAltitude = + location.altitude // update elevation values (do not update if resumed -> we do not want to add values calculated during a recording pause) if (!resumed) { track.positiveElevation = elevationDifferences.first @@ -122,7 +144,8 @@ object TrackHelper { // toggle stop over status, if necessary if (track.wayPoints.size < 0) { - track.wayPoints[track.wayPoints.size - 1].isStopOver = LocationHelper.isStopOver(previousLocation, location) + track.wayPoints[track.wayPoints.size - 1].isStopOver = + LocationHelper.isStopOver(previousLocation, location) } // save number of satellites @@ -139,7 +162,18 @@ object TrackHelper { track.longitude = location.longitude // add location as new waypoint - track.wayPoints.add(WayPoint(provider = location.provider, latitude = location.latitude, longitude = location.longitude, altitude = location.altitude, accuracy = location.accuracy, time = location.time, distanceToStartingPoint = track.length, numberSatellites = numberOfSatellites)) + track.wayPoints.add( + WayPoint( + provider = location.provider, + latitude = location.latitude, + longitude = location.longitude, + altitude = location.altitude, + accuracy = location.accuracy, + time = location.time, + distanceToStartingPoint = track.length, + numberSatellites = numberOfSatellites + ) + ) } return Pair(track, shouldBeAdded) @@ -157,9 +191,9 @@ object TrackHelper { // add header gpxString = "\n" + - "\n" + "\n" // add track gpxString += createGpxTrk(track) @@ -227,12 +261,20 @@ object TrackHelper { if (waypoint.latitude == latitude && waypoint.longitude == longitude) { waypoint.starred = !waypoint.starred when (waypoint.starred) { - true -> Toast.makeText(context, R.string.toast_message_poi_added, Toast.LENGTH_LONG).show() - false -> Toast.makeText(context, R.string.toast_message_poi_removed, Toast.LENGTH_LONG).show() + true -> Toast.makeText( + context, + R.string.toast_message_poi_added, + Toast.LENGTH_LONG + ).show() + false -> Toast.makeText( + context, + R.string.toast_message_poi_removed, + Toast.LENGTH_LONG + ).show() } } } return track } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/helpers/UiHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/UiHelper.kt index 540ecf0..e7bb232 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/UiHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/UiHelper.kt @@ -41,7 +41,14 @@ object UiHelper { /* Sets layout margins for given view in DP */ - fun setViewMargins(context: Context, view: View, left: Int = 0, right: Int = 0, top: Int= 0, bottom: Int = 0) { + fun setViewMargins( + context: Context, + view: View, + left: Int = 0, + right: Int = 0, + top: Int = 0, + bottom: Int = 0 + ) { val scalingFactor: Float = context.resources.displayMetrics.density val l: Int = (left * scalingFactor).toInt() val r: Int = (right * scalingFactor).toInt() @@ -56,7 +63,16 @@ object UiHelper { /* Sets layout margins for given view in percent */ - fun setViewMarginsPercentage(context: Context, view: View, height: Int, width: Int, left: Int = 0, right: Int = 0, top: Int= 0, bottom: Int = 0) { + fun setViewMarginsPercentage( + context: Context, + view: View, + height: Int, + width: Int, + left: Int = 0, + right: Int = 0, + top: Int = 0, + bottom: Int = 0 + ) { val l: Int = ((width / 100.0f) * left).toInt() val r: Int = ((width / 100.0f) * right).toInt() val t: Int = ((height / 100.0f) * top).toInt() @@ -69,28 +85,58 @@ object UiHelper { * Inner class: Callback that detects a left swipe * Credit: https://github.com/kitek/android-rv-swipe-delete/blob/master/app/src/main/java/pl/kitek/rvswipetodelete/SwipeToDeleteCallback.kt */ - abstract class SwipeToDeleteCallback(context: Context): ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) { + abstract class SwipeToDeleteCallback(context: Context) : + ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) { - private val deleteIcon = ContextCompat.getDrawable(context, R.drawable.ic_remove_circle_24dp) + private val deleteIcon = + ContextCompat.getDrawable(context, R.drawable.ic_remove_circle_24dp) private val intrinsicWidth: Int = deleteIcon?.intrinsicWidth ?: 0 private val intrinsicHeight: Int = deleteIcon?.intrinsicHeight ?: 0 private val background: ColorDrawable = ColorDrawable() - private val backgroundColor = context.resources.getColor(R.color.list_card_delete_background, null) - private val clearPaint: Paint = Paint().apply { xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR) } + private val backgroundColor = + context.resources.getColor(R.color.list_card_delete_background, null) + private val clearPaint: Paint = + Paint().apply { xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR) } - override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean { + override fun onMove( + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder, + target: RecyclerView.ViewHolder + ): Boolean { // do nothing return false } - override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) { + override fun onChildDraw( + c: Canvas, + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder, + dX: Float, + dY: Float, + actionState: Int, + isCurrentlyActive: Boolean + ) { val itemView = viewHolder.itemView val itemHeight = itemView.bottom - itemView.top val isCanceled = dX == 0f && !isCurrentlyActive if (isCanceled) { - clearCanvas(c, itemView.right + dX, itemView.top.toFloat(), itemView.right.toFloat(), itemView.bottom.toFloat()) - super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive) + clearCanvas( + c, + itemView.right + dX, + itemView.top.toFloat(), + itemView.right.toFloat(), + itemView.bottom.toFloat() + ) + super.onChildDraw( + c, + recyclerView, + viewHolder, + dX, + dY, + actionState, + isCurrentlyActive + ) return } @@ -126,4 +172,4 @@ object UiHelper { * End of inner class */ -} \ No newline at end of file +} diff --git a/app/src/main/java/org/y20k/trackbook/tracklist/TracklistAdapter.kt b/app/src/main/java/org/y20k/trackbook/tracklist/TracklistAdapter.kt index aace758..fe53b6a 100644 --- a/app/src/main/java/org/y20k/trackbook/tracklist/TracklistAdapter.kt +++ b/app/src/main/java/org/y20k/trackbook/tracklist/TracklistAdapter.kt @@ -39,7 +39,8 @@ import java.util.* /* * TracklistAdapter class */ -class TracklistAdapter(private val fragment: Fragment) : RecyclerView.Adapter() { +class TracklistAdapter(private val fragment: Fragment) : + RecyclerView.Adapter() { /* Define log tag */ private val TAG: String = LogHelper.makeLogTag(TracklistAdapter::class.java) @@ -54,7 +55,7 @@ class TracklistAdapter(private val fragment: Fragment) : RecyclerView.Adapter tracklistElement.date } + tracklist.tracklistElements.sortByDescending { tracklistElement -> tracklistElement.date } } @@ -111,7 +112,8 @@ class TracklistAdapter(private val fragment: Fragment) : RecyclerView.Adapter = async { FileHelper.deleteTrackSuspended(context, position, tracklist) } + val deferred: Deferred = + async { FileHelper.deleteTrackSuspended(context, position, tracklist) } // wait for result and store in tracklist tracklist = deferred.await() notifyItemRemoved(position) @@ -122,7 +124,7 @@ class TracklistAdapter(private val fragment: Fragment) : RecyclerView.Adapter + tracklist.tracklistElements.forEachIndexed { index, tracklistElement -> if (tracklistElement.getTrackId() == trackId) return index } return -1 @@ -143,7 +145,11 @@ class TracklistAdapter(private val fragment: Fragment) : RecyclerView.Adapter trackDataString = "${LengthUnitHelper.convertDistanceToString(tracklistElement.length, useImperial)} • ${tracklistElement.durationString}" + true -> trackDataString = "${LengthUnitHelper.convertDistanceToString( + tracklistElement.length, + useImperial + )} • ${tracklistElement.durationString}" // CASE: no individual name set - include date - false -> trackDataString = "${tracklistElement.dateString} • ${LengthUnitHelper.convertDistanceToString(tracklistElement.length, useImperial)} • ${tracklistElement.durationString}" + false -> trackDataString = + "${tracklistElement.dateString} • ${LengthUnitHelper.convertDistanceToString( + tracklistElement.length, + useImperial + )} • ${tracklistElement.durationString}" } return trackDataString } @@ -165,7 +178,8 @@ class TracklistAdapter(private val fragment: Fragment) : RecyclerView.Adapter - (rootView.findViewById(id) as View).setOnClickListener{ - Toast.makeText(context, R.string.toast_message_elevation_info, Toast.LENGTH_LONG).show() + (rootView.findViewById(id) as View).setOnClickListener { + Toast.makeText(context, R.string.toast_message_elevation_info, Toast.LENGTH_LONG) + .show() } } // make track name on statistics sheet clickable @@ -234,7 +258,8 @@ data class TrackFragmentLayoutHolder(private var context: Context, private var m /* Shows/hides the statistics sheet */ private fun toggleStatisticsSheetVisibility() { when (statisticsSheetBehavior.state) { - BottomSheetBehavior.STATE_EXPANDED -> statisticsSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED + BottomSheetBehavior.STATE_EXPANDED -> statisticsSheetBehavior.state = + BottomSheetBehavior.STATE_COLLAPSED else -> statisticsSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED } } @@ -246,26 +271,31 @@ data class TrackFragmentLayoutHolder(private var context: Context, private var m override fun onStateChanged(bottomSheet: View, newState: Int) { when (newState) { BottomSheetBehavior.STATE_EXPANDED -> { - statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_expanded) + statisticsSheet.background = + context.getDrawable(R.drawable.shape_statistics_background_expanded) trackManagementViews.visibility = View.VISIBLE shareButton.visibility = View.GONE // bottomSheet.setPadding(0,24,0,0) } else -> { - statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_collapsed) + statisticsSheet.background = + context.getDrawable(R.drawable.shape_statistics_background_collapsed) trackManagementViews.visibility = View.GONE shareButton.visibility = View.VISIBLE // bottomSheet.setPadding(0,0,0,0) } } } + override fun onSlide(bottomSheet: View, slideOffset: Float) { if (slideOffset < 0.125f) { - statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_collapsed) + statisticsSheet.background = + context.getDrawable(R.drawable.shape_statistics_background_collapsed) trackManagementViews.visibility = View.GONE shareButton.visibility = View.VISIBLE } else { - statisticsSheet.background = context.getDrawable(R.drawable.shape_statistics_background_expanded) + statisticsSheet.background = + context.getDrawable(R.drawable.shape_statistics_background_expanded) trackManagementViews.visibility = View.VISIBLE shareButton.visibility = View.GONE } @@ -274,4 +304,4 @@ data class TrackFragmentLayoutHolder(private var context: Context, private var m } -} \ No newline at end of file +} diff --git a/app/src/main/res/drawable/ic_bug_report_24dp.xml b/app/src/main/res/drawable/ic_bug_report_24dp.xml index d3767ca..8491cb2 100644 --- a/app/src/main/res/drawable/ic_bug_report_24dp.xml +++ b/app/src/main/res/drawable/ic_bug_report_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_clear_white_24dp.xml b/app/src/main/res/drawable/ic_clear_white_24dp.xml index 27ca255..9d53cbb 100755 --- a/app/src/main/res/drawable/ic_clear_white_24dp.xml +++ b/app/src/main/res/drawable/ic_clear_white_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + 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" /> diff --git a/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml b/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml index df07973..9c4a959 100755 --- a/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml +++ b/app/src/main/res/drawable/ic_compass_needle_black_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M21,3L3,10.53v0.98l6.84,2.65L12.48,21h0.98L21,3z" /> diff --git a/app/src/main/res/drawable/ic_current_location_24dp.xml b/app/src/main/res/drawable/ic_current_location_24dp.xml index fa34fbf..01bccaa 100755 --- a/app/src/main/res/drawable/ic_current_location_24dp.xml +++ b/app/src/main/res/drawable/ic_current_location_24dp.xml @@ -1,9 +1,9 @@ - + + 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" /> diff --git a/app/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml index 8698fa6..bdbbc77 100644 --- a/app/src/main/res/drawable/ic_delete_24dp.xml +++ b/app/src/main/res/drawable/ic_delete_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_edit_24dp.xml b/app/src/main/res/drawable/ic_edit_24dp.xml index 6c65efa..c6b470b 100644 --- a/app/src/main/res/drawable/ic_edit_24dp.xml +++ b/app/src/main/res/drawable/ic_edit_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + 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" /> diff --git a/app/src/main/res/drawable/ic_fiber_manual_record_red_24dp.xml b/app/src/main/res/drawable/ic_fiber_manual_record_red_24dp.xml index 0bcd70e..8f72922 100755 --- a/app/src/main/res/drawable/ic_fiber_manual_record_red_24dp.xml +++ b/app/src/main/res/drawable/ic_fiber_manual_record_red_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="#DC2B00" + android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0" /> diff --git a/app/src/main/res/drawable/ic_fiber_manual_record_white_24dp.xml b/app/src/main/res/drawable/ic_fiber_manual_record_white_24dp.xml index d734aef..805b512 100755 --- a/app/src/main/res/drawable/ic_fiber_manual_record_white_24dp.xml +++ b/app/src/main/res/drawable/ic_fiber_manual_record_white_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/trackbook_white" + android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0" /> diff --git a/app/src/main/res/drawable/ic_gps_24dp.xml b/app/src/main/res/drawable/ic_gps_24dp.xml index a86f88c..08998f4 100755 --- a/app/src/main/res/drawable/ic_gps_24dp.xml +++ b/app/src/main/res/drawable/ic_gps_24dp.xml @@ -1,9 +1,9 @@ - + + 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" /> diff --git a/app/src/main/res/drawable/ic_info_24dp.xml b/app/src/main/res/drawable/ic_info_24dp.xml index 31b21e7..945af95 100644 --- a/app/src/main/res/drawable/ic_info_24dp.xml +++ b/app/src/main/res/drawable/ic_info_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_marker_location_blue_24dp.xml b/app/src/main/res/drawable/ic_marker_location_blue_24dp.xml index 730c19e..de64c1f 100755 --- a/app/src/main/res/drawable/ic_marker_location_blue_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_location_blue_24dp.xml @@ -1,13 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0" /> + android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" /> diff --git a/app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml b/app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml index 95a2828..fe2b9d4 100644 --- a/app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_location_blue_grey_24dp.xml @@ -1,13 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0" /> + android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" /> diff --git a/app/src/main/res/drawable/ic_marker_location_red_24dp.xml b/app/src/main/res/drawable/ic_marker_location_red_24dp.xml index 9c79b58..35a26bb 100755 --- a/app/src/main/res/drawable/ic_marker_location_red_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_location_red_24dp.xml @@ -1,13 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0" /> + android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" /> diff --git a/app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml b/app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml index b470e56..86d4f9e 100644 --- a/app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_location_red_grey_24dp.xml @@ -1,13 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + android:pathData="M48,48m-48,0a48,48 0,1 1,96 0a48,48 0,1 1,-96 0" /> + android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" /> diff --git a/app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml b/app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml index 8994111..da49a6b 100755 --- a/app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_location_blue_24dp.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" /> diff --git a/app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml b/app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml index 079ca2b..57c81f1 100755 --- a/app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_location_grey_24dp.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" /> diff --git a/app/src/main/res/drawable/ic_marker_track_location_red_24dp.xml b/app/src/main/res/drawable/ic_marker_track_location_red_24dp.xml index 29baa58..4264365 100755 --- a/app/src/main/res/drawable/ic_marker_track_location_red_24dp.xml +++ b/app/src/main/res/drawable/ic_marker_track_location_red_24dp.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + android:pathData="M48,48m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" /> diff --git a/app/src/main/res/drawable/ic_notebook_black_24dp.xml b/app/src/main/res/drawable/ic_notebook_black_24dp.xml index d3d8e2a..64c93dd 100755 --- a/app/src/main/res/drawable/ic_notebook_black_24dp.xml +++ b/app/src/main/res/drawable/ic_notebook_black_24dp.xml @@ -1,12 +1,12 @@ + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + 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="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" /> diff --git a/app/src/main/res/drawable/ic_notification_action_resume_36dp.xml b/app/src/main/res/drawable/ic_notification_action_resume_36dp.xml index f1017e0..835a5d8 100644 --- a/app/src/main/res/drawable/ic_notification_action_resume_36dp.xml +++ b/app/src/main/res/drawable/ic_notification_action_resume_36dp.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24.0"> - \ No newline at end of file + android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0" /> + diff --git a/app/src/main/res/drawable/ic_notification_action_show_36dp.xml b/app/src/main/res/drawable/ic_notification_action_show_36dp.xml index 4c1ec9c..0ebbbd7 100644 --- a/app/src/main/res/drawable/ic_notification_action_show_36dp.xml +++ b/app/src/main/res/drawable/ic_notification_action_show_36dp.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24.0"> + 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" /> diff --git a/app/src/main/res/drawable/ic_notification_action_stop_24dp.xml b/app/src/main/res/drawable/ic_notification_action_stop_24dp.xml index cecebba..b436dde 100644 --- a/app/src/main/res/drawable/ic_notification_action_stop_24dp.xml +++ b/app/src/main/res/drawable/ic_notification_action_stop_24dp.xml @@ -1,9 +1,9 @@ + android:viewportHeight="24.0"> + android:pathData="M6,6h12v12H6z" /> diff --git a/app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml b/app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml index 787e5cf..eb643b1 100755 --- a/app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml +++ b/app/src/main/res/drawable/ic_notification_icon_large_tracking_active_48dp.xml @@ -1,12 +1,12 @@ + android:viewportHeight="192.0"> + android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0" /> + android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z" /> diff --git a/app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml b/app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml index 7d270c1..9c687ac 100755 --- a/app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml +++ b/app/src/main/res/drawable/ic_notification_icon_large_tracking_stopped_48dp.xml @@ -1,12 +1,12 @@ + android:viewportHeight="192.0"> + android:pathData="M96,96m-96,0a96,96 0,1 1,192 0a96,96 0,1 1,-192 0" /> + android:pathData="M48,96a48,46.5 0,1 0,96 0a48,46.5 0,1 0,-96 0z" /> diff --git a/app/src/main/res/drawable/ic_notification_icon_small_24dp.xml b/app/src/main/res/drawable/ic_notification_icon_small_24dp.xml index e481483..3d3abc8 100755 --- a/app/src/main/res/drawable/ic_notification_icon_small_24dp.xml +++ b/app/src/main/res/drawable/ic_notification_icon_small_24dp.xml @@ -1,12 +1,12 @@ + android:viewportWidth="96.0" + android:viewportHeight="96.0"> + 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="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" /> diff --git a/app/src/main/res/drawable/ic_remove_circle_24dp.xml b/app/src/main/res/drawable/ic_remove_circle_24dp.xml index 31439c3..088e113 100644 --- a/app/src/main/res/drawable/ic_remove_circle_24dp.xml +++ b/app/src/main/res/drawable/ic_remove_circle_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + 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" /> diff --git a/app/src/main/res/drawable/ic_save_24dp.xml b/app/src/main/res/drawable/ic_save_24dp.xml index 14e3ad6..561583f 100644 --- a/app/src/main/res/drawable/ic_save_24dp.xml +++ b/app/src/main/res/drawable/ic_save_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml index 1f1ec00..abc7dbe 100755 --- a/app/src/main/res/drawable/ic_save_white_24dp.xml +++ b/app/src/main/res/drawable/ic_save_white_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" /> diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml index 48597cc..07d2cd0 100644 --- a/app/src/main/res/drawable/ic_settings_black_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + 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" /> diff --git a/app/src/main/res/drawable/ic_smartphone_24dp.xml b/app/src/main/res/drawable/ic_smartphone_24dp.xml index 23254dc..465baa1 100644 --- a/app/src/main/res/drawable/ic_smartphone_24dp.xml +++ b/app/src/main/res/drawable/ic_smartphone_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z" /> diff --git a/app/src/main/res/drawable/ic_square_foot_24px.xml b/app/src/main/res/drawable/ic_square_foot_24px.xml index 2017e45..4f291a0 100644 --- a/app/src/main/res/drawable/ic_square_foot_24px.xml +++ b/app/src/main/res/drawable/ic_square_foot_24px.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_star_blue_24dp.xml b/app/src/main/res/drawable/ic_star_blue_24dp.xml index 6ba138a..889e9f3 100644 --- a/app/src/main/res/drawable/ic_star_blue_24dp.xml +++ b/app/src/main/res/drawable/ic_star_blue_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" /> diff --git a/app/src/main/res/drawable/ic_star_filled_24dp.xml b/app/src/main/res/drawable/ic_star_filled_24dp.xml index 5e1387f..feb34af 100644 --- a/app/src/main/res/drawable/ic_star_filled_24dp.xml +++ b/app/src/main/res/drawable/ic_star_filled_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" /> diff --git a/app/src/main/res/drawable/ic_star_outline_24dp.xml b/app/src/main/res/drawable/ic_star_outline_24dp.xml index 81babd1..9eba63b 100644 --- a/app/src/main/res/drawable/ic_star_outline_24dp.xml +++ b/app/src/main/res/drawable/ic_star_outline_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + 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" /> diff --git a/app/src/main/res/drawable/ic_star_red_24dp.xml b/app/src/main/res/drawable/ic_star_red_24dp.xml index c30d723..3fb5217 100644 --- a/app/src/main/res/drawable/ic_star_red_24dp.xml +++ b/app/src/main/res/drawable/ic_star_red_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" /> diff --git a/app/src/main/res/drawable/ic_timeline_24dp.xml b/app/src/main/res/drawable/ic_timeline_24dp.xml index 967f85e..5dfa1d4 100644 --- a/app/src/main/res/drawable/ic_timeline_24dp.xml +++ b/app/src/main/res/drawable/ic_timeline_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + 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" /> diff --git a/app/src/main/res/drawable/ic_undo_24dp.xml b/app/src/main/res/drawable/ic_undo_24dp.xml index 97edd0c..fda630a 100644 --- a/app/src/main/res/drawable/ic_undo_24dp.xml +++ b/app/src/main/res/drawable/ic_undo_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + 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" /> diff --git a/app/src/main/res/drawable/selector_bottom_navigation.xml b/app/src/main/res/drawable/selector_bottom_navigation.xml index 1c4350c..2e71ece 100755 --- a/app/src/main/res/drawable/selector_bottom_navigation.xml +++ b/app/src/main/res/drawable/selector_bottom_navigation.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/drawable/shape_statistics_background_collapsed.xml b/app/src/main/res/drawable/shape_statistics_background_collapsed.xml index 3f75958..6ac8451 100644 --- a/app/src/main/res/drawable/shape_statistics_background_collapsed.xml +++ b/app/src/main/res/drawable/shape_statistics_background_collapsed.xml @@ -2,17 +2,20 @@ + android:top="0dp"> - + - - + + diff --git a/app/src/main/res/drawable/shape_statistics_background_expanded.xml b/app/src/main/res/drawable/shape_statistics_background_expanded.xml index 682b9e8..74d4e51 100644 --- a/app/src/main/res/drawable/shape_statistics_background_expanded.xml +++ b/app/src/main/res/drawable/shape_statistics_background_expanded.xml @@ -2,17 +2,20 @@ + android:top="0dp"> - + - - + + diff --git a/app/src/main/res/layout/dialog_generic_with_details.xml b/app/src/main/res/layout/dialog_generic_with_details.xml index 89af16d..44e19db 100644 --- a/app/src/main/res/layout/dialog_generic_with_details.xml +++ b/app/src/main/res/layout/dialog_generic_with_details.xml @@ -1,6 +1,5 @@ - - \ No newline at end of file + diff --git a/app/src/main/res/layout/dialog_rename_track.xml b/app/src/main/res/layout/dialog_rename_track.xml index 04c2a7c..bcf666a 100644 --- a/app/src/main/res/layout/dialog_rename_track.xml +++ b/app/src/main/res/layout/dialog_rename_track.xml @@ -1,6 +1,5 @@ - @@ -29,4 +28,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml index 60e023b..eafe878 100644 --- a/app/src/main/res/layout/fragment_map.xml +++ b/app/src/main/res/layout/fragment_map.xml @@ -1,6 +1,5 @@ - - + android:visibility="visible"> - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_tracklist.xml b/app/src/main/res/layout/fragment_tracklist.xml index cc535b7..cd00fec 100644 --- a/app/src/main/res/layout/fragment_tracklist.xml +++ b/app/src/main/res/layout/fragment_tracklist.xml @@ -1,6 +1,5 @@ - - + - - + + diff --git a/app/src/main/res/layout/track_onboarding.xml b/app/src/main/res/layout/track_onboarding.xml index fcedbd1..2367c1e 100755 --- a/app/src/main/res/layout/track_onboarding.xml +++ b/app/src/main/res/layout/track_onboarding.xml @@ -1,10 +1,9 @@ - + android:layout_height="match_parent"> - - - \ No newline at end of file + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 4ae7d12..8ae0e29 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + + + diff --git a/app/src/main/res/navigation/nav_graph_main.xml b/app/src/main/res/navigation/nav_graph_main.xml index caf5eef..a3f2e1a 100644 --- a/app/src/main/res/navigation/nav_graph_main.xml +++ b/app/src/main/res/navigation/nav_graph_main.xml @@ -27,7 +27,7 @@ + android:label="Settings" /> + tools:layout="@layout/fragment_track"> + android:defaultValue="-1L" + app:argType="long" /> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0459398..6a1bd19 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,95 +1,95 @@ - - - Trackbook - - - 地图 - 记录 - 设置 - - Trackbook 正在运行 - Trackbook 已暂停 - 暂停 - 恢复 - 显示 - 运动记录状态 - 显示持续时间和距离.停止移动录制的选项. - - 位置服务已关闭，Trackbook 将不会运行. - 位置权限未被授予 Trackbook 无法工作. - - 删除 - 保存 - 恢复 - - 取消 - OK - 显示详情 - 无法保存 - Trackbook目前没有记录到任何航点. - 恢复记录 - 重命名 - 输入一个新名称 - 分享GPX文件到 - 是 - 删除 - 删除此记录？ - - 提示：海拔数据的准确性取决于您的设备.测量整个路线的上坡和下坡海拔. - 请先安装一个文件管理器或GPX轨迹查看器. + + + Trackbook + + + 地图 + 记录 + 设置 + + Trackbook 正在运行 + Trackbook 已暂停 + 暂停 + 恢复 + 显示 + 运动记录状态 + 显示持续时间和距离.停止移动录制的选项. + + 位置服务已关闭，Trackbook 将不会运行. + 位置权限未被授予 Trackbook 无法工作. + + 删除 + 保存 + 恢复 + + 取消 + OK + 显示详情 + 无法保存 + Trackbook目前没有记录到任何航点. + 恢复记录 + 重命名 + 输入一个新名称 + 分享GPX文件到 + 是 + 删除 + 删除此记录？ + + 提示：海拔数据的准确性取决于您的设备.测量整个路线的上坡和下坡海拔. + 请先安装一个文件管理器或GPX轨迹查看器. - 时间 - 误差 - - 总里程: - 步数: - 计步器不可用 - 航点数量: - 用时: - 追踪开始: - 追踪结束: - 最高航点: - 最低航点: - 海拔(上坡): - 海拔(下坡): - - - Trackbook 应用图标 - - 你的运动记录 - ... 会显示在这里. - - 丢弃误差大于 - 误差的阈值 - 高级 - 一般 - 仅限于GPS - 当前使用GPS和网络进行定位. - 当前使用GPS进行定位. - 当前使用公制单位(千米,米). - 当前使用英制单位(英里,英尺). - 使用英制 - 高级设置重置为默认值. - 重置 - - 时 - 分 - 秒 - - 航迹图 - 最后一个轨迹的航迹图 - 开始录制按钮 - 保存按钮 - 删除按钮 - 恢复按钮 - 加星按钮 - 删除记录按钮 - 记录编辑按钮 - 以GPX文件分享按钮 - - 23.0 km • 5 时 23 分 42 秒 - 1969年7月20日 - 轨迹数据丢失 + 时间 + 误差 + + 总里程: + 步数: + 计步器不可用 + 航点数量: + 用时: + 追踪开始: + 追踪结束: + 最高航点: + 最低航点: + 海拔(上坡): + 海拔(下坡): + + + Trackbook 应用图标 + + 你的运动记录 + ... 会显示在这里. + + 丢弃误差大于 + 误差的阈值 + 高级 + 一般 + 仅限于GPS + 当前使用GPS和网络进行定位. + 当前使用GPS进行定位. + 当前使用公制单位(千米,米). + 当前使用英制单位(英里,英尺). + 使用英制 + 高级设置重置为默认值. + 重置 + + 时 + 分 + 秒 + + 航迹图 + 最后一个轨迹的航迹图 + 开始录制按钮 + 保存按钮 + 删除按钮 + 恢复按钮 + 加星按钮 + 删除记录按钮 + 记录编辑按钮 + 以GPX文件分享按钮 + + 23.0 km • 5 时 23 分 42 秒 + 1969年7月20日 + 轨迹数据丢失 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e60c985..b6c1e47 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -31,17 +31,21 @@ - #FF595959 + + + #FF595959 #FF7D7D7D #FFDADADA #FFF2F2F2 #FF414141 #FF2D2D2D - #DC3D33 + + #DC3D33 #FFCA2D23 - #FF121212 + + #FF121212 #FFFFFFFF #00ffffff diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index e2c897d..4928a7e 100755 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,6 +1,9 @@ - -1 + + + -1 + 16dp @dimen/custom_match_parent diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 724e360..5bbbd09 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -20,9 +20,11 @@ @style/NegativeButtonStyle @style/PositiveButtonStyle + + diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml index 4495c28..a075ef9 100644 --- a/app/src/main/res/xml/provider_paths.xml +++ b/app/src/main/res/xml/provider_paths.xml @@ -1,4 +1,6 @@ - - \ No newline at end of file + +