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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								8ad82dda43
								
							
						 | 
						
							
							
								
								#18 Basic structure of editing profile screen
							
							
							
							
							
						 | 
						
							2023-04-16 21:49:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								3ff4f82298
								
							
						 | 
						
							
							
								
								#18 Move to edit screen on click
							
							
							
							
							
						 | 
						
							2023-04-16 20:53:47 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								3900e3c18a
								
							
						 | 
						
							
							
								
								#18 add edit profile button
							
							
							
							
							
						 | 
						
							2023-04-16 20:53:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								0af211362d
								
							
						 | 
						
							
							
								
								#14 Username styling
							
							
							
							
							
						 | 
						
							2023-04-16 09:54:23 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								b60603d292
								
							
						 | 
						
							
							
								
								#14 Username working
							
							
							
							
							
						 | 
						
							2023-04-16 09:42:14 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								b790b55ab2
								
							
						 | 
						
							
							
								
								#14 temporary update does not work
							
							
							
							
							
						 | 
						
							2023-04-15 13:32:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								e4066dedd7
								
							
						 | 
						
							
							
								
								#14 Basic navigation around the app
							
							
							
							
							
						 | 
						
							2023-04-15 10:00:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								13140d4e3c
								
							
						 | 
						
							
							
								
								Make use of open instead of always openAndPopUp
							
							
							
							
							
						 | 
						
							2023-04-15 09:45:41 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								da3f8d3377
								
							
						 | 
						
							
							
								
								Use resources in navbar
							
							
							
							
							
						 | 
						
							2023-04-15 09:26:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								fcd8b249d4
								
							
						 | 
						
							
							
								
								Fix preview
							
							
							
							
							
						 | 
						
							2023-04-15 09:23:02 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								125e0a87d1
								
							
						 | 
						
							
							
								
								#58 Add simple screen for login/register
							
							
							
							
							
						 | 
						
							2023-04-15 09:06:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								7c09aac5b3
								
							
						 | 
						
							
							
								
								Proper drawer styling
							
							
							
							
							
						 | 
						
							2023-04-14 13:49:28 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								064a9d3f31
								
							
						 | 
						
							
							
								
								code undupe go brr
							
							
							
							
							
						 | 
						
							2023-04-14 00:03:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								373d7281fe
								
							
						 | 
						
							
							
								
								openAndPopUp needs to be passed down to navbar and drawer
							
							
							
							
							
						 | 
						
							2023-04-14 00:02:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								a5df9cf191
								
							
						 | 
						
							
							
								
								navbar now has a viewModel for each clickable function
							
							
							
							
							
						 | 
						
							2023-04-14 00:01:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5940e4743
								
							
						 | 
						
							
							
								
								now takes viewmodel and open function. Also uses viewmodel functions
							
							
							
							
							
						 | 
						
							2023-04-14 00:00:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								71a42a28e2
								
							
						 | 
						
							
							
								
								openAndPopUp function as argument for prim. screen
							
							
							
							
							
						 | 
						
							2023-04-14 00:00:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e9aab73c2
								
							
						 | 
						
							
							
								
								Drawer now has a viewModel for each clickable function
							
							
							
							
							
						 | 
						
							2023-04-13 23:59:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								cee42e7758
								
							
						 | 
						
							
							
								
								now takes viewmodel and open function. Also uses viewmodel functions
							
							
							
							
							
						 | 
						
							2023-04-13 23:58:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c908033eb
								
							
						 | 
						
							
							
								
								#59 removed comments
							
							
							
							
							
						 | 
						
							2023-04-13 17:48:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								00b5ab8d16
								
							
						 | 
						
							
							
								
								update comments
							
							
							
							
							
							
							
							Co-authored-by: Tibo De Peuter <Tibo.DePeuter@UGent.be> 
							
						 | 
						
							2023-04-13 17:46:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ca65ba8b3
								
							
						 | 
						
							
							
								
								#59 username textfield added
							
							
							
							
							
						 | 
						
							2023-04-13 17:21:45 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								927b99c32a
								
							
						 | 
						
							
							
								
								#59 UserDAO interface
							
							
							
							
							
						 | 
						
							2023-04-13 17:20:50 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3de23dc54
								
							
						 | 
						
							
							
								
								#59 implementation of UserDAO
							
							
							
							
							
						 | 
						
							2023-04-13 17:20:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7ab3aadc1
								
							
						 | 
						
							
							
								
								#59 username is now saved to user document on register
							
							
							
							
							
						 | 
						
							2023-04-13 17:18:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								57d959a510
								
							
						 | 
						
							
							
								
								#59 Added onUsernameChange
							
							
							
							
							
						 | 
						
							2023-04-13 13:57:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								182b8e2213
								
							
						 | 
						
							
							
								
								#59 Added username in ui state
							
							
							
							
							
						 | 
						
							2023-04-13 13:57:17 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |