| 
							
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								7b3a82cc30
								
							
						 | 
						
							
							
								
								New DrawerScreen for TimerOverView
							
							
							
							
							
						 | 
						
							2023-04-25 09:43:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rune Dyselinck
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c105f96a9
								
							
						 | 
						
							
							
								
								mediaplayer from SessionScreen.kt instead of MainActivity.kt
							
							
							
							
							
						 | 
						
							2023-04-25 09:37:50 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rune Dyselinck
								
							 
						 | 
						
							
							
							
							
								
							
							
								addfb7e126
								
							
						 | 
						
							
							
								
								temporary solution to notification when app is in background
							
							
							
							
							
						 | 
						
							2023-04-25 08:44:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rune Dyselinck
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea4e7a4790
								
							
						 | 
						
							
							
								
								timer can run when invisible (but no sound)
							
							
							
							
							
						 | 
						
							2023-04-24 21:35:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rune Dyselinck
								
							 
						 | 
						
							
							
							
							
								
							
							
								e20e972b88
								
							
						 | 
						
							
							
								
								localdatetime version
							
							
							
							
							
						 | 
						
							2023-04-24 19:52:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								fce9ea45b7
								
							
						 | 
						
							
							
								
								comment out mediaplayer to avoid crashes
							
							
							
							
							
						 | 
						
							2023-04-24 16:30:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								bbdcd0140c
								
							
						 | 
						
							
							
								
								refactor NavGraph so viewModel for drawer and navbar are shared across app
							
							
							
							
							
						 | 
						
							2023-04-24 16:07:25 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								097d1ea134
								
							
						 | 
						
							
							
								
								decouple button from timerEntry
							
							
							
							
							
						 | 
						
							2023-04-24 15:41:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rune Dyselinck
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc43b26dc0
								
							
						 | 
						
							
							
								
								timerstates fixed
							
							
							
							
							
						 | 
						
							2023-04-24 12:17:43 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								70449500cc
								
							
						 | 
						
							
							
								
								try to fix crash because of mediaplayer
							
							
							
							
							
						 | 
						
							2023-04-24 00:18:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bfa96bab7
								
							
						 | 
						
							
							
								
								wrap SessionScreen in route
							
							
							
							
							
						 | 
						
							2023-04-23 23:33:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1efad5120
								
							
						 | 
						
							
							
								
								fix timerselection going to timeroverview
							
							
							
							
							
						 | 
						
							2023-04-23 00:40:14 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |