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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |