Commit graph

174 commits

Author SHA1 Message Date
Lukas Barragan Torres
3fc3bee8c2 added error label for breaktimeEdit 2023-05-04 12:23:26 +02:00
Lukas Barragan Torres
7934154af9 removed own add screenn (niet dat van Rune) + minor refactor 2023-05-04 10:46:14 +02:00
Lukas Barragan Torres
61b3c87142 forgot to remove 20 labels test 2023-05-04 10:29:34 +02:00
Lukas Barragan Torres
9688426093 intermediate type select screen for add and route to edit instead of add 2023-05-04 10:27:20 +02:00
lbarraga
46109ac4ff Resolved merge conflicts (call with friends) 2023-05-04 00:12:04 +02:00
3e721be32c Merge branch 'development' into addTimer 2023-05-03 22:46:39 +02:00
ee7914d0c9 Merge pull request #93 from SELab1/custom_timer
Custom timer
2023-05-03 22:09:06 +02:00
Lukas Barragan Torres
8e3cca531a time picker composable shows picked hour and not current hour 2023-05-03 16:19:27 +02:00
aea49295a0 Exit profile edit screen on save #94 2023-05-02 22:50:44 +02:00
Rune Dyselinck
51c8fb122d merge with dev 2023-05-02 17:21:26 +02:00
Rune Dyselinck
4b4c9539f8 addTimer finished 2023-05-02 13:57:03 +02:00
e458927c28 Temp settings screen for feedback 2023-05-01 19:19:45 +02:00
dfd97c8d33 Temp sessions screen for feedback 2023-05-01 19:13:18 +02:00
lbarraga
853a09866a #30 go back when timer is saved 2023-05-01 17:58:13 +02:00
lbarraga
bd48a12d52 #30 minor refactor 2023-05-01 17:57:42 +02:00
lbarraga
f1d24087b4 #30 added preview of endless edit screen 2023-05-01 17:56:32 +02:00
lbarraga
cfb356cbf1 #30 added two timepicker cards to break timer edit screen 2023-05-01 17:55:48 +02:00
lbarraga
ea2c91d59a #30 added timepicker card to custom timer edit screen 2023-05-01 17:55:25 +02:00
lbarraga
48a1a50a5f #30 added textfieldStates to editScreen 2023-05-01 17:54:31 +02:00
lbarraga
360097cfc5 added timepicker card 2023-05-01 17:50:22 +02:00
89b9c23123 Use TimePickerButton 2023-05-01 13:44:50 +02:00
lbarraga
2c62e13caa timepicker button met popup-klok functionaliteit 2023-05-01 13:16:31 +02:00
lbarraga
d9c281330f #30 geef timerinfo door naar edit scherm en open editscherm bij onEditClick 2023-05-01 13:06:50 +02:00
lbarraga
a218f5fcf5 #30 open wordt nu meegegeven aan de edit functie 2023-05-01 13:05:45 +02:00
lbarraga
6d8f9befb3 #30 timerEdit screen and viewmodel 2023-05-01 13:04:06 +02:00
lbarraga
d1c23fce48 #30 Visitor implementatie om Edit scherm te verkrijgen 2023-05-01 13:03:12 +02:00
lbarraga
e592a6acc0 #30 hierarchical edit screen structure 2023-05-01 13:02:29 +02:00
lbarraga
59c4d8bb5b hms toString 2023-05-01 13:00:18 +02:00
lbarraga
5b0cff2376 timepicker button met popup-klok functionaliteit 2023-05-01 12:51:46 +02:00
da79195e8d #67 working popup, not styled 2023-05-01 12:35:08 +02:00
0a409421a8 Cleanup destinations 2023-05-01 10:26:08 +02:00
3bf0157adc #26 Show selected time 2023-04-30 12:26:29 +02:00
024ce85266 #26 select time for custom timer 2023-04-29 17:55:20 +02:00
Rune Dyselinck
2ca7d062f3 mediaplayer null safe listeners 2023-04-28 19:02:10 +02:00
Rune Dyselinck
94336348c5 merge dev 2023-04-28 15:50:44 +02:00
Rune Dyselinck
8eb199757c InvisibleSessionManager.kt fixed 2023-04-28 15:30:57 +02:00
Rune Dyselinck
e421430f0b mediaplayer in AbstractSessionScreen + InvisibleSessionManagerTest.kt fixed 2023-04-28 14:42:37 +02:00
Rune Dyselinck
46d60e100b mediaplayer out of view 2023-04-28 13:38:17 +02:00
76e69dd03c Fix problems 2023-04-28 12:42:36 +02:00
lbarraga
4d05e101df Merge branch 'development' into session_recap 2023-04-28 12:21:58 +02:00
brreynie
ef267e3477 Merge pull request #89 from SELab1/small_changes
Small changes
2023-04-28 12:20:27 +02:00
lbarraga
75429b2638 Merge branch 'development' into session_recap 2023-04-28 12:13:47 +02:00
brreynie
010c7cff54 extract navbar and draweractions to StudeezNavGraph 2023-04-28 12:13:06 +02:00
Lukas Barragan Torres
a2648509ac remove bracket 2023-04-28 11:43:53 +02:00
Rune Dyselinck
535ef85c6d LazyColumn in progress of being fixed 2023-04-28 11:42:03 +02:00
cf91d727a0 Minor styling of timerentries 2023-04-28 00:15:09 +02:00
18a055c599 TimerSelection is now secondary 2023-04-27 23:15:25 +02:00
Rune Dyselinck
2ca112ee0e LazyColumn not fixed 2023-04-27 17:01:39 +02:00
lbarraga
71a6bce61c preview error fix 2023-04-26 19:26:46 +02:00
Lukas Barragan Torres
9a18bcc414 preview + visitor refactor 2023-04-26 14:34:44 +02:00