Commit graph

415 commits

Author SHA1 Message Date
a814bd74d7 QOL improvements & friendsSessionsDAOstuff 2023-05-15 22:40:36 +02:00
10c86c9bf0 Add resources 2023-05-15 14:16:30 +02:00
70f1be9b22 Add friends button to home screen 2023-05-15 14:16:11 +02:00
b7ffc7d802 Add searchfield composable 2023-05-15 14:15:36 +02:00
f03a06b245 Update navigation 2023-05-15 14:15:10 +02:00
74a6f77261 Add friends search screen 2023-05-15 14:14:49 +02:00
7c95e78b2a More with UserDAO 2023-05-15 14:14:26 +02:00
566102d5d4 More with friendship 2023-05-15 14:13:13 +02:00
a6a5fb5e95 Add public profile 2023-05-15 14:11:55 +02:00
bc7753fce5 Move friends overview to new package and new stuff 2023-05-15 14:11:28 +02:00
71b9550bd0 Move profile edit screen to new package 2023-05-15 14:08:54 +02:00
87fe476724 Basic friends overview screen 2023-05-14 13:10:32 +02:00
3b50054ff5 #63 Add getFriendshipCount and add to profile screen 2023-05-14 13:09:51 +02:00
bb64875bad Add getUserDetails() 2023-05-14 09:39:34 +02:00
a6d4cf1369 add getAllUsers() 2023-05-14 09:36:56 +02:00
4f08453a2d Add getAllFriendships() 2023-05-14 09:36:18 +02:00
56427a69af Allow build 2023-05-14 09:30:36 +02:00
75411627ac #71 Define Friendship DAO's 2023-05-14 09:28:21 +02:00
4419c86b05 Unify DAO names 2023-05-10 12:38:58 +02:00
81e777f21d #63 Add bio to profile 2023-05-10 12:27:07 +02:00
brreynie
33b8a32330 Merge pull request #101 from SELab1/refactor
extract StudeezNavGraph out of StudeezApp
2023-05-05 11:25:37 +02:00
brreynie
5b8d59cb75 resolve merge conflicts when merging to development 2023-05-05 11:25:18 +02:00
Rune Dyselinck
d78ec4aead Merge pull request #100 from SELab1/testFix
testen gefixt
2023-05-05 11:18:03 +02:00
brreynie
f7a3d68c3e extract StudeezNavGraph out of StudeezApp 2023-05-05 11:10:59 +02:00
lbarraga
81fa345453 Merge pull request #98 from SELab1/timer_edit
Timer edit
2023-05-05 11:02:42 +02:00
Lukas Barragan Torres
13b9c0591f resolve conflicts and merge 2023-05-05 11:02:18 +02:00
Rune Dyselinck
47edf650ed testen gefixt 2023-05-05 10:48:34 +02:00
lbarraga
620722038d Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/TimerFormRoute.kt
Co-authored-by: Tibo De Peuter <Tibo.DePeuter@UGent.be>
2023-05-05 08:27:10 +02:00
lbarraga
0b1ff3f02d removed previous add screen 2023-05-05 00:09:52 +02:00
lbarraga
d087783e12 timer type select resource 2023-05-05 00:06:50 +02:00
lbarraga
6144afe03f TimerEditRoute en TimerAddRoute staan op andere plaatsen 2023-05-05 00:06:13 +02:00
lbarraga
2556e1c658 TimerFormViewModel ipv TimerEditViewModel 2023-05-05 00:05:27 +02:00
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
d5fbb2adab Merge pull request #97 from SELab1/tasksoverview
Tasksoverview
2023-05-04 22:12:48 +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