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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf93428fdc
								
							
						 | 
						
							
							
								
								Merge branch 'development' into timers
							
							
							
							
							
						 | 
						
							2023-04-17 10:48:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								85f8abacf0
								
							
						 | 
						
							
							
								
								#65 added session screen to navgraph
							
							
							
							
							
						 | 
						
							2023-04-17 10:12:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								169a7d3469
								
							
						 | 
						
							
							
								
								#65 sessionscreen
							
							
							
							
							
						 | 
						
							2023-04-17 10:11:19 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								ffaedf5542
								
							
						 | 
						
							
							
								
								#65 sessionsclick now routes to sessionscreen
							
							
							
							
							
						 | 
						
							2023-04-17 10:09:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								26f98480f4
								
							
						 | 
						
							
							
								
								padding on hours minutes seconds
							
							
							
							
							
						 | 
						
							2023-04-17 10:07:11 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								b43d775039
								
							
						 | 
						
							
							
								
								#65 added session screen to destinations
							
							
							
							
							
						 | 
						
							2023-04-17 10:05:09 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7f316675c
								
							
						 | 
						
							
							
								
								#65 functional timer abstract class and subclasses
							
							
							
							
							
						 | 
						
							2023-04-16 23:37:19 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								89eda17bc2
								
							
						 | 
						
							
							
								
								#40 timer_overview screen added to navgraph
							
							
							
							
							
						 | 
						
							2023-04-16 23:34:19 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								880236e1ce
								
							
						 | 
						
							
							
								
								#40 viewmodel for overview screen
							
							
							
							
							
						 | 
						
							2023-04-16 23:33:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								049138bbc5
								
							
						 | 
						
							
							
								
								#40 basic timer overview screen (to be extended)
							
							
							
							
							
						 | 
						
							2023-04-16 23:32:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								79dcede47b
								
							
						 | 
						
							
							
								
								fetch configutation on startup
							
							
							
							
							
						 | 
						
							2023-04-16 23:31:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf97565dec
								
							
						 | 
						
							
							
								
								#40 added onTimersClick implementation
							
							
							
							
							
						 | 
						
							2023-04-16 23:30:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								16eb7d14f2
								
							
						 | 
						
							
							
								
								#40 added timer overview to destinations
							
							
							
							
							
						 | 
						
							2023-04-16 23:29:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								28b3260191
								
							
						 | 
						
							
							
								
								added timerdao and config service binds
							
							
							
							
							
						 | 
						
							2023-04-16 23:28:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								505f5c882a
								
							
						 | 
						
							
							
								
								converter to convert TimerJson to TimerInfo
							
							
							
							
							
						 | 
						
							2023-04-16 23:27:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce57425957
								
							
						 | 
						
							
							
								
								#40 DAO to fetch the timers from the database. User timers only or combined (user + default)
							
							
							
							
							
						 | 
						
							2023-04-16 23:25:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								2a546146a3
								
							
						 | 
						
							
							
								
								Configuration service fetches default timers
							
							
							
							
							
						 | 
						
							2023-04-16 23:22:23 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c183b9cc7
								
							
						 | 
						
							
							
								
								#40 timer info class and subclasses, used for display of a timer
							
							
							
							
							
						 | 
						
							2023-04-16 23:20:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								5e2c8de521
								
							
						 | 
						
							
							
								
								#18 Edit and delete profile implemented
							
							
							
							
							
						 | 
						
							2023-04-16 22:40:43 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f263b34c12
								
							
						 | 
						
							
							
								
								#18 Working update username
							
							
							
							
							
						 | 
						
							2023-04-16 22:08:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |