brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								c3424b9996
								
							
						 | 
						
							
							
								
								archive subjects
							
							
							
							
							
						 | 
						
							2023-05-09 22:26:11 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								d4c017ef1b
								
							
						 | 
						
							
							
								
								add time to task when saving session report
							
							
							
							
							
						 | 
						
							2023-05-09 22:11:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								e333a0f626
								
							
						 | 
						
							
							
								
								fix selectedTask
							
							
							
							
							
						 | 
						
							2023-05-09 22:03:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e4200057b
								
							
						 | 
						
							
							
								
								fix selectedSubject
							
							
							
							
							
						 | 
						
							2023-05-09 21:56:25 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9cc4f4a0c
								
							
						 | 
						
							
							
								
								show studytime
							
							
							
							
							
						 | 
						
							2023-05-09 21:37:26 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec31e116b4
								
							
						 | 
						
							
							
								
								refactor subjectscreen to use uiState
							
							
							
							
							
						 | 
						
							2023-05-09 21:29:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								a60422e004
								
							
						 | 
						
							
							
								
								refactor DAO's
							
							
							
							
							
						 | 
						
							2023-05-09 21:01:19 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a395fbd4e
								
							
						 | 
						
							
							
								
								implement TaskDAO as a very simple fluent interface
							
							
							
							
							
						 | 
						
							2023-05-09 20:30:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								e35f143854
								
							
						 | 
						
							
							
								
								archive tasks
							
							
							
							
							
						 | 
						
							2023-05-09 16:00:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								5f8b7d7a7b
								
							
						 | 
						
							
							
								
								show #tasks and #completedTasks in subject entry
							
							
							
							
							
						 | 
						
							2023-05-09 15:30:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								366f236f98
								
							
						 | 
						
							
							
								
								add previews for feed
							
							
							
							
							
						 | 
						
							2023-05-08 22:14:17 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ba0018765
								
							
						 | 
						
							
							
								
								refactor feed to use UiState.Loading
							
							
							
							
							
						 | 
						
							2023-05-08 21:51:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								d31276ef81
								
							
						 | 
						
							
							
								
								refactor Feed
							
							
							
							
							
						 | 
						
							2023-05-08 21:21:14 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								08c779030e
								
							
						 | 
						
							
							
								
								refactor FeedEntry
							
							
							
							
							
						 | 
						
							2023-05-08 21:05:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								9df80f4f93
								
							
						 | 
						
							
							
								
								Fix: double counted entries
							
							
							
							
							
						 | 
						
							2023-05-08 17:40:23 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								c62d15ee99
								
							
						 | 
						
							
							
								
								comment in homescreen weg
							
							
							
							
							
						 | 
						
							2023-05-08 17:10:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a214ce97c
								
							
						 | 
						
							
							
								
								change name of button function
							
							
							
							
							
						 | 
						
							2023-05-07 17:23:43 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								d036afc319
								
							
						 | 
						
							
							
								
								Docs
							
							
							
							
							
						 | 
						
							2023-05-07 17:10:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								b5b3205971
								
							
						 | 
						
							
							
								
								#74 UI Refactor
							
							
							
							
							
						 | 
						
							2023-05-07 16:59:23 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								afe58572a6
								
							
						 | 
						
							
							
								
								#74 fusing entries only on a daily basis
							
							
							
							
							
						 | 
						
							2023-05-07 16:58:25 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e8fb28b02
								
							
						 | 
						
							
							
								
								#74 dao returns map
							
							
							
							
							
						 | 
						
							2023-05-07 16:11:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac1bfe4d49
								
							
						 | 
						
							
							
								
								#74 feed now had dates
							
							
							
							
							
						 | 
						
							2023-05-07 16:10:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								f3a8c93a3e
								
							
						 | 
						
							
							
								
								#74 getFeedentries now returns a map with date as key and as value the entries for that day
							
							
							
							
							
						 | 
						
							2023-05-07 16:10:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f6d416f39
								
							
						 | 
						
							
							
								
								#74 feed is now sorted on taskdates
							
							
							
							
							
						 | 
						
							2023-05-07 14:26:07 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								260171a972
								
							
						 | 
						
							
							
								
								#74 feedEntry now has an endTime
							
							
							
							
							
						 | 
						
							2023-05-07 14:25:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								49835108f3
								
							
						 | 
						
							
							
								
								subject id and taskid as parameters for getSessionReport
							
							
							
							
							
						 | 
						
							2023-05-07 14:05:43 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								4728755c5e
								
							
						 | 
						
							
							
								
								#74 homescreen now contains a feed
							
							
							
							
							
						 | 
						
							2023-05-07 14:04:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								190c3467ec
								
							
						 | 
						
							
							
								
								#74 viewmodel of a feed
							
							
							
							
							
						 | 
						
							2023-05-07 14:03:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								f7b5d5170d
								
							
						 | 
						
							
							
								
								#74 made a feed
							
							
							
							
							
						 | 
						
							2023-05-07 14:02:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								2db431463d
								
							
						 | 
						
							
							
								
								sessionreport needs if of subjectId and taskId
							
							
							
							
							
						 | 
						
							2023-05-07 14:02:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								07ff75476d
								
							
						 | 
						
							
							
								
								added getTask to interface
							
							
							
							
							
						 | 
						
							2023-05-07 14:00:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c224446a8
								
							
						 | 
						
							
							
								
								added getSubject to interface
							
							
							
							
							
						 | 
						
							2023-05-07 14:00:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c7c96d73a
								
							
						 | 
						
							
							
								
								#74 added single getTask so feed kan fetch only one Task
							
							
							
							
							
						 | 
						
							2023-05-07 13:59:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								dab4506a34
								
							
						 | 
						
							
							
								
								#74 added single getSubject so feed kan fetch only one subject
							
							
							
							
							
						 | 
						
							2023-05-07 13:59:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								bee7101bef
								
							
						 | 
						
							
							
								
								#74 added FeedDAO and firebase implementation
							
							
							
							
							
						 | 
						
							2023-05-07 13:58:02 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0ea97dc52
								
							
						 | 
						
							
							
								
								#74 added bind for feedDAO
							
							
							
							
							
						 | 
						
							2023-05-07 13:57:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								05d93246a6
								
							
						 | 
						
							
							
								
								sessionreport now also has a task and subject id
							
							
							
							
							
						 | 
						
							2023-05-07 13:56:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								83fba0de70
								
							
						 | 
						
							
							
								
								#74 added a feedEntry dataclass
							
							
							
							
							
						 | 
						
							2023-05-07 13:55:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								45f28592ab
								
							
						 | 
						
							
							
								
								sessionreport now has the id of the task
							
							
							
							
							
						 | 
						
							2023-05-07 10:08:02 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								1eff33a6db
								
							
						 | 
						
							
							
								
								start task now goes to timer selection screen
							
							
							
							
							
						 | 
						
							2023-05-07 09:37:07 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b8d59cb75
								
							
						 | 
						
							
							
								
								resolve merge conflicts when merging to development
							
							
							
							
							
						 | 
						
							2023-05-05 11:25:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									brreynie
								
							 
						 | 
						
							
							
							
							
								
							
							
								f7a3d68c3e
								
							
						 | 
						
							
							
								
								extract StudeezNavGraph out of StudeezApp
							
							
							
							
							
						 | 
						
							2023-05-05 11:10:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukas Barragan Torres
								
							 
						 | 
						
							
							
							
							
								
							
							
								13b9c0591f
								
							
						 | 
						
							
							
								
								resolve conflicts and merge
							
							
							
							
							
						 | 
						
							2023-05-05 11:02:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								620722038d
								
							
						 | 
						
							
							
								
								Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/TimerFormRoute.kt
							
							
							
							
							
							
							
							Co-authored-by: Tibo De Peuter <Tibo.DePeuter@UGent.be> 
							
						 | 
						
							2023-05-05 08:27:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b1ff3f02d
								
							
						 | 
						
							
							
								
								removed previous add screen
							
							
							
							
							
						 | 
						
							2023-05-05 00:09:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								6144afe03f
								
							
						 | 
						
							
							
								
								TimerEditRoute en TimerAddRoute staan op andere plaatsen
							
							
							
							
							
						 | 
						
							2023-05-05 00:06:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								2556e1c658
								
							
						 | 
						
							
							
								
								TimerFormViewModel ipv TimerEditViewModel
							
							
							
							
							
						 | 
						
							2023-05-05 00:05:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								51af1f5766
								
							
						 | 
						
							
							
								
								edit route en add route staan in dezelfde TimerFormRoute File
							
							
							
							
							
						 | 
						
							2023-05-05 00:04:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f615c94a1
								
							
						 | 
						
							
							
								
								GetTimerEditScreen -> GetTimerFormScreen
							
							
							
							
							
						 | 
						
							2023-05-05 00:03:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lbarraga
								
							 
						 | 
						
							
							
							
							
								
							
							
								853a2d8c28
								
							
						 | 
						
							
							
								
								select timer type string resource and package refactor
							
							
							
							
							
						 | 
						
							2023-05-05 00:03:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |