| 
								
								
									 brreynie | 53993bb2f0 | Merge branch 'development' into bugfixes | 2023-05-15 20:36:17 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | c872676618 | Merge pull request #112 from SELab1/color_picker Color picker | 2023-05-15 18:17:48 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | df0325074d | i18n for regenerate button | 2023-05-13 17:29:25 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 360fb122f7 | some code polishing | 2023-05-13 17:24:46 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 4b09a8011c | button to regenerate color | 2023-05-13 17:22:40 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 05e8951edf | #109 refactor forms to be more consistent | 2023-05-13 16:48:53 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 0341fcf137 | clear navStack when ending session | 2023-05-13 16:31:03 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 5f0bdc948f | all dots green when ended | 2023-05-13 15:57:20 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | ad0780416d | fix dots not showing up correctly | 2023-05-13 15:54:59 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | d666733abe | #109 fix pomodorotimer doing too many cycles | 2023-05-13 15:51:50 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 93aae20f85 | #109 archiving subject archives all tasks of subject | 2023-05-13 13:22:12 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | a7752e5706 | #99 fix update subject name after edit | 2023-05-10 16:43:14 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | de25ed85b5 | #99 fix subjectentry to use flows for computed values | 2023-05-10 15:50:54 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 00751aaf51 | colorgenerator as extension of Color | 2023-05-10 11:59:28 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 79ed70bb17 | generate random color | 2023-05-10 11:49:18 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | b53e3cdc5a | Merge pull request #108 from SELab1/tasksoverview Tasksoverview | 2023-05-10 10:32:07 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 59044658e6 | Update app/src/main/java/be/ugent/sel/studeez/common/ext/ModifierExt.kt Co-authored-by: lbarraga <Lukas.BarraganTorres@UGent.be> | 2023-05-10 10:27:08 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | efd92ce832 | fix tests unable to compile | 2023-05-10 09:59:17 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 666502e19f | Merge pull request #105 from SELab1/breaktimer_dots Breaktimer dots | 2023-05-10 09:48:59 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 3c1bc9bb1b | refactored all states to communicate between viewmodels | 2023-05-09 23:51:05 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 25ed3dfdd2 | add feedentry overflow preview -> needs fixing | 2023-05-09 23:25:39 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 08b86c15dd | fix hint not very clear | 2023-05-09 23:23:11 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 43ccab6d08 | fix missing rescource string | 2023-05-09 23:20:24 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | e8c073039e | Merge pull request #106 from SELab1/feed Feed | 2023-05-09 23:16:23 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 875732fd2d | changed stealthbutton to blue + disbale feed continue when task or subject is archived | 2023-05-09 23:12:52 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 7706c2d070 | #22 sort tasks by completed | 2023-05-09 22:44:08 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | a5b98d6bf8 | move new-task button to top | 2023-05-09 22:38:23 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | d22d40439d | Merge pull request #104 from SELab1/tasksoverview Tasksoverview | 2023-05-09 22:29:26 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 6a560fee79 | button on feed not visible when task is checked | 2023-05-09 22:29:07 +02:00 |  | 
				
					
						| 
								
								
									 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 | d9d83569db | Merge pull request #103 from SELab1/feed Feed | 2023-05-09 19:33:53 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 529adbcab3 | added feed string | 2023-05-09 16:21:37 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 5992abf9c7 | default of custom timer is 1 hour | 2023-05-09 16:21:08 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 4fa7f97513 | added padding to custom timer time picker button | 2023-05-09 16:20:39 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 5be8432b18 | edit button on the right | 2023-05-09 16:19:38 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 9bf77b556c | added function that opens subject add screen | 2023-05-09 16:19:03 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 0fb3125f6a | #74 button to add subject when user has empty feed | 2023-05-09 16:17:46 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 1293ea3113 | #74 refactor feed | 2023-05-09 16:17:10 +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 |  |