Code

Merge Group 1: Sprint 3#191

Code

Open

c-eric wants to merge 38 commits intorilling:mainrilling/OpenTracks-Winter-2024-COMP-354:mainfrom e3ham:defaultUnitTimee3ham/COMP354-UI:defaultUnitTimeCopy head branch name to clipboard

+589-47

Commits

Commits on Mar 19, 2024

• Stop recording immediately

  Show description for 68a2575
  XeqtR0

  committed
  68a2575

  Copy full SHA for 68a2575

Commits on Mar 22, 2024

• Modified ImageView to MaterialDesign as per TODO comment

  e3ham

  committed
  5bbb6b4

  Copy full SHA for 5bbb6b4

• Merge remote-tracking branch 'origin/main'

  e3ham

  committed
  c35da4b

  Copy full SHA for c35da4b

Commits on Mar 23, 2024

• Integrated pause button in the recording screen

  e3ham

  committed
  27c9ba5

  Copy full SHA for 27c9ba5

• Implemented pause functionality for Moving Time, Distance, and Speed.

  e3ham

  committed
  d99788d

  Copy full SHA for d99788d

• Removed the stopSensors() method when pausing, as it did not allow the recording to stop without crashing once paused.

  e3ham

  committed
  a114144

  Copy full SHA for a114144

Commits on Mar 24, 2024

• Integrated a resume button and made it show/disappear when pause/resume button clicked.

  e3ham

  committed
  7c245a6

  Copy full SHA for 7c245a6

• Working on resume functionality, moving time is 4 seconds behind total time (jumps after resuming).

  e3ham

  committed
  e33d38c

  Copy full SHA for e33d38c

Commits on Mar 25, 2024

• Check if track is null (often causes error when you exit app, then try to re-open it while track is still running)

  AevisMotax

  committed
  a5d1975

  Copy full SHA for a5d1975

• Check if track is null (often causes error when you exit app, then try to re-open it while track is still running)

  AevisMotax

  committed
  a17f24c

  Copy full SHA for a17f24c

• trying to add stop and start button

  AevisMotax

  committed
  80341e6

  Copy full SHA for 80341e6

• minor changes to add/stop button

  AevisMotax

  committed
  d16180a

  Copy full SHA for d16180a

• unsure, but another prevent nullPointer

  AevisMotax

  committed
  fe96bb5

  Copy full SHA for fe96bb5

Commits on Mar 26, 2024

• save migrations

  

  Kevin Tran

  committed
  87f02ca

  Copy full SHA for 87f02ca

• Merge branch 'main' into main

  kevinqtra

  authored
  c586dde

  Copy full SHA for c586dde

Commits on Mar 31, 2024

• Implemented built-in pause method instead of creating a new one.

  e3ham

  committed
  ab27ed9

  Copy full SHA for ab27ed9

Commits on Apr 1, 2024

• Modify UI to add 'Preferred minimum time' in Settings

  

  Kevin Tran

  committed
  2feb8d8

  Copy full SHA for 2feb8d8

Commits on Apr 2, 2024

• Started implementing Time Unit System,

  Show description for 4a64da1
  AevisMotax

  committed
  4a64da1

  Copy full SHA for 4a64da1

• Fixed bug in pause where it would keep running in background. Moving time is paused exclusively, total time keeps running while paused.

  Show description for db411c0
  

  e3ham

  authored and

  AevisMotax

  committed
  db411c0

  Copy full SHA for db411c0

• Implemented built-in pause method instead of creating a new one.

  Show description for 58e465e
  

  e3ham

  authored and

  AevisMotax

  committed
  58e465e

  Copy full SHA for 58e465e

Commits on Apr 5, 2024

• Added EditTextPreference and attempting to connect Default Time Units to TrackRecording.xml

  

  e3ham

  authored and

  AevisMotax

  committed
  826a6a9

  Copy full SHA for 826a6a9

Commits on Apr 6, 2024

• Started implementation of the default time units backend logic. Logic will reside within the finish button.

  e3ham

  committed
  09c3d39

  Copy full SHA for 09c3d39

Commits on Apr 7, 2024

• Implemented logic to discard record based on a default minimum time

  kevinqtra

  committed
  8605b6b

  Copy full SHA for 8605b6b

• Fixed small bug, changed stats_time_unit_fifteen to stats_time_unit_twenty. Program now runs.

  e3ham

  committed
  ddd73b6

  Copy full SHA for ddd73b6

• Merge remote-tracking branch 'origin/defaultUnitTime' into defaultUnitTime

  Show description for d8bcce0
  AevisMotax

  committed
  d8bcce0

  Copy full SHA for d8bcce0

• Implemented logic to get the user selection for minimum duration and turn it into an int. Comparison is then made with the total time of the track.

  e3ham

  committed
  a51735b

  Copy full SHA for a51735b

• Merge remote-tracking branch 'origin/defaultUnitTime' into defaultUnitTime

  AevisMotax

  committed
  25f02dc

  Copy full SHA for 25f02dc

• minor changes

  AevisMotax

  committed
  4e28b18

  Copy full SHA for 4e28b18

• Made the user selection for time save. Fixed implementation for getting user selection and comparing to total track time.

  e3ham

  committed
  1afc069

  Copy full SHA for 1afc069

• Merge remote-tracking branch 'origin/defaultUnitTime' into defaultUnitTime

  Show description for 195a0f9
  e3ham

  committed
  195a0f9

  Copy full SHA for 195a0f9

• Finished implementing the auto delete function depending on user input.

  e3ham

  committed
  6aecfdd

  Copy full SHA for 6aecfdd

• Add Dialog Text Box --When User selects Customize

  AevisMotax

  committed
  86859b0

  Copy full SHA for 86859b0

• Merge remote-tracking branch 'origin/defaultUnitTime' into defaultUnitTime

  AevisMotax

  committed
  ef82ea1

  Copy full SHA for ef82ea1

• The last set custom time will be saved in the dialog box when user selects Custom again.

  e3ham

  committed
  fcd3c76

  Copy full SHA for fcd3c76

• Implemented logic for the custom time to be sent to the TrackStoppedActivity file.

  e3ham

  committed
  e41965c

  Copy full SHA for e41965c

Commits on Apr 8, 2024

• Display "Customize" is selected when user clicked

  XeqtR0

  committed
  1a7cd5f

  Copy full SHA for 1a7cd5f

Commits on Apr 9, 2024

• Fix custom time

  Show description for 77fa34f
  c-eric

  committed
  77fa34f

  Copy full SHA for 77fa34f

• Minor changes

  c-eric

  committed
  67d54fa

  Copy full SHA for 67d54fa