Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Group 1: Sprint 3 #191

Open
wants to merge 38 commits into
base: main
Choose a base branch
from
Open

Merge Group 1: Sprint 3 #191

wants to merge 38 commits into from

Conversation

c-eric
Copy link
Collaborator

@c-eric c-eric commented Apr 9, 2024

"Default units and activity" functionality in Settings

Describe the pull request
This pull request addresses the issue of cluttering the database with irrelevant data caused by recording short exercises in the OpenTracks application. To solve this problem, the following enhancements are added:

  • Settings Menu Enhancement: Integrate a new section within the settings menu specifically for exercise tracking preferences. Add options for configuring the minimum duration threshold for recorded exercises.
  • Minimum Duration Options: Provide predefined duration options such as 5 sec, 10 sec, and 15 sec. Allow users to set a custom duration threshold if none of the predefined options suit their needs.
  • Automatic Discarding Functionality: Implement logic within the application to automatically discard recorded exercises that fall below the specified duration threshold. Upon completing an exercise tracking session, the system checks the duration of the recorded exercise. If the duration is shorter than the specified threshold, the exercise is flagged for automatic discarding.

Status: in-progress

License agreement
By opening this pull request, you are providing your contribution under the Apache License 2.0 (see LICENSE.md).

XeqtR0 and others added 30 commits March 18, 2024 20:48
@XeqtR0
Stop recording immediately
68a2575 
Now, user does not have to hold the button
@e3ham
Modified ImageView to MaterialDesign as per TODO comment
5bbb6b4
@e3ham
Merge remote-tracking branch 'origin/main'
c35da4b
@e3ham
Integrated pause button in the recording screen
27c9ba5
@e3ham
Implemented pause functionality for Moving Time, Distance, and Speed.
d99788d
@e3ham
Removed the stopSensors() method when pausing, as it did not allow th…
a114144 
…e recording to stop without crashing once paused.
@e3ham
Integrated a resume button and made it show/disappear when pause/resu…
7c245a6 
…me button clicked.
@e3ham
Working on resume functionality, moving time is 4 seconds behind tota…
e33d38c 
…l time (jumps after resuming).
@AevisMotax
Check if track is null (often causes error when you exit app, then tr…
a5d1975 
…y to re-open it while track is still running)
@AevisMotax
Check if track is null (often causes error when you exit app, then tr…
a17f24c 
…y to re-open it while track is still running)
@AevisMotax
trying to add stop and start button
80341e6
@AevisMotax
minor changes to add/stop button
d16180a
@AevisMotax
unsure, but another prevent nullPointer
fe96bb5
save migrations
87f02ca
@kevinqtra
Merge branch 'main' into main
c586dde
@e3ham
Implemented built-in pause method instead of creating a new one.
ab27ed9
Modify UI to add 'Preferred minimum time' in Settings
2feb8d8
@AevisMotax
Started implementing Time Unit System,
4a64da1 
--NOTE: Needs changes among selecting multiple options
@e3ham @AevisMotax
Fixed bug in pause where it would keep running in background. Moving …
db411c0 
…time is paused exclusively, total time keeps running while paused.

(cherry picked from commit 48f11af)
@e3ham @AevisMotax
Implemented built-in pause method instead of creating a new one.
58e465e 
(cherry picked from commit ab27ed9)
@e3ham @AevisMotax
Added EditTextPreference and attempting to connect Default Time Units…
826a6a9 
… to TrackRecording.xml
@e3ham
Started implementation of the default time units backend logic. Logic…
09c3d39 
… will reside within the finish button.
@kevinqtra
Implemented logic to discard record based on a default minimum time
8605b6b
@e3ham
Fixed small bug, changed stats_time_unit_fifteen to stats_time_unit_t…
ddd73b6 
…wenty. Program now runs.
@AevisMotax
Merge remote-tracking branch 'origin/defaultUnitTime' into defaultUni…
d8bcce0 
…tTime

# Conflicts:
#	src/main/java/de/dennisguse/opentracks/settings/DefaultsSettingsFragment.java
#	src/main/res/values/settings.xml
@e3ham
Implemented logic to get the user selection for minimum duration and …
a51735b 
…turn it into an int. Comparison is then made with the total time of the track.
@AevisMotax
Merge remote-tracking branch 'origin/defaultUnitTime' into defaultUni…
25f02dc 
…tTime
@AevisMotax
minor changes
4e28b18
@e3ham
Made the user selection for time save. Fixed implementation for getti…
1afc069 
…ng user selection and comparing to total track time.
@e3ham
Merge remote-tracking branch 'origin/defaultUnitTime' into defaultUni…
195a0f9 
…tTime

# Conflicts:
#	src/main/java/de/dennisguse/opentracks/settings/DefaultsSettingsFragment.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@c-eric c-eric

@JoeJrL JoeJrL

@aandrewoh aandrewoh

@XeqtR0 XeqtR0

@e3ham e3ham

@AevisMotax AevisMotax

@kevinqtra kevinqtra

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@c-eric @JoeJrL @aandrewoh @XeqtR0 @e3ham @AevisMotax @kevinqtra