Commit graph

312 commits

Author SHA1 Message Date
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
2e61ab7304 Merge pull request #94 from SELab1/fab
Fab
2023-05-03 17:06:49 +02:00
3ff2ed225b Codestyle #94 2023-05-02 22:51:07 +02:00
aea49295a0 Exit profile edit screen on save #94 2023-05-02 22:50:44 +02:00
1bf96c2200 Add missing resources #94 2023-05-02 22:50:28 +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
5788053c75 #67 fix fab position 2023-05-01 21:43:58 +02:00
e65c2fe002 #67 fab unfixed pos 2023-05-01 21:33:51 +02:00
f74da5abc3 #67 fab styling 2023-05-01 19:45:35 +02:00
5a2632c08a Add snackbars for missing features 2023-05-01 19:28:50 +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
b2e2941795 Restructuring strings 2023-05-01 19:04:40 +02:00
89b9c23123 Use TimePickerButton 2023-05-01 13:44:50 +02:00
lbarraga
3c73c5a853 added visitor to TimerInfo 2023-05-01 13:21:53 +02:00
lbarraga
964cd8a6ae added singleLine parameter (default false) 2023-05-01 13:20:14 +02:00
lbarraga
7046a2a985 HMS now takes ints and has totalseconds and tostring functions 2023-05-01 13:16:48 +02:00
lbarraga
2c62e13caa timepicker button met popup-klok functionaliteit 2023-05-01 13:16:31 +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
lbarraga
6b7ec41f32 Merge pull request #87 from SELab1/timerfix
Timerfix
2023-04-30 12:23:47 +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
1d53752a30 Merge pull request #91 from SELab1/session_recap
Session recap
2023-04-28 12:33:30 +02:00
2fb90b15c3 Update app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt 2023-04-28 12:32:26 +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
lbarraga
b1955f1338 Merge pull request #86 from SELab1/session_screen_refactor
Session screen refactor
2023-04-28 11:44:29 +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
lbarraga
66a566b779 remove state from tests 2023-04-26 19:07:26 +02:00
Lukas Barragan Torres
9a18bcc414 preview + visitor refactor 2023-04-26 14:34:44 +02:00
Rune Dyselinck
601740f258 secondaryscreentemplate error 2023-04-26 11:38:09 +02:00
e898b6753d Remove log 2023-04-26 11:36:54 +02:00
Lukas Barragan Torres
351547f111 visitor 2023-04-26 11:35:26 +02:00
27526151b0 Cleanup show current tab 2023-04-26 11:20:57 +02:00