Rune Dyselinck
|
0a55771ece
|
all tests fixed
|
2023-05-15 23:28:44 +02:00 |
|
Rune Dyselinck
|
31e78856c0
|
normal test fails
|
2023-05-15 22:52:44 +02:00 |
|
Rune Dyselinck
|
860fb5fac1
|
ui tests
|
2023-05-15 21:53:04 +02:00 |
|
lbarraga
|
19a073f8c6
|
Merge pull request #120 from SELab1/abstract2composition_refactor_session_screen
Abstract2composition refactor session screen
|
2023-05-15 21:48:03 +02:00 |
|
lbarraga
|
924e136153
|
resolve merge conflicts
|
2023-05-15 21:47:28 +02:00 |
|
lbarraga
|
3386d45a04
|
Merge pull request #111 from SELab1/delete_timer
Delete timer
|
2023-05-15 21:43:23 +02:00 |
|
lbarraga
|
61f6e2ac25
|
solve merge issues
|
2023-05-15 21:43:02 +02:00 |
|
brreynie
|
cfc80b6307
|
Merge pull request #113 from SELab1/better_screens
Better session recap screen
|
2023-05-15 21:02:01 +02:00 |
|
lbarraga
|
5ddd92a66f
|
'merge' dots
|
2023-05-15 20:58:37 +02:00 |
|
brreynie
|
654abb7690
|
Merge branch 'development' into better_screens
|
2023-05-15 20:55:20 +02:00 |
|
brreynie
|
9ea4f73187
|
i18n improvement
|
2023-05-15 20:54:47 +02:00 |
|
brreynie
|
e3c31d4f8d
|
Merge pull request #114 from SELab1/bugfixes
Bugfixes
|
2023-05-15 20:36:38 +02:00 |
|
brreynie
|
53993bb2f0
|
Merge branch 'development' into bugfixes
|
2023-05-15 20:36:17 +02:00 |
|
lbarraga
|
6554a92f83
|
remove imports sessionroute
|
2023-05-15 19:22:46 +02:00 |
|
lbarraga
|
0487347c8f
|
cleanup sessionroute
|
2023-05-15 19:18:47 +02:00 |
|
lbarraga
|
9573a2eb5c
|
changed location of sessionscreens
|
2023-05-15 19:09:14 +02:00 |
|
lbarraga
|
346b24aabe
|
give soundplayer to visitor
|
2023-05-15 19:05:43 +02:00 |
|
lbarraga
|
53bdf7d215
|
added callMediaPlayer call
|
2023-05-15 19:02:55 +02:00 |
|
lbarraga
|
8294d63e92
|
added callmedia to session screen
|
2023-05-15 19:02:23 +02:00 |
|
lbarraga
|
4749108992
|
soundplayer to screens instead of mediaplayer
|
2023-05-15 19:01:06 +02:00 |
|
lbarraga
|
1db5a4160e
|
refactor soundplayer location
|
2023-05-15 19:00:36 +02:00 |
|
lbarraga
|
4a04a703db
|
soundplayer wrapper to make mediaplayer easier to work with
|
2023-05-15 18:58:46 +02:00 |
|
lbarraga
|
4519bf2e30
|
added soundplayer
|
2023-05-15 18:57:24 +02:00 |
|
brreynie
|
c872676618
|
Merge pull request #112 from SELab1/color_picker
Color picker
|
2023-05-15 18:17:48 +02:00 |
|
lbarraga
|
4466f3646f
|
#118 gebruik nieuwe visitor om sessionScreen te instantieren
|
2023-05-15 16:34:19 +02:00 |
|
lbarraga
|
052ebb8c32
|
#118 new visitor for session screen
|
2023-05-15 16:31:36 +02:00 |
|
lbarraga
|
b614f7d530
|
Dots now returns an int
|
2023-05-15 16:30:13 +02:00 |
|
Rune Dyselinck
|
74526bc984
|
proto error
|
2023-05-15 15:58:59 +02:00 |
|
Rune Dyselinck
|
522ecae87a
|
fist test
|
2023-05-15 15:11:50 +02:00 |
|
lbarraga
|
492775565c
|
#118 integrated dots in composition
|
2023-05-15 13:23:32 +02:00 |
|
lbarraga
|
634328cd2a
|
merge development
|
2023-05-15 13:13:59 +02:00 |
|
lbarraga
|
fdd0429e32
|
TimerComposable als apparte file
|
2023-05-15 12:54:37 +02:00 |
|
lbarraga
|
5073e5cb22
|
#118 subclass of AbstractSessionScreen -> this file
|
2023-05-15 12:54:07 +02:00 |
|
lbarraga
|
6938b3e868
|
#118 AbstractSessionScreen -> this file
|
2023-05-15 12:52:57 +02:00 |
|
lbarraga
|
bd1c4df301
|
Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/EndlessTimerFormScreen.kt
Co-authored-by: brreynie <Bram.Reyniers@UGent.be>
|
2023-05-15 11:03:37 +02:00 |
|
lbarraga
|
f722218abe
|
Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/CustomTimerFormScreen.kt
Co-authored-by: brreynie <Bram.Reyniers@UGent.be>
|
2023-05-15 11:03:29 +02:00 |
|
lbarraga
|
29b976cae4
|
Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/BreakTimerFormScreen.kt
Co-authored-by: brreynie <Bram.Reyniers@UGent.be>
|
2023-05-15 11:03:21 +02:00 |
|
lbarraga
|
9d13a33959
|
Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/AbstractTimerFormScreen.kt
Co-authored-by: brreynie <Bram.Reyniers@UGent.be>
|
2023-05-15 11:02:56 +02:00 |
|
Lukas Barragan Torres
|
eef4a8caf5
|
added fillout error text
|
2023-05-13 17:38:29 +02:00 |
|
Lukas Barragan Torres
|
1330396ba8
|
made buttons fill out screen
|
2023-05-13 17:38:04 +02:00 |
|
Lukas Barragan Torres
|
2971ae85aa
|
map implementation
|
2023-05-13 17:37:18 +02:00 |
|
brreynie
|
df0325074d
|
i18n for regenerate button
|
2023-05-13 17:29:25 +02:00 |
|
Lukas Barragan Torres
|
eb28fa4ae4
|
valid and first booleans in map
|
2023-05-13 17:26:19 +02:00 |
|
Lukas Barragan Torres
|
e8f2d71df3
|
deleteTimer Apptext
|
2023-05-13 17:25:51 +02:00 |
|
brreynie
|
360fb122f7
|
some code polishing
|
2023-05-13 17:24:46 +02:00 |
|
brreynie
|
4b09a8011c
|
button to regenerate color
|
2023-05-13 17:22:40 +02:00 |
|
brreynie
|
05e8951edf
|
#109 refactor forms to be more consistent
|
2023-05-13 16:48:53 +02:00 |
|
brreynie
|
0341fcf137
|
clear navStack when ending session
|
2023-05-13 16:31:03 +02:00 |
|
brreynie
|
5f0bdc948f
|
all dots green when ended
|
2023-05-13 15:57:20 +02:00 |
|
brreynie
|
ad0780416d
|
fix dots not showing up correctly
|
2023-05-13 15:54:59 +02:00 |
|