2023SELab1-project-Studeez

tdpeuter/2023SELab1-project-Studeez

Archived

Fork 0

Commit graph

81fa345453 Merge pull request #98 from SELab1/timer_edit lbarraga 2023-05-05 11:02:42 +02:00
13b9c0591f resolve conflicts and merge Lukas Barragan Torres 2023-05-05 11:02:18 +02:00
47edf650ed testen gefixt Rune Dyselinck 2023-05-05 10:48:34 +02:00
620722038d Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/TimerFormRoute.kt lbarraga 2023-05-05 08:27:10 +02:00
0b1ff3f02d removed previous add screen lbarraga 2023-05-05 00:09:52 +02:00
d087783e12 timer type select resource lbarraga 2023-05-05 00:06:50 +02:00
6144afe03f TimerEditRoute en TimerAddRoute staan op andere plaatsen lbarraga 2023-05-05 00:06:13 +02:00
2556e1c658 TimerFormViewModel ipv TimerEditViewModel lbarraga 2023-05-05 00:05:27 +02:00
51af1f5766 edit route en add route staan in dezelfde TimerFormRoute File lbarraga 2023-05-05 00:04:52 +02:00
7f615c94a1 GetTimerEditScreen -> GetTimerFormScreen lbarraga 2023-05-05 00:03:53 +02:00
853a2d8c28 select timer type string resource and package refactor lbarraga 2023-05-05 00:03:05 +02:00
86c7a0e6a8 *EditScreen -> *FormScreen lbarraga 2023-05-05 00:01:01 +02:00
165fe4ca86 added edit screen string lbarraga 2023-05-04 22:58:35 +02:00
4015a806be saveTimer -> editTimer lbarraga 2023-05-04 22:57:31 +02:00
534a88db5d changed savedTimer to editTimer lbarraga 2023-05-04 22:56:26 +02:00
b909c7dd15 open add route instead of edit screen lbarraga 2023-05-04 22:55:41 +02:00
11e7990ee9 added timer add route lbarraga 2023-05-04 22:54:51 +02:00
24fe1b4f78 added add screen to routes lbarraga 2023-05-04 22:54:12 +02:00
d5fbb2adab Merge pull request #97 from SELab1/tasksoverview brreynie 2023-05-04 22:12:48 +02:00
e2ada0b9d4 fix mergeconflict when merging tasksoverview brreynie 2023-05-04 22:12:08 +02:00
b6e3c8d5be small string fix brreynie 2023-05-04 21:38:16 +02:00
a28a425c3c fix string resource inconsistencies lbarraga 2023-05-04 21:37:02 +02:00
d80f12dfdf Merge branch 'tasksoverview' of github.ugent.be:SELab1/project2023-groep-14 into tasksoverview brreynie 2023-05-04 12:36:51 +02:00
fec9565f69 fix hardcoded fieldname in taskDAO brreynie 2023-05-04 12:36:28 +02:00
9faea56056 localisation improvements brreynie 2023-05-04 12:33:51 +02:00
cfb624b6b6 added error for invalid repeats Lukas Barragan Torres 2023-05-04 12:23:58 +02:00
3fc3bee8c2 added error label for breaktimeEdit Lukas Barragan Torres 2023-05-04 12:23:26 +02:00
4d064ad319 made repeats public Lukas Barragan Torres 2023-05-04 12:23:05 +02:00
0b65c44da1 added error inputfield Lukas Barragan Torres 2023-05-04 12:22:42 +02:00
e1b60b342d fix stealthbutton and add button to not use hardcoded gray brreynie 2023-05-04 12:21:04 +02:00
1f1583dcd1 fix overflow preview for subject entry brreynie 2023-05-04 12:12:00 +02:00
b0fb97c29c Update app/src/main/java/be/ugent/sel/studeez/screens/tasks/forms/SubjectFormUiState.kt brreynie 2023-05-04 12:02:59 +02:00
7934154af9 removed own add screenn (niet dat van Rune) + minor refactor Lukas Barragan Torres 2023-05-04 10:46:14 +02:00
61b3c87142 forgot to remove 20 labels test Lukas Barragan Torres 2023-05-04 10:29:34 +02:00
9688426093 intermediate type select screen for add and route to edit instead of add Lukas Barragan Torres 2023-05-04 10:27:20 +02:00
d3159e0b2a Merge pull request #95 from SELab1/timer_edit lbarraga 2023-05-04 00:13:25 +02:00
46109ac4ff Resolved merge conflicts (call with friends) lbarraga 2023-05-04 00:12:04 +02:00
6765229d37 #13 and #17 form for creating, editing and deleting tasks brreynie 2023-05-03 23:18:53 +02:00
6bcc4ce4c4 Merge pull request #96 from SELab1/addTimer Tibo De Peuter 2023-05-03 22:47:10 +02:00
3e721be32c Merge branch 'development' into addTimer Tibo De Peuter 2023-05-03 22:46:39 +02:00
6a676c2fad fix username -> name brreynie 2023-05-03 22:22:52 +02:00
ee7914d0c9 Merge pull request #93 from SELab1/custom_timer Tibo De Peuter 2023-05-03 22:09:06 +02:00
fc1d12e214 #15 make form functional brreynie 2023-05-03 22:06:30 +02:00
831050f3f2 #15 and #16 form to create and edit subject brreynie 2023-05-03 21:48:23 +02:00
ff77227ea8 removed Wheelpicker from imports Lukas Barragan Torres 2023-05-03 19:59:33 +02:00
2e61ab7304 Merge pull request #94 from SELab1/fab Tibo De Peuter 2023-05-03 17:06:49 +02:00
8e3cca531a time picker composable shows picked hour and not current hour Lukas Barragan Torres 2023-05-03 16:19:27 +02:00
71590bd5a2 #23 toggle task completed and #24 delete task brreynie 2023-05-03 14:58:41 +02:00
e0f46d676b changed Time increase and decrease functions Lukas Barragan Torres 2023-05-03 13:53:35 +02:00
b7a74a13d7 #22 style task entry brreynie 2023-05-03 11:38:36 +02:00
ffb67cd1b2 fix navbar to show tasks as selected brreynie 2023-05-02 23:15:42 +02:00
da4c51b726 #25 delete subject brreynie 2023-05-02 23:07:04 +02:00
056947e1db #22 get tasks from firestore brreynie 2023-05-02 22:57:35 +02:00
3ff2ed225b Codestyle #94 tdpeuter 2023-05-02 22:44:53 +02:00
aea49295a0 Exit profile edit screen on save #94 tdpeuter 2023-05-02 22:41:04 +02:00
1bf96c2200 Add missing resources #94 tdpeuter 2023-05-02 22:22:23 +02:00
e1c05bb0d4 "#22 styling of task overview" brreynie 2023-05-02 22:18:56 +02:00
1a2e192227 #22 boilerplate for task screen brreynie 2023-05-02 21:39:21 +02:00
7ad1047091 #21 further styling subject brreynie 2023-05-02 21:11:27 +02:00
51c8fb122d merge with dev Rune Dyselinck 2023-05-02 17:21:26 +02:00
6fb597c7e1 dots in omgekeerde volgorde Lukas Barragan Torres 2023-05-02 16:17:12 +02:00
4b4c9539f8 addTimer finished Rune Dyselinck 2023-05-02 13:57:03 +02:00
173eeb1073 make repeats public lbarraga 2023-05-02 00:19:52 +02:00
47620f69ed added midsection implementation lbarraga 2023-05-02 00:18:59 +02:00
3fb8b08cb4 added midsection lbarraga 2023-05-02 00:18:36 +02:00
5788053c75 #67 fix fab position tdpeuter 2023-05-01 21:43:58 +02:00
e65c2fe002 #67 fab unfixed pos tdpeuter 2023-05-01 21:33:51 +02:00
f74da5abc3 #67 fab styling tdpeuter 2023-05-01 19:45:35 +02:00
5a2632c08a Add snackbars for missing features tdpeuter 2023-05-01 19:28:50 +02:00
e458927c28 Temp settings screen for feedback tdpeuter 2023-05-01 19:19:45 +02:00
dfd97c8d33 Temp sessions screen for feedback tdpeuter 2023-05-01 19:13:18 +02:00
b2e2941795 Restructuring strings tdpeuter 2023-05-01 19:04:40 +02:00
853a09866a #30 go back when timer is saved lbarraga 2023-05-01 17:58:13 +02:00
bd48a12d52 #30 minor refactor lbarraga 2023-05-01 17:57:42 +02:00
f1d24087b4 #30 added preview of endless edit screen lbarraga 2023-05-01 17:56:32 +02:00
cfb356cbf1 #30 added two timepicker cards to break timer edit screen lbarraga 2023-05-01 17:55:48 +02:00
ea2c91d59a #30 added timepicker card to custom timer edit screen lbarraga 2023-05-01 17:55:25 +02:00
48a1a50a5f #30 added textfieldStates to editScreen lbarraga 2023-05-01 17:54:06 +02:00
bfde19caaf making some fields public lbarraga 2023-05-01 17:52:40 +02:00
dafa8cc606 extra constructor HMS that takes total seconds lbarraga 2023-05-01 17:51:51 +02:00
360097cfc5 added timepicker card lbarraga 2023-05-01 17:50:22 +02:00
c33aad5496 #21 begin styling subject brreynie 2023-05-01 15:15:54 +02:00
89b9c23123 Use TimePickerButton tdpeuter 2023-05-01 13:32:52 +02:00
4bbc3af4b2 #21 style button to add subjects/tasks brreynie 2023-05-01 13:38:20 +02:00
3c73c5a853 added visitor to TimerInfo lbarraga 2023-05-01 12:56:50 +02:00
964cd8a6ae added singleLine parameter (default false) lbarraga 2023-05-01 12:54:24 +02:00
7046a2a985 HMS now takes ints and has totalseconds and tostring functions lbarraga 2023-05-01 12:53:35 +02:00
2c62e13caa timepicker button met popup-klok functionaliteit lbarraga 2023-05-01 12:51:46 +02:00
e4fc0a9a07 #30 added edit screen specific text lbarraga 2023-05-01 13:09:24 +02:00
d9c281330f #30 geef timerinfo door naar edit scherm en open editscherm bij onEditClick lbarraga 2023-05-01 13:06:50 +02:00
a218f5fcf5 #30 open wordt nu meegegeven aan de edit functie lbarraga 2023-05-01 13:05:45 +02:00
6d8f9befb3 #30 timerEdit screen and viewmodel lbarraga 2023-05-01 13:04:06 +02:00
d1c23fce48 #30 Visitor implementatie om Edit scherm te verkrijgen lbarraga 2023-05-01 13:03:12 +02:00
e592a6acc0 #30 hierarchical edit screen structure lbarraga 2023-05-01 13:02:29 +02:00
dfbc99ba38 #30 added edit screen to navgraph lbarraga 2023-05-01 13:01:07 +02:00
59c4d8bb5b hms toString lbarraga 2023-05-01 13:00:18 +02:00
ddbac51c9d #30 added edit screen to destinations lbarraga 2023-05-01 12:57:31 +02:00
93a282026e added visitor to TimerInfo lbarraga 2023-05-01 12:56:50 +02:00
f2d45b410e added singleLine parameter (default false) lbarraga 2023-05-01 12:54:24 +02:00
1d6de333e4 HMS now takes ints and has totalseconds and tostring functions lbarraga 2023-05-01 12:53:35 +02:00