Commit graph

463 commits

Author SHA1 Message Date
Rune Dyselinck
522ecae87a fist test 2023-05-15 15:11:50 +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
brreynie
08c779030e refactor FeedEntry 2023-05-08 21:05:54 +02:00
lbarraga
9df80f4f93 Fix: double counted entries 2023-05-08 17:40:23 +02:00
lbarraga
c62d15ee99 comment in homescreen weg 2023-05-08 17:10:44 +02:00
lbarraga
9a214ce97c change name of button function 2023-05-07 17:23:43 +02:00
lbarraga
d036afc319 Docs 2023-05-07 17:10:57 +02:00
lbarraga
b5b3205971 #74 UI Refactor 2023-05-07 16:59:23 +02:00
lbarraga
afe58572a6 #74 fusing entries only on a daily basis 2023-05-07 16:58:25 +02:00
lbarraga
4e8fb28b02 #74 dao returns map 2023-05-07 16:11:46 +02:00
lbarraga
ac1bfe4d49 #74 feed now had dates 2023-05-07 16:10:56 +02:00
lbarraga
f3a8c93a3e #74 getFeedentries now returns a map with date as key and as value the entries for that day 2023-05-07 16:10:32 +02:00
lbarraga
3f6d416f39 #74 feed is now sorted on taskdates 2023-05-07 14:26:07 +02:00
lbarraga
260171a972 #74 feedEntry now has an endTime 2023-05-07 14:25:18 +02:00
lbarraga
e1ddf41d09 #74 added continue string for feed 2023-05-07 14:06:20 +02:00
lbarraga
49835108f3 subject id and taskid as parameters for getSessionReport 2023-05-07 14:05:43 +02:00