lbarraga
|
61f6e2ac25
|
solve merge issues
|
2023-05-15 21:43:02 +02:00 |
|
brreynie
|
654abb7690
|
Merge branch 'development' into better_screens
|
2023-05-15 20:55:20 +02:00 |
|
brreynie
|
9ea4f73187
|
i18n improvement
|
2023-05-15 20:54:47 +02:00 |
|
brreynie
|
53993bb2f0
|
Merge branch 'development' into bugfixes
|
2023-05-15 20:36:17 +02:00 |
|
lbarraga
|
bd1c4df301
|
Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/EndlessTimerFormScreen.kt
Co-authored-by: brreynie <Bram.Reyniers@UGent.be>
|
2023-05-15 11:03:37 +02:00 |
|
lbarraga
|
f722218abe
|
Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/CustomTimerFormScreen.kt
Co-authored-by: brreynie <Bram.Reyniers@UGent.be>
|
2023-05-15 11:03:29 +02:00 |
|
lbarraga
|
29b976cae4
|
Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/BreakTimerFormScreen.kt
Co-authored-by: brreynie <Bram.Reyniers@UGent.be>
|
2023-05-15 11:03:21 +02:00 |
|
lbarraga
|
9d13a33959
|
Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/AbstractTimerFormScreen.kt
Co-authored-by: brreynie <Bram.Reyniers@UGent.be>
|
2023-05-15 11:02:56 +02:00 |
|
Lukas Barragan Torres
|
eef4a8caf5
|
added fillout error text
|
2023-05-13 17:38:29 +02:00 |
|
Lukas Barragan Torres
|
1330396ba8
|
made buttons fill out screen
|
2023-05-13 17:38:04 +02:00 |
|
Lukas Barragan Torres
|
2971ae85aa
|
map implementation
|
2023-05-13 17:37:18 +02:00 |
|
brreynie
|
df0325074d
|
i18n for regenerate button
|
2023-05-13 17:29:25 +02:00 |
|
Lukas Barragan Torres
|
eb28fa4ae4
|
valid and first booleans in map
|
2023-05-13 17:26:19 +02:00 |
|
Lukas Barragan Torres
|
e8f2d71df3
|
deleteTimer Apptext
|
2023-05-13 17:25:51 +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 |
|
Lukas Barragan Torres
|
a328d2194f
|
isValid is optional and by default true
|
2023-05-13 15:36:04 +02:00 |
|
brreynie
|
93aae20f85
|
#109 archiving subject archives all tasks of subject
|
2023-05-13 13:22:12 +02:00 |
|
brreynie
|
61de50ea55
|
reformat and optimize imports
|
2023-05-10 16:52:41 +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 |
|
Rune Dyselinck
|
45efd5cb3f
|
small fix
|
2023-05-10 15:37:34 +02:00 |
|
Rune Dyselinck
|
dc63346e5e
|
Merge remote-tracking branch 'origin/development' into better_screens
|
2023-05-10 15:35:44 +02:00 |
|
Rune Dyselinck
|
6bef378fc0
|
correct aligment
|
2023-05-10 15:32:39 +02:00 |
|
Rune Dyselinck
|
d9f4170fbd
|
emojis in sessionrecap
|
2023-05-10 15:10:01 +02:00 |
|
Lukas Barragan Torres
|
b4166386a5
|
added error input field for name and discription
|
2023-05-10 12:46:30 +02:00 |
|
Lukas Barragan Torres
|
d6496cb8ad
|
changed labeled error field to take some states
|
2023-05-10 12:44:51 +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 |
|
Lukas Barragan Torres
|
74d2920562
|
fix previews for extra button
|
2023-05-10 11:33:34 +02:00 |
|
Lukas Barragan Torres
|
88ebbe4de1
|
#110 extrabutton added (used for delete)
|
2023-05-10 11:33:15 +02:00 |
|
Lukas Barragan Torres
|
d929415582
|
#110 added delete timer function in viewmodel
|
2023-05-10 11:32:36 +02:00 |
|
Lukas Barragan Torres
|
9bc64be1ee
|
#110 added extra button in parameters of formscreen
|
2023-05-10 11:32:08 +02:00 |
|
Lukas Barragan Torres
|
d6b2c17f29
|
bug fix: singleline was by default false
|
2023-05-10 11:31:11 +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 |
|