From 75a0a3ae40bc324cb332ee8d30c7876e715b20b3 Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Mon, 4 Apr 2022 13:00:50 -0700 Subject: [PATCH] Some linting. --- .../java/org/y20k/trackbook/SettingsFragment.kt | 2 +- .../main/java/org/y20k/trackbook/Trackbook.kt | 2 +- .../java/org/y20k/trackbook/TrackerService.kt | 17 +++++++++-------- .../org/y20k/trackbook/TracklistFragment.kt | 2 +- .../java/org/y20k/trackbook/core/Tracklist.kt | 2 +- .../trackbook/tracklist/TracklistAdapter.kt | 4 ++-- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt b/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt index cc1d6a1..908e546 100644 --- a/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt +++ b/app/src/main/java/org/y20k/trackbook/SettingsFragment.kt @@ -217,7 +217,7 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList /* Removes track and track files for given position - used by TracklistFragment */ private fun deleteNonStarred(context: Context) { - var tracklist: Tracklist = load_tracklist(context) + val tracklist: Tracklist = load_tracklist(context) tracklist.delete_non_starred(context) } diff --git a/app/src/main/java/org/y20k/trackbook/Trackbook.kt b/app/src/main/java/org/y20k/trackbook/Trackbook.kt index b251f13..3185c28 100644 --- a/app/src/main/java/org/y20k/trackbook/Trackbook.kt +++ b/app/src/main/java/org/y20k/trackbook/Trackbook.kt @@ -40,7 +40,7 @@ class Trackbook: Application() { override fun onCreate() { super.onCreate() LogHelper.v(TAG, "Trackbook application started.") - DynamicColors.applyToActivitiesIfAvailable(this); + DynamicColors.applyToActivitiesIfAvailable(this) // initialize single sharedPreferences object when app is launched initPreferences() // set Dark / Light theme state diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.kt b/app/src/main/java/org/y20k/trackbook/TrackerService.kt index a53e501..51d3676 100644 --- a/app/src/main/java/org/y20k/trackbook/TrackerService.kt +++ b/app/src/main/java/org/y20k/trackbook/TrackerService.kt @@ -32,7 +32,6 @@ import android.location.LocationListener import android.location.LocationManager import android.Manifest import android.os.* -import android.util.Log import androidx.core.content.ContextCompat import java.util.* import kotlinx.coroutines.* @@ -47,8 +46,8 @@ import org.y20k.trackbook.helpers.* /* * TrackerService class */ -class TrackerService: Service(), SensorEventListener { - +class TrackerService: Service(), SensorEventListener +{ /* Define log tag */ private val TAG: String = LogHelper.makeLogTag(TrackerService::class.java) @@ -80,7 +79,8 @@ class TrackerService: Service(), SensorEventListener { private lateinit var networkLocationListener: LocationListener /* Overrides onCreate from Service */ - override fun onCreate() { + override fun onCreate() + { super.onCreate() gpsOnly = PreferencesHelper.loadGpsOnly() useImperial = PreferencesHelper.loadUseImperialUnits() @@ -197,7 +197,8 @@ class TrackerService: Service(), SensorEventListener { } /* Resume tracking after stop/pause */ - fun resumeTracking() { + fun resumeTracking() + { // load temp track - returns an empty track if there is no temp file. track = load_temp_track(this) // try to mark last waypoint as stopover @@ -228,10 +229,10 @@ class TrackerService: Service(), SensorEventListener { startForeground(Keys.TRACKER_SERVICE_NOTIFICATION_ID, displayNotification()) } - /* Stop tracking location */ - fun stopTracking() { + fun stopTracking() + { track.recordingStop = GregorianCalendar.getInstance().time - val context: Context = this as Context + val context: Context = this CoroutineScope(IO).launch { track.save_temp_suspended(context) } trackingState = Keys.STATE_TRACKING_STOPPED diff --git a/app/src/main/java/org/y20k/trackbook/TracklistFragment.kt b/app/src/main/java/org/y20k/trackbook/TracklistFragment.kt index fd4847b..71746f6 100644 --- a/app/src/main/java/org/y20k/trackbook/TracklistFragment.kt +++ b/app/src/main/java/org/y20k/trackbook/TracklistFragment.kt @@ -166,7 +166,7 @@ class TracklistFragment : Fragment(), TracklistAdapter.TracklistAdapterListener, arguments?.putLong(Keys.ARG_TRACK_ID, -1L) if (deleteTrackId == -1L) { - return; + return } CoroutineScope(Main). launch { tracklistAdapter.delete_track_by_id(this@TracklistFragment.activity as Context, deleteTrackId) 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 5cac5b1..1e07b62 100644 --- a/app/src/main/java/org/y20k/trackbook/core/Tracklist.kt +++ b/app/src/main/java/org/y20k/trackbook/core/Tracklist.kt @@ -76,7 +76,7 @@ data class Tracklist ( fun load_tracklist(context: Context): Tracklist { Log.i("VOUSSOIR", "Loading tracklist.") val folder = context.getExternalFilesDir("tracks") - var tracklist: Tracklist = Tracklist() + val tracklist: Tracklist = Tracklist() if (folder == null) { return tracklist 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 3df191d..07d4dd7 100644 --- a/app/src/main/java/org/y20k/trackbook/tracklist/TracklistAdapter.kt +++ b/app/src/main/java/org/y20k/trackbook/tracklist/TracklistAdapter.kt @@ -112,14 +112,14 @@ class TracklistAdapter(private val fragment: Fragment) : RecyclerView.Adapter { - val elementStatisticsViewHolder: ElementStatisticsViewHolder = holder as ElementStatisticsViewHolder + val elementStatisticsViewHolder: ElementStatisticsViewHolder = holder elementStatisticsViewHolder.totalDistanceView.text = LengthUnitHelper.convertDistanceToString(tracklist.get_total_distance(), useImperial) } // CASE TRACK ELEMENT is ElementTrackViewHolder -> { val positionInTracklist: Int = position - 1 // Element 0 is the statistics element. - val elementTrackViewHolder: ElementTrackViewHolder = holder as ElementTrackViewHolder + val elementTrackViewHolder: ElementTrackViewHolder = holder elementTrackViewHolder.trackNameView.text = tracklist.tracks[positionInTracklist].name elementTrackViewHolder.trackDataView.text = createTrackDataString(positionInTracklist) when (tracklist.tracks[positionInTracklist].starred) {