2023SELab1-project-Studeez

tdpeuter/2023SELab1-project-Studeez

Archived

Fork 0

Commit graph

eef4a8caf5 added fillout error text Lukas Barragan Torres 2023-05-13 17:38:29 +02:00
1330396ba8 made buttons fill out screen Lukas Barragan Torres 2023-05-13 17:38:04 +02:00
2971ae85aa map implementation Lukas Barragan Torres 2023-05-13 17:27:13 +02:00
df0325074d i18n for regenerate button brreynie 2023-05-13 17:29:25 +02:00
eb28fa4ae4 valid and first booleans in map Lukas Barragan Torres 2023-05-13 17:26:19 +02:00
e8f2d71df3 deleteTimer Apptext Lukas Barragan Torres 2023-05-13 17:25:51 +02:00
360fb122f7 some code polishing brreynie 2023-05-13 17:24:46 +02:00
4b09a8011c button to regenerate color brreynie 2023-05-13 17:22:40 +02:00
05e8951edf #109 refactor forms to be more consistent brreynie 2023-05-13 16:48:53 +02:00
0341fcf137 clear navStack when ending session brreynie 2023-05-13 16:31:03 +02:00
5f0bdc948f all dots green when ended brreynie 2023-05-13 15:57:20 +02:00
ad0780416d fix dots not showing up correctly brreynie 2023-05-13 15:54:59 +02:00
d666733abe #109 fix pomodorotimer doing too many cycles brreynie 2023-05-13 15:51:50 +02:00
a328d2194f isValid is optional and by default true Lukas Barragan Torres 2023-05-13 15:36:04 +02:00
93aae20f85 #109 archiving subject archives all tasks of subject brreynie 2023-05-13 13:22:12 +02:00
61de50ea55 reformat and optimize imports brreynie 2023-05-10 16:52:41 +02:00
a7752e5706 #99 fix update subject name after edit brreynie 2023-05-10 16:43:14 +02:00
de25ed85b5 #99 fix subjectentry to use flows for computed values brreynie 2023-05-10 15:50:54 +02:00
45efd5cb3f small fix Rune Dyselinck 2023-05-10 15:37:34 +02:00
dc63346e5e Merge remote-tracking branch 'origin/development' into better_screens Rune Dyselinck 2023-05-10 15:35:44 +02:00
6bef378fc0 correct aligment Rune Dyselinck 2023-05-10 15:32:39 +02:00
d9f4170fbd emojis in sessionrecap Rune Dyselinck 2023-05-10 15:10:01 +02:00
b4166386a5 added error input field for name and discription Lukas Barragan Torres 2023-05-10 12:46:30 +02:00
d6496cb8ad changed labeled error field to take some states Lukas Barragan Torres 2023-05-10 12:44:51 +02:00
4419c86b05 Unify DAO names tdpeuter 2023-05-10 12:38:58 +02:00
81e777f21d #63 Add bio to profile tdpeuter 2023-05-10 12:13:48 +02:00
00751aaf51 colorgenerator as extension of Color brreynie 2023-05-10 11:59:28 +02:00
79ed70bb17 generate random color brreynie 2023-05-10 11:49:18 +02:00
74d2920562 fix previews for extra button Lukas Barragan Torres 2023-05-10 11:33:34 +02:00
88ebbe4de1 #110 extrabutton added (used for delete) Lukas Barragan Torres 2023-05-10 11:33:15 +02:00
d929415582 #110 added delete timer function in viewmodel Lukas Barragan Torres 2023-05-10 11:32:36 +02:00
9bc64be1ee #110 added extra button in parameters of formscreen Lukas Barragan Torres 2023-05-10 11:32:08 +02:00
d6b2c17f29 bug fix: singleline was by default false Lukas Barragan Torres 2023-05-10 11:31:11 +02:00
b53e3cdc5a Merge pull request #108 from SELab1/tasksoverview brreynie 2023-05-10 10:32:07 +02:00
59044658e6 Update app/src/main/java/be/ugent/sel/studeez/common/ext/ModifierExt.kt brreynie 2023-05-10 10:27:08 +02:00
efd92ce832 fix tests unable to compile brreynie 2023-05-10 09:59:17 +02:00
666502e19f Merge pull request #105 from SELab1/breaktimer_dots brreynie 2023-05-10 09:48:59 +02:00
3c1bc9bb1b refactored all states to communicate between viewmodels brreynie 2023-05-09 23:51:05 +02:00
25ed3dfdd2 add feedentry overflow preview -> needs fixing brreynie 2023-05-09 23:25:39 +02:00
08b86c15dd fix hint not very clear brreynie 2023-05-09 23:23:11 +02:00
43ccab6d08 fix missing rescource string brreynie 2023-05-09 23:20:24 +02:00
e8c073039e Merge pull request #106 from SELab1/feed brreynie 2023-05-09 23:16:23 +02:00
875732fd2d changed stealthbutton to blue + disbale feed continue when task or subject is archived lbarraga 2023-05-09 23:12:52 +02:00
7706c2d070 #22 sort tasks by completed brreynie 2023-05-09 22:44:08 +02:00
a5b98d6bf8 move new-task button to top brreynie 2023-05-09 22:38:23 +02:00
d22d40439d Merge pull request #104 from SELab1/tasksoverview brreynie 2023-05-09 22:29:26 +02:00
6a560fee79 button on feed not visible when task is checked lbarraga 2023-05-09 22:29:07 +02:00
c3424b9996 archive subjects brreynie 2023-05-09 22:26:11 +02:00
d4c017ef1b add time to task when saving session report brreynie 2023-05-09 22:11:52 +02:00
e333a0f626 fix selectedTask brreynie 2023-05-09 22:03:38 +02:00
0e4200057b fix selectedSubject brreynie 2023-05-09 21:56:25 +02:00
e9cc4f4a0c show studytime brreynie 2023-05-09 21:37:26 +02:00
ec31e116b4 refactor subjectscreen to use uiState brreynie 2023-05-09 21:29:52 +02:00
a60422e004 refactor DAO's brreynie 2023-05-09 21:01:19 +02:00
8a395fbd4e implement TaskDAO as a very simple fluent interface brreynie 2023-05-09 20:30:15 +02:00
d9d83569db Merge pull request #103 from SELab1/feed brreynie 2023-05-09 19:33:53 +02:00
529adbcab3 added feed string Lukas Barragan Torres 2023-05-09 16:21:37 +02:00
5992abf9c7 default of custom timer is 1 hour Lukas Barragan Torres 2023-05-09 16:21:08 +02:00
4fa7f97513 added padding to custom timer time picker button Lukas Barragan Torres 2023-05-09 16:20:39 +02:00
5be8432b18 edit button on the right Lukas Barragan Torres 2023-05-09 16:19:38 +02:00
9bf77b556c added function that opens subject add screen Lukas Barragan Torres 2023-05-09 16:19:03 +02:00
0fb3125f6a #74 button to add subject when user has empty feed Lukas Barragan Torres 2023-05-09 16:17:46 +02:00
1293ea3113 #74 refactor feed Lukas Barragan Torres 2023-05-09 16:17:10 +02:00
e35f143854 archive tasks brreynie 2023-05-09 16:00:15 +02:00
5f8b7d7a7b show #tasks and #completedTasks in subject entry brreynie 2023-05-09 15:30:37 +02:00
366f236f98 add previews for feed brreynie 2023-05-08 22:14:17 +02:00
6ba0018765 refactor feed to use UiState.Loading brreynie 2023-05-08 21:51:18 +02:00
d31276ef81 refactor Feed brreynie 2023-05-08 21:21:14 +02:00
08c779030e refactor FeedEntry brreynie 2023-05-08 21:05:54 +02:00
9df80f4f93 Fix: double counted entries lbarraga 2023-05-08 17:40:23 +02:00
c62d15ee99 comment in homescreen weg lbarraga 2023-05-08 17:10:44 +02:00
9a214ce97c change name of button function lbarraga 2023-05-07 17:23:43 +02:00
d036afc319 Docs lbarraga 2023-05-07 17:10:57 +02:00
b5b3205971 #74 UI Refactor lbarraga 2023-05-07 16:59:23 +02:00
afe58572a6 #74 fusing entries only on a daily basis lbarraga 2023-05-07 16:58:25 +02:00
4e8fb28b02 #74 dao returns map lbarraga 2023-05-07 16:11:46 +02:00
ac1bfe4d49 #74 feed now had dates lbarraga 2023-05-07 16:10:56 +02:00
f3a8c93a3e #74 getFeedentries now returns a map with date as key and as value the entries for that day lbarraga 2023-05-07 16:10:32 +02:00
3f6d416f39 #74 feed is now sorted on taskdates lbarraga 2023-05-07 14:26:07 +02:00
260171a972 #74 feedEntry now has an endTime lbarraga 2023-05-07 14:25:18 +02:00
e1ddf41d09 #74 added continue string for feed lbarraga 2023-05-07 14:06:20 +02:00
49835108f3 subject id and taskid as parameters for getSessionReport lbarraga 2023-05-07 14:05:43 +02:00
4728755c5e #74 homescreen now contains a feed lbarraga 2023-05-07 14:04:20 +02:00
190c3467ec #74 viewmodel of a feed lbarraga 2023-05-07 14:03:46 +02:00
f7b5d5170d #74 made a feed lbarraga 2023-05-07 14:02:56 +02:00
2db431463d sessionreport needs if of subjectId and taskId lbarraga 2023-05-07 14:02:29 +02:00
07ff75476d added getTask to interface lbarraga 2023-05-07 14:00:52 +02:00
1c224446a8 added getSubject to interface lbarraga 2023-05-07 14:00:42 +02:00
2c7c96d73a #74 added single getTask so feed kan fetch only one Task lbarraga 2023-05-07 13:59:44 +02:00
dab4506a34 #74 added single getSubject so feed kan fetch only one subject lbarraga 2023-05-07 13:59:29 +02:00
bee7101bef #74 added FeedDAO and firebase implementation lbarraga 2023-05-07 13:58:02 +02:00
a0ea97dc52 #74 added bind for feedDAO lbarraga 2023-05-07 13:57:05 +02:00
05d93246a6 sessionreport now also has a task and subject id lbarraga 2023-05-07 13:56:08 +02:00
83fba0de70 #74 added a feedEntry dataclass lbarraga 2023-05-07 13:55:44 +02:00
45f28592ab sessionreport now has the id of the task lbarraga 2023-05-07 10:08:02 +02:00
1eff33a6db start task now goes to timer selection screen lbarraga 2023-05-07 09:37:07 +02:00
33b8a32330 Merge pull request #101 from SELab1/refactor brreynie 2023-05-05 11:25:37 +02:00
5b8d59cb75 resolve merge conflicts when merging to development brreynie 2023-05-05 11:25:18 +02:00
d78ec4aead Merge pull request #100 from SELab1/testFix Rune Dyselinck 2023-05-05 11:18:03 +02:00
f7a3d68c3e extract StudeezNavGraph out of StudeezApp brreynie 2023-05-05 11:10:59 +02:00