Commit graph

591 commits

Author SHA1 Message Date
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
brreynie
1e359b9e37 #21 change text in button 2023-04-29 12:31:52 +02:00
brreynie
d03775000a #21 basic subject list 2023-04-29 12:28:30 +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
Lukas Barragan Torres
c3a9826001 remove getView from functional timer and add when in sessionRoute 2023-04-26 11:05:08 +02:00
Rune Dyselinck
04f61c7516 Added test for CustomTimer when app isn't visible 2023-04-26 11:00:06 +02:00
d268fcd389 Rename action to barAction 2023-04-26 10:33:35 +02:00
ce3261df07 Add DrawerScreen preview 2023-04-26 10:29:14 +02:00
05860345b6 less hardcoding 2023-04-25 21:17:57 +02:00
Rune Dyselinck
f46063eba1 isSession vervangend door null waaarden 2023-04-25 20:58:14 +02:00
e73cc798f0 #42 highlight selected screen 2023-04-25 19:27:14 +02:00
lbarraga
5148d2de4e session recap 2023-04-25 18:14:07 +02:00
lbarraga
d381480c43 send sessionreport to state 2023-04-25 18:13:12 +02:00
lbarraga
312fc3167a added openAndPopUp 2023-04-25 18:12:41 +02:00
lbarraga
4e35951850 added ensession 2023-04-25 18:11:45 +02:00
lbarraga
96795d0e18 #76 session recap viewmodel en screen 2023-04-25 18:10:55 +02:00
lbarraga
53d292aef4 #76 added session recap to routes 2023-04-25 18:07:30 +02:00
lbarraga
ae685070ae #76 sessionreportstate om een sessionreport mee te geven van scherm naar scherm 2023-04-25 18:07:06 +02:00
lbarraga
b0c4f44833 #76 total studytime toevoegen aan een functionaltimer 2023-04-25 18:05:33 +02:00
Rune Dyselinck
b30edf6538 merged with current dev 2023-04-25 16:45:00 +02:00
Rune Dyselinck
d5f3962afe tests added 2023-04-25 15:46:13 +02:00
Lukas Barragan Torres
4996d387ad route is now a single file 2023-04-25 15:22:42 +02:00
Lukas Barragan Torres
d318016f95 session screen implementations 2023-04-25 15:22:20 +02:00
Lukas Barragan Torres
ae9a363731 abstract session screen 2023-04-25 15:22:01 +02:00
Lukas Barragan Torres
7fe7416388 added getview function 2023-04-25 15:20:28 +02:00