brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e501fbf92
								
							
						 | 
						
							
							
								
								move drawer en navbar to common.composable
							
							
							
							
							
						 | 
						
							2023-04-23 00:37:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5b62e0cb9
								
							
						 | 
						
							
							
								
								move TimerEntry to common.composable
							
							
							
							
							
						 | 
						
							2023-04-23 00:34:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								08a33d1c9e
								
							
						 | 
						
							
							
								
								wrap timerselection in route
							
							
							
							
							
						 | 
						
							2023-04-23 00:31:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								480f085325
								
							
						 | 
						
							
							
								
								wrap timeroverview in route
							
							
							
							
							
						 | 
						
							2023-04-23 00:12:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								c401a29061
								
							
						 | 
						
							
							
								
								wrap splash in route
							
							
							
							
							
						 | 
						
							2023-04-22 23:47:28 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								95140e1739
								
							
						 | 
						
							
							
								
								wrap signupscreen in route
							
							
							
							
							
						 | 
						
							2023-04-22 23:39:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								3fd191cccc
								
							
						 | 
						
							
							
								
								wrap profilescreen in route
							
							
							
							
							
						 | 
						
							2023-04-22 23:25:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								90170eb635
								
							
						 | 
						
							
							
								
								wrap profileEditScreen in route
							
							
							
							
							
						 | 
						
							2023-04-22 23:03:01 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								de42f090ef
								
							
						 | 
						
							
							
								
								wrap loginscreen in route
							
							
							
							
							
						 | 
						
							2023-04-22 22:48:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								8fc4ac8cf1
								
							
						 | 
						
							
							
								
								wrap homescreen in route
							
							
							
							
							
						 | 
						
							2023-04-22 22:28:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								05c37b4168
								
							
						 | 
						
							
							
								
								refactor navbar to not need viewmodel in constructor
							
							
							
							
							
						 | 
						
							2023-04-22 22:16:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								9da9873b58
								
							
						 | 
						
							
							
								
								refactor primaryScreenTemplate to not create drawerViewModel
							
							
							
							
							
						 | 
						
							2023-04-22 22:04:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b2cc879b3
								
							
						 | 
						
							
							
								
								refactor drawer to not need viewmodel in constructor
							
							
							
							
							
						 | 
						
							2023-04-22 21:52:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								0df2b93851
								
							
						 | 
						
							
							
								
								create and use StealthButton to start en edit timer
							
							
							
							
							
						 | 
						
							2023-04-22 20:57:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								295f3b730a
								
							
						 | 
						
							
							
								
								Merge pull request #81 from SELab1/sessionscreen_ui
							
							
							
							
							
							
							
							Sessionscreen UI 
							
						 | 
						
							2023-04-18 23:02:09 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rune Dyselinck
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a68712cd9
								
							
						 | 
						
							
							
								
								nieuwe SessionScreen.kt UI werkt met studystate en alle timer types
							
							
							
							
							
						 | 
						
							2023-04-18 21:22:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								58d0d4fe91
								
							
						 | 
						
							
							
								
								Merge pull request #82 from SELab1/session_report
							
							
							
							
							
							
							
							Session report 
							
						 | 
						
							2023-04-18 16:08:45 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c42f2fbd1
								
							
						 | 
						
							
							
								
								added firebase collection routes to object
							
							
							
							
							
						 | 
						
							2023-04-18 16:03:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rdyselin
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d2c53d4e6
								
							
						 | 
						
							
							
								
								Merge branch 'development' into sessionscreen_ui
							
							
							
							
							
						 | 
						
							2023-04-18 15:41:04 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								447cae2662
								
							
						 | 
						
							
							
								
								#76 added sessionDAO to binds
							
							
							
							
							
						 | 
						
							2023-04-18 15:38:43 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								31e07d2784
								
							
						 | 
						
							
							
								
								#76 added sessionReport
							
							
							
							
							
						 | 
						
							2023-04-18 15:38:19 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a7e1e4c2c
								
							
						 | 
						
							
							
								
								#76 added sessionDAO
							
							
							
							
							
						 | 
						
							2023-04-18 15:37:07 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								1e767d22a4
								
							
						 | 
						
							
							
								
								#76 added sessionDAO
							
							
							
							
							
						 | 
						
							2023-04-18 15:34:41 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rune Dyselinck
								
							 
						 | 
						
							
							
							
							
								
							
							
								d665938375
								
							
						 | 
						
							
							
								
								mediaPlayer word gereleased wanneer sessie word geeindigd
							
							
							
							
							
							
							
							+
