diff --git a/app/build.gradle b/app/build.gradle index 9bc36ac..b2cb337b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -49,11 +49,11 @@ android { debug { // Comment out the below lines if you do not need to test resource shrinking - //minifyEnabled true - //shrinkResources true - //proguardFiles getDefaultProguardFile( - // 'proguard-android-optimize.txt'), - // 'proguard-rules.pro' + minifyEnabled true + shrinkResources true + proguardFiles getDefaultProguardFile( + 'proguard-android-optimize.txt'), + 'proguard-rules.pro' } } diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.kt b/app/src/main/java/org/y20k/trackbook/TrackerService.kt index 924cff7..46f6148 100644 --- a/app/src/main/java/org/y20k/trackbook/TrackerService.kt +++ b/app/src/main/java/org/y20k/trackbook/TrackerService.kt @@ -213,6 +213,9 @@ class TrackerService(): Service(), CoroutineScope, SensorEventListener { val lastWayPointIndex = track.wayPoints.size - 1 track.wayPoints.get(lastWayPointIndex).isStopOver = true } + // calculate length of recording break + track.recordingPaused = TrackHelper.calculateRecordingPaused(track.recordingStop) + LogHelper.e(TAG, "We took a break for ${DateTimeHelper.convertToReadableTime(this, track.recordingPaused)}") // todo remove // start tracking startTracking(newTrack = false) } 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 7c566bd..361911b 100644 --- a/app/src/main/java/org/y20k/trackbook/core/Track.kt +++ b/app/src/main/java/org/y20k/trackbook/core/Track.kt @@ -36,6 +36,7 @@ data class Track (@Expose var trackFormatVersion: Int = Keys.CURRENT_TRACK_FORMA @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, 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 00d073f..e5c14d2 100644 --- a/app/src/main/java/org/y20k/trackbook/helpers/TrackHelper.kt +++ b/app/src/main/java/org/y20k/trackbook/helpers/TrackHelper.kt @@ -35,15 +35,13 @@ object TrackHelper { /* Returns unique ID for Track - currently the start date */ - fun getTrackId(track: Track): Long { - return track.recordingStart.time - } + fun getTrackId(track: Track): Long = + track.recordingStart.time /* Returns unique ID for TracklistElement - currently the start date */ - fun getTrackId(tracklistElement: TracklistElement): Long { - return tracklistElement.date.time - } + fun getTrackId(tracklistElement: TracklistElement): Long = + tracklistElement.date.time /* Adds given locatiom as waypoint to track */ @@ -120,6 +118,11 @@ object TrackHelper { } + /* Calculates time passed since last stop of recording */ + fun calculateRecordingPaused(recordingStop: Date): Long = + GregorianCalendar.getInstance().time.time - recordingStop.time + + /* Creates GPX string for given track */ fun createGpxString(track: Track): String { var gpxString: String