From 3c4f4f36a54cf49bfaa9e023b2123110f12f5422 Mon Sep 17 00:00:00 2001 From: y20k Date: Sat, 22 Feb 2020 17:44:31 +0100 Subject: [PATCH] show recording paused time in track statistics --- .../trackbook/ui/TrackFragmentLayoutHolder.kt | 14 ++++++++++ app/src/main/res/layout/track_statistics.xml | 27 +++++++++++++++++-- app/src/main/res/values/strings.xml | 1 + 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt b/app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt index d73f911..ba0b92a 100644 --- a/app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt +++ b/app/src/main/java/org/y20k/trackbook/ui/TrackFragmentLayoutHolder.kt @@ -75,6 +75,8 @@ data class TrackFragmentLayoutHolder(var context: Context, var inflater: LayoutI private val durationView: MaterialTextView private val recordingStartView: MaterialTextView private val recordingStopView: MaterialTextView + private val recordingPausedView: MaterialTextView + private val recordingPausedLabelView: MaterialTextView private val maxAltitudeView: MaterialTextView private val minAltitudeView: MaterialTextView private val positiveElevationView: MaterialTextView @@ -112,6 +114,8 @@ data class TrackFragmentLayoutHolder(var context: Context, var inflater: LayoutI durationView = rootView.findViewById(R.id.statistics_data_duration) recordingStartView = rootView.findViewById(R.id.statistics_data_recording_start) recordingStopView = rootView.findViewById(R.id.statistics_data_recording_stop) + recordingPausedLabelView = rootView.findViewById(R.id.statistics_p_recording_paused) + recordingPausedView = rootView.findViewById(R.id.statistics_data_recording_paused) maxAltitudeView = rootView.findViewById(R.id.statistics_data_max_altitude) minAltitudeView = rootView.findViewById(R.id.statistics_data_min_altitude) positiveElevationView = rootView.findViewById(R.id.statistics_data_positive_elevation) @@ -186,6 +190,16 @@ data class TrackFragmentLayoutHolder(var context: Context, var inflater: LayoutI positiveElevationView.text = LengthUnitHelper.convertDistanceToString(track.positiveElevation, useImperialUnits) negativeElevationView.text = LengthUnitHelper.convertDistanceToString(track.negativeElevation, useImperialUnits) + // show / hide recording pause + if (track.recordingPaused != 0L) { + recordingPausedLabelView.visibility = View.VISIBLE + recordingPausedView.visibility = View.VISIBLE + recordingPausedView.text = DateTimeHelper.convertToReadableTime(context, track.recordingPaused) + } else { + recordingPausedLabelView.visibility = View.GONE + recordingPausedView.visibility = View.GONE + } + // inform user about possible accuracy issues with altitude measurements elevationDataViews.referencedIds.forEach { id -> (rootView.findViewById(id) as View).setOnClickListener{ diff --git a/app/src/main/res/layout/track_statistics.xml b/app/src/main/res/layout/track_statistics.xml index a86f81d..a914935 100755 --- a/app/src/main/res/layout/track_statistics.xml +++ b/app/src/main/res/layout/track_statistics.xml @@ -174,8 +174,8 @@ android:text="@string/statistics_sheet_p_recording_start" android:textAppearance="@style/TextAppearance.MaterialComponents.Body2" android:textColor="@color/text_lightweight" - app:layout_constraintStart_toStartOf="@+id/statistics_p_duration" - app:layout_constraintTop_toBottomOf="@+id/statistics_p_duration" /> + app:layout_constraintStart_toStartOf="@+id/statistics_p_recording_paused" + app:layout_constraintTop_toBottomOf="@+id/statistics_p_recording_paused" /> + + + + pedometer not available Recorded waypoints: Total duration: + Recording paused: Recording started: Recording stopped: Highest waypoint: