| 
							
						 | 
						
							
							
							
							
								
							
							
								ee7914d0c9
								
							
						 | 
						
							
							
								
								Merge pull request #93 from SELab1/custom_timer
							
							
							
							
							
							
							
							Custom timer 
							
						 | 
						
							2023-05-03 22:09:06 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								3ff2ed225b
								
							
						 | 
						
							
							
								
								Codestyle #94
							
							
							
							
							
						 | 
						
							2023-05-02 22:51:07 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								aea49295a0
								
							
						 | 
						
							
							
								
								Exit profile edit screen on save #94
							
							
							
							
							
						 | 
						
							2023-05-02 22:50:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								5788053c75
								
							
						 | 
						
							
							
								
								#67 fix fab position
							
							
							
							
							
						 | 
						
							2023-05-01 21:43:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								e65c2fe002
								
							
						 | 
						
							
							
								
								#67 fab unfixed pos
							
							
							
							
							
						 | 
						
							2023-05-01 21:33:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f74da5abc3
								
							
						 | 
						
							
							
								
								#67 fab styling
							
							
							
							
							
						 | 
						
							2023-05-01 19:45:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								5a2632c08a
								
							
						 | 
						
							
							
								
								Add snackbars for missing features
							
							
							
							
							
						 | 
						
							2023-05-01 19:28:50 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								e458927c28
								
							
						 | 
						
							
							
								
								Temp settings screen for feedback
							
							
							
							
							
						 | 
						
							2023-05-01 19:19:45 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								dfd97c8d33
								
							
						 | 
						
							
							
								
								Temp sessions screen for feedback
							
							
							
							
							
						 | 
						
							2023-05-01 19:13:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								89b9c23123
								
							
						 | 
						
							
							
								
								Use TimePickerButton
							
							
							
							
							
						 | 
						
							2023-05-01 13:44:50 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c73c5a853
								
							
						 | 
						
							
							
								
								added visitor to TimerInfo
							
							
							
							
							
						 | 
						
							2023-05-01 13:21:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								964cd8a6ae
								
							
						 | 
						
							
							
								
								added singleLine parameter (default false)
							
							
							
							
							
						 | 
						
							2023-05-01 13:20:14 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								7046a2a985
								
							
						 | 
						
							
							
								
								HMS now takes ints and has totalseconds and tostring functions
							
							
							
							
							
						 | 
						
							2023-05-01 13:16:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c62e13caa
								
							
						 | 
						
							
							
								
								timepicker button met popup-klok functionaliteit
							
							
							
							
							
						 | 
						
							2023-05-01 13:16:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								da79195e8d
								
							
						 | 
						
							
							
								
								#67 working popup, not styled
							
							
							
							
							
						 | 
						
							2023-05-01 12:35:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								0a409421a8
								
							
						 | 
						
							
							
								
								Cleanup destinations
							
							
							
							
							
						 | 
						
							2023-05-01 10:26:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								3bf0157adc
								
							
						 | 
						
							
							
								
								#26 Show selected time
							
							
							
							
							
						 | 
						
							2023-04-30 12:26:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								024ce85266
								
							
						 | 
						
							
							
								
								#26 select time for custom timer
							
							
							
							
							
						 | 
						
							2023-04-29 17:55:20 +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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2648509ac
								
							
						 | 
						
							
							
								
								remove bracket
							
							
							
							
							
						 | 
						
							2023-04-28 11:43:53 +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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |