| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 lbarraga | 86c7a0e6a8 | *EditScreen -> *FormScreen | 2023-05-05 00:01:01 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 165fe4ca86 | added edit screen string | 2023-05-04 22:58:35 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 4015a806be | saveTimer -> editTimer | 2023-05-04 22:57:31 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 534a88db5d | changed savedTimer to editTimer | 2023-05-04 22:56:26 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | b909c7dd15 | open add route instead of edit screen | 2023-05-04 22:55:41 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 11e7990ee9 | added timer add route | 2023-05-04 22:54:59 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 24fe1b4f78 | added add screen to routes | 2023-05-04 22:54:12 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | e2ada0b9d4 | fix mergeconflict when merging tasksoverview | 2023-05-04 22:12:08 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | b6e3c8d5be | small string fix | 2023-05-04 21:38:16 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | a28a425c3c | fix string resource inconsistencies | 2023-05-04 21:37:02 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | d80f12dfdf | Merge branch 'tasksoverview' of github.ugent.be:SELab1/project2023-groep-14 into tasksoverview | 2023-05-04 12:36:51 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | fec9565f69 | fix hardcoded fieldname in taskDAO | 2023-05-04 12:36:28 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 9faea56056 | localisation improvements | 2023-05-04 12:33:51 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | cfb624b6b6 | added error for invalid repeats | 2023-05-04 12:23:58 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 3fc3bee8c2 | added error label for breaktimeEdit | 2023-05-04 12:23:26 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 4d064ad319 | made repeats public | 2023-05-04 12:23:05 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 0b65c44da1 | added error inputfield | 2023-05-04 12:22:42 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | e1b60b342d | fix stealthbutton and add button to not use hardcoded gray | 2023-05-04 12:21:04 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 1f1583dcd1 | fix overflow preview for subject entry | 2023-05-04 12:12:00 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | b0fb97c29c | Update app/src/main/java/be/ugent/sel/studeez/screens/tasks/forms/SubjectFormUiState.kt Co-authored-by: Tibo De Peuter <Tibo.DePeuter@UGent.be> | 2023-05-04 12:02:59 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 7934154af9 | removed own add screenn (niet dat van Rune) + minor refactor | 2023-05-04 10:46:14 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 61b3c87142 | forgot to remove 20 labels test | 2023-05-04 10:29:34 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 9688426093 | intermediate type select screen for add and route to edit instead of add | 2023-05-04 10:27:20 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 46109ac4ff | Resolved merge conflicts (call with friends) | 2023-05-04 00:12:04 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 6765229d37 | #13 and #17 form for creating, editing and deleting tasks | 2023-05-03 23:18:53 +02:00 |  | 
				
					
						|  | 3e721be32c | Merge branch 'development' into addTimer | 2023-05-03 22:46:39 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 6a676c2fad | fix username -> name | 2023-05-03 22:22:52 +02:00 |  | 
				
					
						|  | ee7914d0c9 | Merge pull request #93 from SELab1/custom_timer Custom timer | 2023-05-03 22:09:06 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | fc1d12e214 | #15 make form functional | 2023-05-03 22:06:30 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 831050f3f2 | #15 and #16 form to create and edit subject | 2023-05-03 21:48:23 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | ff77227ea8 | removed Wheelpicker from imports | 2023-05-03 19:59:33 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | 8e3cca531a | time picker composable shows picked hour and not current hour | 2023-05-03 16:19:27 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 71590bd5a2 | #23 toggle task completed and #24 delete task | 2023-05-03 14:58:41 +02:00 |  | 
				
					
						| 
								
								
									 Lukas Barragan Torres | e0f46d676b | changed Time increase and decrease functions | 2023-05-03 13:53:35 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | b7a74a13d7 | #22 style task entry | 2023-05-03 11:38:36 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | ffb67cd1b2 | fix navbar to show tasks as selected | 2023-05-02 23:15:42 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | da4c51b726 | #25 delete subject | 2023-05-02 23:07:04 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 056947e1db | #22 get tasks from firestore | 2023-05-02 22:57:35 +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 |  | 
				
					
						|  | 1bf96c2200 | Add missing resources #94 | 2023-05-02 22:50:28 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | e1c05bb0d4 | "#22 styling of task overview" | 2023-05-02 22:27:05 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 1a2e192227 | #22 boilerplate for task screen | 2023-05-02 21:39:21 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 7ad1047091 | #21 further styling subject | 2023-05-02 21:11:27 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 51c8fb122d | merge with dev | 2023-05-02 17:21:26 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 4b4c9539f8 | addTimer finished | 2023-05-02 13:57:03 +02:00 |  | 
				
					
						|  | 5788053c75 | #67 fix fab position | 2023-05-01 21:43:58 +02:00 |  |