2023SELab1-project-Studeez

tdpeuter/2023SELab1-project-Studeez

Archived

Fork 0

Commit graph

3a2d13b3d6 Disable anonymous user tdpeuter 2023-04-18 14:28:55 +02:00
86bc8d9e1a Merge pull request #77 from SELab1/timerselection brreynie 2023-04-18 13:35:50 +02:00
d8b95f5d5b change name of SelectedTimerRepo to SelectedTimerState Lukas Barragan Torres 2023-04-18 13:33:37 +02:00
b3651bbbe5 BreaktimerInfo -> PomodoroTimerInfo Lukas Barragan Torres 2023-04-18 13:31:48 +02:00
38b582ead9 secondaryscreen gone Lukas Barragan Torres 2023-04-18 13:29:52 +02:00
c69228cbb4 Update README.md brreynie 2023-04-18 13:16:45 +02:00
63bb3f60ac add TimerSelectionScreen to imports Lukas Barragan Torres 2023-04-18 10:43:17 +02:00
8f84c24bad singleton repo for selectedTimer Lukas Barragan Torres 2023-04-18 10:41:58 +02:00
42eb9cf208 get selectedtimer from repository Lukas Barragan Torres 2023-04-18 10:40:56 +02:00
b2d010ff3f #26 timer can be displayed Lukas Barragan Torres 2023-04-18 10:40:05 +02:00
e3e3eaf1fa #26 session can be started Lukas Barragan Torres 2023-04-18 10:39:07 +02:00
d5b9e1dae8 #40 button now starts a new session Lukas Barragan Torres 2023-04-18 10:36:54 +02:00
d409294ad8 added start Lukas Barragan Torres 2023-04-18 08:40:58 +02:00
2071b31f72 Timer geeft nu correcte UI + timer kan manueel gestopt worden Rune Dyselinck 2023-04-17 22:13:56 +02:00
b3466442b2 Merge pull request #69 from SELab1/testing brreynie 2023-04-17 21:57:22 +02:00
e43589c500 #57 added @Test annotation in overridden methods reyniersbram 2023-04-17 21:55:27 +02:00
b1fd0691f7 #57 own package for functionalTimer tests reyniersbram 2023-04-17 21:16:53 +02:00
ecea5746f4 werkende timers lbarraga 2023-04-17 21:07:04 +02:00
2b68373230 #57 finish FunctionalTimer unit tests reyniersbram 2023-04-17 18:46:42 +02:00
e60a96429c swapped expected and actual reyniersbram 2023-04-17 17:52:55 +02:00
55b35073c7 #57 FunctionalCustomTimer unit test reyniersbram 2023-04-17 17:50:09 +02:00
9834ce4a06 refactor getters/setters reyniersbram 2023-04-17 17:31:11 +02:00
1c014e6ac5 #57 Time tests reyniersbram 2023-04-17 17:24:54 +02:00
199b4c2f6f onLogoutClick is niet meer nodig lbarraga 2023-04-17 17:20:10 +02:00
1bb359374c onLogoutClick is niet meer nodig lbarraga 2023-04-17 17:19:29 +02:00
b7c6e887e3 #57 first tests reyniersbram 2023-04-17 17:17:24 +02:00
7c0e15cb9d Merge pull request #68 from SELab1/timers lbarraga 2023-04-17 16:02:49 +02:00
076381915d fix issues lbarraga 2023-04-17 16:00:58 +02:00
f963256ec2 Merge pull request #66 from SELab1/timers lbarraga 2023-04-17 15:52:59 +02:00
0e45388242 Update app/src/main/java/be/ugent/sel/studeez/navigation/StudeezDestinations.kt lbarraga 2023-04-17 14:36:24 +02:00
894a2d0b82 Update app/src/main/java/be/ugent/sel/studeez/domain/implementation/ToTimerConverter.kt lbarraga 2023-04-17 14:36:12 +02:00
ce001898fd Merge branch 'development' into timers lbarraga 2023-04-17 11:57:33 +02:00
42e72dbbb8 Merge pull request #64 from SELab1/profile_edit lbarraga 2023-04-17 11:56:47 +02:00
0174114c6c fix missing bracket Lukas Barragan Torres 2023-04-17 11:01:21 +02:00
bf93428fdc Merge branch 'development' into timers lbarraga 2023-04-17 10:48:48 +02:00
85f8abacf0 #65 added session screen to navgraph Lukas Barragan Torres 2023-04-17 10:12:27 +02:00
169a7d3469 #65 sessionscreen Lukas Barragan Torres 2023-04-17 10:11:19 +02:00
ffaedf5542 #65 sessionsclick now routes to sessionscreen Lukas Barragan Torres 2023-04-17 10:09:05 +02:00
26f98480f4 padding on hours minutes seconds Lukas Barragan Torres 2023-04-17 10:07:11 +02:00
b43d775039 #65 added session screen to destinations Lukas Barragan Torres 2023-04-17 10:05:09 +02:00
d43d326b41 #40 added some keywords for timer display lbarraga 2023-04-16 23:38:05 +02:00
d7f316675c #65 functional timer abstract class and subclasses lbarraga 2023-04-16 23:37:19 +02:00
89eda17bc2 #40 timer_overview screen added to navgraph lbarraga 2023-04-16 23:34:19 +02:00
880236e1ce #40 viewmodel for overview screen lbarraga 2023-04-16 23:33:18 +02:00
049138bbc5 #40 basic timer overview screen (to be extended) lbarraga 2023-04-16 23:32:32 +02:00
79dcede47b fetch configutation on startup lbarraga 2023-04-16 23:31:35 +02:00
cf97565dec #40 added onTimersClick implementation lbarraga 2023-04-16 23:30:53 +02:00
16eb7d14f2 #40 added timer overview to destinations lbarraga 2023-04-16 23:29:46 +02:00
28b3260191 added timerdao and config service binds lbarraga 2023-04-16 23:28:13 +02:00
505f5c882a converter to convert TimerJson to TimerInfo lbarraga 2023-04-16 23:27:05 +02:00
ce57425957 #40 DAO to fetch the timers from the database. User timers only or combined (user + default) lbarraga 2023-04-16 23:25:57 +02:00
2a546146a3 Configuration service fetches default timers lbarraga 2023-04-16 23:21:53 +02:00
0c183b9cc7 #40 timer info class and subclasses, used for display of a timer lbarraga 2023-04-16 23:20:38 +02:00
5e2c8de521 #18 Edit and delete profile implemented tdpeuter 2023-04-16 22:40:43 +02:00
f263b34c12 #18 Working update username tdpeuter 2023-04-16 22:08:35 +02:00
8ad82dda43 #18 Basic structure of editing profile screen tdpeuter 2023-04-16 21:49:56 +02:00
3ff4f82298 #18 Move to edit screen on click tdpeuter 2023-04-16 13:23:51 +02:00
3900e3c18a #18 add edit profile button tdpeuter 2023-04-16 13:02:09 +02:00
f82e83867c Merge pull request #62 from SELab1/screens Tibo De Peuter 2023-04-16 20:20:46 +02:00
0af211362d #14 Username styling tdpeuter 2023-04-16 09:54:23 +02:00
b60603d292 #14 Username working tdpeuter 2023-04-16 09:42:14 +02:00
b790b55ab2 #14 temporary update does not work tdpeuter 2023-04-15 13:32:38 +02:00
e4066dedd7 #14 Basic navigation around the app tdpeuter 2023-04-15 10:00:21 +02:00
13140d4e3c Make use of open instead of always openAndPopUp tdpeuter 2023-04-15 09:45:41 +02:00
da3f8d3377 Use resources in navbar tdpeuter 2023-04-15 09:26:44 +02:00
fcd8b249d4 Fix preview tdpeuter 2023-04-15 09:20:27 +02:00
125e0a87d1 #58 Add simple screen for login/register tdpeuter 2023-04-15 09:06:44 +02:00
66e68493e4 Merge pull request #61 from SELab1/drawer_navbar_refactor lbarraga 2023-04-14 13:50:21 +02:00
7c09aac5b3 Proper drawer styling tdpeuter 2023-04-14 13:49:28 +02:00
064a9d3f31 code undupe go brr lbarraga 2023-04-14 00:03:53 +02:00
373d7281fe openAndPopUp needs to be passed down to navbar and drawer lbarraga 2023-04-14 00:02:31 +02:00
a5df9cf191 navbar now has a viewModel for each clickable function lbarraga 2023-04-14 00:01:20 +02:00
f5940e4743 now takes viewmodel and open function. Also uses viewmodel functions lbarraga 2023-04-14 00:00:46 +02:00
71a42a28e2 openAndPopUp function as argument for prim. screen lbarraga 2023-04-14 00:00:16 +02:00
4e9aab73c2 Drawer now has a viewModel for each clickable function lbarraga 2023-04-13 23:59:18 +02:00
cee42e7758 now takes viewmodel and open function. Also uses viewmodel functions lbarraga 2023-04-13 23:58:29 +02:00
c0bc4c24ae Merge pull request #60 from SELab1/username lbarraga 2023-04-13 17:48:39 +02:00
9c908033eb #59 removed comments lbarraga 2023-04-13 17:48:13 +02:00
00b5ab8d16 update comments lbarraga 2023-04-13 17:46:58 +02:00
03acb3781e #59 added username strings lbarraga 2023-04-13 17:22:10 +02:00
6ca65ba8b3 #59 username textfield added lbarraga 2023-04-13 17:21:45 +02:00
927b99c32a #59 UserDAO interface lbarraga 2023-04-13 17:20:50 +02:00
b3de23dc54 #59 implementation of UserDAO lbarraga 2023-04-13 17:20:31 +02:00
e7ab3aadc1 #59 username is now saved to user document on register lbarraga 2023-04-13 17:16:23 +02:00
57d959a510 #59 Added onUsernameChange lbarraga 2023-04-13 13:57:48 +02:00
182b8e2213 #59 Added username in ui state lbarraga 2023-04-13 13:57:17 +02:00
ad59bc552a #59 Added username field composable lbarraga 2023-04-13 13:57:01 +02:00
41e30df2a2 Merge pull request #56 from SELab1/logout Tibo De Peuter 2023-04-13 13:24:34 +02:00
f733e4bf14 #52 Restructuring finalised tdpeuter 2023-04-13 13:18:50 +02:00
0d65637d91 #52 fix dankzij Lukas tysm tdpeuter 2023-04-13 13:06:13 +02:00
12fe0c852e #52 poging tot herstructureren -- WERK NIET tdpeuter 2023-04-12 16:34:13 +02:00
724087362a #52 icons through res instead of library import tdpeuter 2023-04-12 15:08:51 +02:00
307f9e0d70 #52 Move drawer to toolbar tdpeuter 2023-04-12 15:08:26 +02:00
85e1b55507 #52 Add logout functionality tdpeuter 2023-04-12 09:52:09 +02:00
22b5a27102 #52 Complete sidebar without functionality tdpeuter 2023-04-12 09:34:09 +02:00
01bb858b9d Temporary update before I go to sleep tdpeuter 2023-04-11 23:26:50 +02:00
18d8108779 Add basic sidemenu tdpeuter 2023-04-11 22:39:51 +02:00
d9a96e92ca Fix typo tdpeuter 2023-04-11 21:53:03 +02:00
4bc6334c0a Merge pull request #55 from SELab1/homescreen lbarraga 2023-04-11 18:41:31 +02:00
d1a21e6894 Update app/src/main/java/be/ugent/sel/studeez/screens/home/HomeScreen.kt lbarraga 2023-04-11 18:39:21 +02:00