2023SELab1-project-Studeez

tdpeuter/2023SELab1-project-Studeez

Archived

Fork 0

Commit graph

facdb14f31 quick fixes main v1.0.1 brreynie 2023-05-16 12:28:17 +02:00
af6032e75e Merge branch 'development' v1 brreynie 2023-05-16 12:02:55 +02:00
b4e1c87cb5 fix homescreentest after refactor of navbar development brreynie 2023-05-16 12:02:46 +02:00
62bca72d0f optimize imports and format code for all files :) refactor brreynie 2023-05-16 11:59:40 +02:00
cefa85ae22 refix friendFeed loading brreynie 2023-05-16 11:57:49 +02:00
8f3d356502 fix elipsis not showing on feeds brreynie 2023-05-16 11:52:17 +02:00
6542d2dbf2 Merge branch 'development' into refactor brreynie 2023-05-16 11:39:33 +02:00
6989f3c806 refactor friends feed to use uiState.Loading brreynie 2023-05-16 11:34:13 +02:00
a3c0359edd fix import brreynie 2023-05-16 11:15:07 +02:00
373a0e6209 Merge pull request #125 from SELab1/feed_friends brreynie 2023-05-16 11:11:10 +02:00
754cad20ed Merge branch 'development' into feed_friends brreynie 2023-05-16 11:10:13 +02:00
e6b2cdba3b Merge pull request #124 from SELab1/fixes Tibo De Peuter 2023-05-16 11:06:29 +02:00
c61853b8bd added friends feed string resources lbarraga 2023-05-16 10:06:46 +02:00
f5ae4f157c implemented friends feed lbarraga 2023-05-16 10:06:24 +02:00
bd9fce4418 changed sessions to feed lbarraga 2023-05-16 10:06:04 +02:00
43b46dd4a1 changed some DAOs to take ids and added a friends feed getter lbarraga 2023-05-16 10:05:37 +02:00
4d2abaec12 changed dateText to Medium instead of bold lbarraga 2023-05-16 10:04:50 +02:00
439bc0ab61 changed sessions to feed in navbar lbarraga 2023-05-16 10:04:21 +02:00
57668d3164 Fix public profile string not showing tdpeuter 2023-05-16 09:32:20 +02:00
45bd215004 Add friends to FAB tdpeuter 2023-05-16 09:16:03 +02:00
af23a29f6c Forbid adding friends twice tdpeuter 2023-05-16 09:10:39 +02:00
ef08a773f8 Fix own profile showing up in search friends tdpeuter 2023-05-16 08:44:56 +02:00
9eab533251 Styling tdpeuter 2023-05-16 08:44:21 +02:00
43838f5d6d Merge commit '629137249e' brreynie 2023-05-16 00:44:33 +02:00
cb3373fa29 Merge pull request #122 from SELab1/uitesting brreynie 2023-05-16 00:42:01 +02:00
629137249e test fixes brreynie 2023-05-16 00:41:24 +02:00
886f452a21 Merge commit '1f8e2d1fe3' brreynie 2023-05-16 00:00:34 +02:00
8afeb38ab0 Merge branch 'uitesting' of https://github.ugent.be/SELab1/project2023-groep-14 into uitesting Rune Dyselinck 2023-05-15 23:58:17 +02:00
4bb1f2dcb6 Delete androidTestResultsUserPreferences.xml brreynie 2023-05-15 23:51:56 +02:00
76dc234b8c Merge pull request #123 from SELab1/fixes Tibo De Peuter 2023-05-15 23:51:24 +02:00
9856a4514a Merge pull request #121 from SELab1/create-task-from-fab brreynie 2023-05-15 23:50:50 +02:00
d9dd3bbb0a Merge remote-tracking branch 'origin/uitesting' into uitesting Rune Dyselinck 2023-05-15 23:50:31 +02:00
e6956a5343 Update FireBaseSubjectDAO.kt Rune Dyselinck 2023-05-15 23:46:32 +02:00
b97cbb70c4 Update FireBaseSubjectDAO.kt Rune Dyselinck 2023-05-15 23:45:38 +02:00
21c42cb693 Update FireBaseSubjectDAO.kt Rune Dyselinck 2023-05-15 23:45:12 +02:00
5bce9d6108 Search field fixes tdpeuter 2023-05-15 23:43:30 +02:00
4420cede7e Update FireBaseSubjectDAO.kt Rune Dyselinck 2023-05-15 23:41:39 +02:00
9bae6dbd23 Update FireBaseSubjectDAO.kt Rune Dyselinck 2023-05-15 23:36:44 +02:00
ba7559a142 import statement vergeten Rune Dyselinck 2023-05-15 23:34:24 +02:00
4244770f95 Merge remote-tracking branch 'origin/development' into uitesting Rune Dyselinck 2023-05-15 23:30:07 +02:00
0bf15a1647 Fixes SelectedProfileState tdpeuter 2023-05-15 23:29:01 +02:00
0a55771ece all tests fixed Rune Dyselinck 2023-05-15 23:28:44 +02:00
204ca8f67e Merge pull request #119 from SELab1/friends Tibo De Peuter 2023-05-15 23:14:16 +02:00
9bc210c3d0 resolve conflicts lbarraga 2023-05-15 23:07:40 +02:00
31e78856c0 normal test fails Rune Dyselinck 2023-05-15 22:52:44 +02:00
a814bd74d7 QOL improvements & friendsSessionsDAOstuff tdpeuter 2023-05-15 22:40:36 +02:00
1f8e2d1fe3 #67 create task from fab brreynie 2023-05-15 22:23:14 +02:00
860fb5fac1 ui tests Rune Dyselinck 2023-05-15 21:53:04 +02:00
19a073f8c6 Merge pull request #120 from SELab1/abstract2composition_refactor_session_screen lbarraga 2023-05-15 21:48:03 +02:00
924e136153 resolve merge conflicts lbarraga 2023-05-15 21:47:28 +02:00
3386d45a04 Merge pull request #111 from SELab1/delete_timer lbarraga 2023-05-15 21:43:23 +02:00
61f6e2ac25 solve merge issues lbarraga 2023-05-15 21:43:02 +02:00
cfc80b6307 Merge pull request #113 from SELab1/better_screens brreynie 2023-05-15 21:02:01 +02:00
5ddd92a66f 'merge' dots lbarraga 2023-05-15 20:58:37 +02:00
654abb7690 Merge branch 'development' into better_screens brreynie 2023-05-15 20:55:20 +02:00
9ea4f73187 i18n improvement brreynie 2023-05-15 20:54:47 +02:00
e3c31d4f8d Merge pull request #114 from SELab1/bugfixes brreynie 2023-05-15 20:36:38 +02:00
53993bb2f0 Merge branch 'development' into bugfixes brreynie 2023-05-15 20:36:17 +02:00
6554a92f83 remove imports sessionroute lbarraga 2023-05-15 19:20:42 +02:00
0487347c8f cleanup sessionroute lbarraga 2023-05-15 19:18:47 +02:00
9573a2eb5c changed location of sessionscreens lbarraga 2023-05-15 19:09:14 +02:00
346b24aabe give soundplayer to visitor lbarraga 2023-05-15 19:05:43 +02:00
53bdf7d215 added callMediaPlayer call lbarraga 2023-05-15 19:02:55 +02:00
8294d63e92 added callmedia to session screen lbarraga 2023-05-15 19:02:23 +02:00
4749108992 soundplayer to screens instead of mediaplayer lbarraga 2023-05-15 19:01:06 +02:00
1db5a4160e refactor soundplayer location lbarraga 2023-05-15 19:00:36 +02:00
4a04a703db soundplayer wrapper to make mediaplayer easier to work with lbarraga 2023-05-15 18:58:46 +02:00
4519bf2e30 added soundplayer lbarraga 2023-05-15 18:57:24 +02:00
c872676618 Merge pull request #112 from SELab1/color_picker brreynie 2023-05-15 18:17:48 +02:00
4466f3646f #118 gebruik nieuwe visitor om sessionScreen te instantieren lbarraga 2023-05-15 16:34:19 +02:00
052ebb8c32 #118 new visitor for session screen lbarraga 2023-05-15 16:31:36 +02:00
b614f7d530 Dots now returns an int lbarraga 2023-05-15 16:30:13 +02:00
74526bc984 proto error Rune Dyselinck 2023-05-15 15:58:59 +02:00
522ecae87a fist test Rune Dyselinck 2023-05-15 15:11:50 +02:00
10c86c9bf0 Add resources tdpeuter 2023-05-15 14:16:30 +02:00
70f1be9b22 Add friends button to home screen tdpeuter 2023-05-15 14:16:11 +02:00
b7ffc7d802 Add searchfield composable tdpeuter 2023-05-15 14:15:36 +02:00
f03a06b245 Update navigation tdpeuter 2023-05-15 14:15:10 +02:00
74a6f77261 Add friends search screen tdpeuter 2023-05-15 14:14:49 +02:00
7c95e78b2a More with UserDAO tdpeuter 2023-05-15 14:14:26 +02:00
566102d5d4 More with friendship tdpeuter 2023-05-15 14:13:13 +02:00
a6a5fb5e95 Add public profile tdpeuter 2023-05-15 14:11:55 +02:00
bc7753fce5 Move friends overview to new package and new stuff tdpeuter 2023-05-15 14:11:28 +02:00
71b9550bd0 Move profile edit screen to new package tdpeuter 2023-05-15 14:08:54 +02:00
492775565c #118 integrated dots in composition lbarraga 2023-05-15 13:23:11 +02:00
634328cd2a merge development lbarraga 2023-05-15 13:13:59 +02:00
fdd0429e32 TimerComposable als apparte file lbarraga 2023-05-15 12:54:37 +02:00
5073e5cb22 #118 subclass of AbstractSessionScreen -> this file lbarraga 2023-05-15 12:54:07 +02:00
6938b3e868 #118 AbstractSessionScreen -> this file lbarraga 2023-05-15 12:52:57 +02:00
bd1c4df301 Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/EndlessTimerFormScreen.kt lbarraga 2023-05-15 11:03:37 +02:00
f722218abe Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/CustomTimerFormScreen.kt lbarraga 2023-05-15 11:03:29 +02:00
29b976cae4 Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/BreakTimerFormScreen.kt lbarraga 2023-05-15 11:03:21 +02:00
9d13a33959 Update app/src/main/java/be/ugent/sel/studeez/screens/timer_form/form_screens/AbstractTimerFormScreen.kt lbarraga 2023-05-15 11:02:56 +02:00
87fe476724 Basic friends overview screen tdpeuter 2023-05-14 13:10:32 +02:00
3b50054ff5 #63 Add getFriendshipCount and add to profile screen tdpeuter 2023-05-14 12:07:56 +02:00
bb64875bad Add getUserDetails() tdpeuter 2023-05-14 09:39:34 +02:00
a6d4cf1369 add getAllUsers() tdpeuter 2023-05-14 09:36:56 +02:00
4f08453a2d Add getAllFriendships() tdpeuter 2023-05-14 09:36:18 +02:00
56427a69af Allow build tdpeuter 2023-05-14 09:30:36 +02:00
75411627ac #71 Define Friendship DAO's tdpeuter 2023-05-14 09:06:37 +02:00