mediaPlayer gebruikt prepare() voordat hij word gestart 
							
						 | 
						
							2023-04-18 15:31:14 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								9fd3df68f0
								
							
						 | 
						
							
							
								
								Merge pull request #79 from SELab1/localisation
							
							
							
							
							
							
							
							created studystate for functional timer to improve localisation 
							
						 | 
						
							2023-04-18 15:18:33 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rune Dyselinck
								
							 
						 | 
						
							
							
							
							
								
							
							
								18d11ffbbd
								
							
						 | 
						
							
							
								
								Timer speelt notificatie bij het start en einde van een pauze
							
							
							
							
							
						 | 
						
							2023-04-18 15:15:41 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									reyniersbram
								
							 
						 | 
						
							
							
							
							
								
							
							
								826acc1186
								
							
						 | 
						
							
							
								
								created studystate for functional timer to improve localisation
							
							
							
							
							
						 | 
						
							2023-04-18 14:58:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								3a2d13b3d6
								
							
						 | 
						
							
							
								
								Disable anonymous user
							
							
							
							
							
						 | 
						
							2023-04-18 14:28:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								86bc8d9e1a
								
							
						 | 
						
							
							
								
								Merge pull request #77 from SELab1/timerselection
							
							
							
							
							
							
							
							Timerselection 
							
						 | 
						
							2023-04-18 13:35:50 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								d8b95f5d5b
								
							
						 | 
						
							
							
								
								change name of SelectedTimerRepo to SelectedTimerState
							
							
							
							
							
						 | 
						
							2023-04-18 13:33:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3651bbbe5
								
							
						 | 
						
							
							
								
								BreaktimerInfo -> PomodoroTimerInfo
							
							
							
							
							
						 | 
						
							2023-04-18 13:31:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								38b582ead9
								
							
						 | 
						
							
							
								
								secondaryscreen gone
							
							
							
							
							
						 | 
						
							2023-04-18 13:29:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								63bb3f60ac
								
							
						 | 
						
							
							
								
								add TimerSelectionScreen to imports
							
							
							
							
							
						 | 
						
							2023-04-18 10:43:17 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								8f84c24bad
								
							
						 | 
						
							
							
								
								singleton repo for selectedTimer
							
							
							
							
							
						 | 
						
							2023-04-18 10:41:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								42eb9cf208
								
							
						 | 
						
							
							
								
								get selectedtimer from repository
							
							
							
							
							
						 | 
						
							2023-04-18 10:40:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								b2d010ff3f
								
							
						 | 
						
							
							
								
								#26 timer can be displayed
							
							
							
							
							
						 | 
						
							2023-04-18 10:40:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3e3eaf1fa
								
							
						 | 
						
							
							
								
								#26 session can be started
							
							
							
							
							
						 | 
						
							2023-04-18 10:39:07 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5b9e1dae8
								
							
						 | 
						
							
							
								
								#40 button now starts a new session
							
							
							
							
							
						 | 
						
							2023-04-18 10:36:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rune Dyselinck
								
							 
						 | 
						
							
							
							
							
								
							
							
								2071b31f72
								
							
						 | 
						
							
							
								
								Timer geeft nu correcte UI + timer kan manueel gestopt worden
							
							
							
							
							
						 | 
						
							2023-04-17 22:13:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								ecea5746f4
								
							
						 | 
						
							
							
								
								werkende timers
							
							
							
							
							
						 | 
						
							2023-04-17 21:07:04 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									reyniersbram
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b68373230
								
							
						 | 
						
							
							
								
								#57 finish FunctionalTimer unit tests
							
							
							
							
							
						 | 
						
							2023-04-17 18:46:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									reyniersbram
								
							 
						 | 
						
							
							
							
							
								
							
							
								55b35073c7
								
							
						 | 
						
							
							
								
								#57 FunctionalCustomTimer unit test
							
							
							
							
							
						 | 
						
							2023-04-17 17:50:09 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									reyniersbram
								
							 
						 | 
						
							
							
							
							
								
							
							
								9834ce4a06
								
							
						 | 
						
							
							
								
								refactor getters/setters
							
							
							
							
							
						 | 
						
							2023-04-17 17:31:11 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								199b4c2f6f
								
							
						 | 
						
							
							
								
								onLogoutClick is niet meer nodig
							
							
							
							
							
						 | 
						
							2023-04-17 17:20:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								1bb359374c
								
							
						 | 
						
							
							
								
								onLogoutClick is niet meer nodig
							
							
							
							
							
						 | 
						
							2023-04-17 17:19:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								076381915d
								
							
						 | 
						
							
							
								
								fix issues
							
							
							
							
							
						 | 
						
							2023-04-17 16:00:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e45388242
								
							
						 | 
						
							
							
								
								Update app/src/main/java/be/ugent/sel/studeez/navigation/StudeezDestinations.kt
							
							
							
							
							
							
							
							Co-authored-by: Tibo De Peuter <Tibo.DePeuter@UGent.be> 
							
						 | 
						
							2023-04-17 14:36:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								894a2d0b82
								
							
						 | 
						
							
							
								
								Update app/src/main/java/be/ugent/sel/studeez/domain/implementation/ToTimerConverter.kt
							
							
							
							
							
							
							
							Co-authored-by: Tibo De Peuter <Tibo.DePeuter@UGent.be> 
							
						 | 
						
							2023-04-17 14:36:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce001898fd
								
							
						 | 
						
							
							
								
								Merge branch 'development' into timers
							
							
							
							
							
						 | 
						
							2023-04-17 11:57:33 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								0174114c6c
								
							
						 | 
						
							
							
								
								fix missing bracket
							
							
							
							
							
						 | 
						
							2023-04-17 11:01:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |