2023SELab1-project-Studeez

tdpeuter/2023SELab1-project-Studeez

Archived

Fork 0

Commit graph

5b0cff2376 timepicker button met popup-klok functionaliteit lbarraga 2023-05-01 12:51:46 +02:00
da79195e8d #67 working popup, not styled tdpeuter 2023-05-01 12:35:08 +02:00
0a409421a8 Cleanup destinations tdpeuter 2023-05-01 10:09:13 +02:00
3bf0157adc #26 Show selected time tdpeuter 2023-04-30 12:26:29 +02:00
6b7ec41f32 Merge pull request #87 from SELab1/timerfix lbarraga 2023-04-30 12:23:47 +02:00
024ce85266 #26 select time for custom timer tdpeuter 2023-04-29 17:55:20 +02:00
1e359b9e37 #21 change text in button brreynie 2023-04-29 12:31:52 +02:00
d03775000a #21 basic subject list brreynie 2023-04-29 12:28:30 +02:00
2ca7d062f3 mediaplayer null safe listeners Rune Dyselinck 2023-04-28 19:02:10 +02:00
94336348c5 merge dev Rune Dyselinck 2023-04-28 15:50:44 +02:00
8eb199757c InvisibleSessionManager.kt fixed Rune Dyselinck 2023-04-28 15:30:57 +02:00
e421430f0b mediaplayer in AbstractSessionScreen + InvisibleSessionManagerTest.kt fixed Rune Dyselinck 2023-04-28 14:42:37 +02:00
46d60e100b mediaplayer out of view Rune Dyselinck 2023-04-28 13:38:17 +02:00
76e69dd03c Fix problems tdpeuter 2023-04-28 12:42:36 +02:00
1d53752a30 Merge pull request #91 from SELab1/session_recap Tibo De Peuter 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 Tibo De Peuter 2023-04-28 12:32:26 +02:00
4d05e101df Merge branch 'development' into session_recap lbarraga 2023-04-28 12:21:58 +02:00
ef267e3477 Merge pull request #89 from SELab1/small_changes brreynie 2023-04-28 12:20:27 +02:00
75429b2638 Merge branch 'development' into session_recap lbarraga 2023-04-28 12:13:47 +02:00
010c7cff54 extract navbar and draweractions to StudeezNavGraph brreynie 2023-04-28 12:13:06 +02:00
b1955f1338 Merge pull request #86 from SELab1/session_screen_refactor lbarraga 2023-04-28 11:44:29 +02:00
a2648509ac remove bracket Lukas Barragan Torres 2023-04-28 11:43:53 +02:00
5dc2ef802f fix in feedback brreynie 2023-04-28 11:42:24 +02:00
535ef85c6d LazyColumn in progress of being fixed Rune Dyselinck 2023-04-28 11:42:03 +02:00
c51c29b901 feedback klusjesapp brreynie 2023-04-28 11:24:49 +02:00
cf91d727a0 Minor styling of timerentries tdpeuter 2023-04-28 00:15:09 +02:00
18a055c599 TimerSelection is now secondary tdpeuter 2023-04-27 23:15:25 +02:00
2ca112ee0e LazyColumn not fixed Rune Dyselinck 2023-04-27 17:01:39 +02:00
71a6bce61c preview error fix lbarraga 2023-04-26 19:26:46 +02:00
66a566b779 remove state from tests lbarraga 2023-04-26 19:07:26 +02:00
9a18bcc414 preview + visitor refactor Lukas Barragan Torres 2023-04-26 14:34:44 +02:00
601740f258 secondaryscreentemplate error Rune Dyselinck 2023-04-26 11:38:09 +02:00
e898b6753d Remove log tdpeuter 2023-04-26 11:36:54 +02:00
351547f111 visitor Lukas Barragan Torres 2023-04-26 11:35:26 +02:00
27526151b0 Cleanup show current tab tdpeuter 2023-04-26 11:20:57 +02:00
c3a9826001 remove getView from functional timer and add when in sessionRoute Lukas Barragan Torres 2023-04-26 11:05:08 +02:00
04f61c7516 Added test for CustomTimer when app isn't visible Rune Dyselinck 2023-04-26 11:00:06 +02:00
d268fcd389 Rename action to barAction tdpeuter 2023-04-26 10:33:35 +02:00
ce3261df07 Add DrawerScreen preview tdpeuter 2023-04-26 10:29:14 +02:00
05860345b6 less hardcoding tdpeuter 2023-04-25 21:17:57 +02:00
f46063eba1 isSession vervangend door null waaarden Rune Dyselinck 2023-04-25 20:58:14 +02:00
e73cc798f0 #42 highlight selected screen tdpeuter 2023-04-25 19:27:14 +02:00
50e2a3377e refactor to get string in sessionscreen much cleaner brreynie 2023-04-25 18:37:50 +02:00
5148d2de4e session recap lbarraga 2023-04-25 18:14:07 +02:00
d381480c43 send sessionreport to state lbarraga 2023-04-25 18:13:12 +02:00
312fc3167a added openAndPopUp lbarraga 2023-04-25 18:12:41 +02:00
4e35951850 added ensession lbarraga 2023-04-25 18:11:45 +02:00
96795d0e18 #76 session recap viewmodel en screen lbarraga 2023-04-25 18:10:55 +02:00
53d292aef4 #76 added session recap to routes lbarraga 2023-04-25 18:07:30 +02:00
ae685070ae #76 sessionreportstate om een sessionreport mee te geven van scherm naar scherm lbarraga 2023-04-25 18:07:06 +02:00
b0c4f44833 #76 total studytime toevoegen aan een functionaltimer lbarraga 2023-04-25 18:05:33 +02:00
b30edf6538 merged with current dev Rune Dyselinck 2023-04-25 16:45:00 +02:00
d5f3962afe tests added Rune Dyselinck 2023-04-25 15:46:13 +02:00
4996d387ad route is now a single file Lukas Barragan Torres 2023-04-25 15:22:42 +02:00
d318016f95 session screen implementations Lukas Barragan Torres 2023-04-25 15:22:20 +02:00
ae9a363731 abstract session screen Lukas Barragan Torres 2023-04-25 15:22:01 +02:00
7fe7416388 added getview function Lukas Barragan Torres 2023-04-25 15:20:28 +02:00
7b3a82cc30 New DrawerScreen for TimerOverView tdpeuter 2023-04-25 09:43:10 +02:00
9c105f96a9 mediaplayer from SessionScreen.kt instead of MainActivity.kt Rune Dyselinck 2023-04-25 09:37:50 +02:00
addfb7e126 temporary solution to notification when app is in background Rune Dyselinck 2023-04-25 08:44:24 +02:00
ea4e7a4790 timer can run when invisible (but no sound) Rune Dyselinck 2023-04-24 21:35:48 +02:00
e20e972b88 localdatetime version Rune Dyselinck 2023-04-24 19:52:36 +02:00
c73c06b11c Merge pull request #84 from SELab1/screenrefactor brreynie 2023-04-24 16:31:12 +02:00
fce9ea45b7 comment out mediaplayer to avoid crashes brreynie 2023-04-24 16:30:59 +02:00
bbdcd0140c refactor NavGraph so viewModel for drawer and navbar are shared across app brreynie 2023-04-24 16:07:25 +02:00
097d1ea134 decouple button from timerEntry brreynie 2023-04-24 15:41:31 +02:00
dc43b26dc0 timerstates fixed Rune Dyselinck 2023-04-24 12:17:43 +02:00
70449500cc try to fix crash because of mediaplayer brreynie 2023-04-24 00:18:38 +02:00
6bfa96bab7 wrap SessionScreen in route brreynie 2023-04-23 23:33:03 +02:00
adafae332a Merge pull request #83 from SELab1/timerentry brreynie 2023-04-23 12:42:55 +02:00
f1efad5120 fix timerselection going to timeroverview brreynie 2023-04-23 00:40:14 +02:00
4e501fbf92 move drawer en navbar to common.composable brreynie 2023-04-23 00:37:48 +02:00
d5b62e0cb9 move TimerEntry to common.composable brreynie 2023-04-23 00:34:51 +02:00
08a33d1c9e wrap timerselection in route brreynie 2023-04-23 00:31:21 +02:00
480f085325 wrap timeroverview in route brreynie 2023-04-23 00:12:48 +02:00
c401a29061 wrap splash in route brreynie 2023-04-22 23:47:28 +02:00
95140e1739 wrap signupscreen in route brreynie 2023-04-22 23:39:54 +02:00
3fd191cccc wrap profilescreen in route brreynie 2023-04-22 23:25:00 +02:00
90170eb635 wrap profileEditScreen in route brreynie 2023-04-22 23:03:01 +02:00
de42f090ef wrap loginscreen in route brreynie 2023-04-22 22:48:27 +02:00
8fc4ac8cf1 wrap homescreen in route brreynie 2023-04-22 22:28:46 +02:00
05c37b4168 refactor navbar to not need viewmodel in constructor brreynie 2023-04-22 22:16:24 +02:00
9da9873b58 refactor primaryScreenTemplate to not create drawerViewModel brreynie 2023-04-22 22:04:48 +02:00
2b2cc879b3 refactor drawer to not need viewmodel in constructor brreynie 2023-04-22 21:52:49 +02:00
0df2b93851 create and use StealthButton to start en edit timer brreynie 2023-04-22 20:57:49 +02:00
3956c6e5b6 test local gitconfig brreynie 2023-04-20 00:11:02 +02:00
295f3b730a Merge pull request #81 from SELab1/sessionscreen_ui brreynie 2023-04-18 23:02:09 +02:00
3a68712cd9 nieuwe SessionScreen.kt UI werkt met studystate en alle timer types Rune Dyselinck 2023-04-18 21:22:18 +02:00
58d0d4fe91 Merge pull request #82 from SELab1/session_report lbarraga 2023-04-18 16:08:45 +02:00
7c42f2fbd1 added firebase collection routes to object Lukas Barragan Torres 2023-04-18 16:03:22 +02:00
9d2c53d4e6 Merge branch 'development' into sessionscreen_ui rdyselin 2023-04-18 15:41:04 +02:00
447cae2662 #76 added sessionDAO to binds Lukas Barragan Torres 2023-04-18 15:38:43 +02:00
31e07d2784 #76 added sessionReport Lukas Barragan Torres 2023-04-18 15:38:19 +02:00
8a7e1e4c2c #76 added sessionDAO Lukas Barragan Torres 2023-04-18 15:37:07 +02:00
1e767d22a4 #76 added sessionDAO Lukas Barragan Torres 2023-04-18 15:34:41 +02:00
d665938375 mediaPlayer word gereleased wanneer sessie word geeindigd + mediaPlayer gebruikt prepare() voordat hij word gestart Rune Dyselinck 2023-04-18 15:31:14 +02:00
9fd3df68f0 Merge pull request #79 from SELab1/localisation brreynie 2023-04-18 15:18:33 +02:00
18d11ffbbd Timer speelt notificatie bij het start en einde van een pauze Rune Dyselinck 2023-04-18 15:15:41 +02:00
826acc1186 created studystate for functional timer to improve localisation reyniersbram 2023-04-18 14:58:16 +02:00
bd78d74708 Merge pull request #78 from SELab1/authentication Tibo De Peuter 2023-04-18 14:39:39 +02:00