Commit graph

60 commits

Author SHA1 Message Date
Lukas Barragan Torres
13b9c0591f resolve conflicts and merge 2023-05-05 11:02:18 +02:00
lbarraga
6144afe03f TimerEditRoute en TimerAddRoute staan op andere plaatsen 2023-05-05 00:06:13 +02:00
lbarraga
24fe1b4f78 added add screen to routes 2023-05-04 22:54:12 +02:00
brreynie
e2ada0b9d4 fix mergeconflict when merging tasksoverview 2023-05-04 22:12:08 +02:00
Lukas Barragan Torres
9688426093 intermediate type select screen for add and route to edit instead of add 2023-05-04 10:27:20 +02:00
lbarraga
46109ac4ff Resolved merge conflicts (call with friends) 2023-05-04 00:12:04 +02:00
brreynie
6765229d37 #13 and #17 form for creating, editing and deleting tasks 2023-05-03 23:18:53 +02:00
3e721be32c Merge branch 'development' into addTimer 2023-05-03 22:46:39 +02:00
brreynie
fc1d12e214 #15 make form functional 2023-05-03 22:06:30 +02:00
brreynie
da4c51b726 #25 delete subject 2023-05-02 23:07:04 +02:00
brreynie
e1c05bb0d4 "#22 styling of task overview" 2023-05-02 22:27:05 +02:00
brreynie
1a2e192227 #22 boilerplate for task screen 2023-05-02 21:39:21 +02:00
Rune Dyselinck
51c8fb122d merge with dev 2023-05-02 17:21:26 +02:00
Rune Dyselinck
4b4c9539f8 addTimer finished 2023-05-02 13:57:03 +02:00
e458927c28 Temp settings screen for feedback 2023-05-01 19:19:45 +02:00
dfd97c8d33 Temp sessions screen for feedback 2023-05-01 19:13:18 +02:00
lbarraga
dfbc99ba38 #30 added edit screen to navgraph 2023-05-01 13:01:07 +02:00
da79195e8d #67 working popup, not styled 2023-05-01 12:35:08 +02:00
0a409421a8 Cleanup destinations 2023-05-01 10:26:08 +02:00
brreynie
d03775000a #21 basic subject list 2023-04-29 12:28:30 +02:00
lbarraga
4d05e101df Merge branch 'development' into session_recap 2023-04-28 12:21:58 +02:00
brreynie
010c7cff54 extract navbar and draweractions to StudeezNavGraph 2023-04-28 12:13:06 +02:00
18a055c599 TimerSelection is now secondary 2023-04-27 23:15:25 +02:00
Rune Dyselinck
2ca112ee0e LazyColumn not fixed 2023-04-27 17:01:39 +02:00
27526151b0 Cleanup show current tab 2023-04-26 11:20:57 +02:00
lbarraga
5148d2de4e session recap 2023-04-25 18:14:07 +02:00
7b3a82cc30 New DrawerScreen for TimerOverView 2023-04-25 09:43:10 +02:00
brreynie
bbdcd0140c refactor NavGraph so viewModel for drawer and navbar are shared across app 2023-04-24 16:07:25 +02:00
brreynie
097d1ea134 decouple button from timerEntry 2023-04-24 15:41:31 +02:00
brreynie
6bfa96bab7 wrap SessionScreen in route 2023-04-23 23:33:03 +02:00
brreynie
f1efad5120 fix timerselection going to timeroverview 2023-04-23 00:40:14 +02:00
brreynie
08a33d1c9e wrap timerselection in route 2023-04-23 00:31:21 +02:00
brreynie
480f085325 wrap timeroverview in route 2023-04-23 00:12:48 +02:00
brreynie
c401a29061 wrap splash in route 2023-04-22 23:47:28 +02:00
brreynie
95140e1739 wrap signupscreen in route 2023-04-22 23:39:54 +02:00
brreynie
3fd191cccc wrap profilescreen in route 2023-04-22 23:25:00 +02:00
brreynie
90170eb635 wrap profileEditScreen in route 2023-04-22 23:03:01 +02:00
brreynie
de42f090ef wrap loginscreen in route 2023-04-22 22:48:27 +02:00
brreynie
8fc4ac8cf1 wrap homescreen in route 2023-04-22 22:28:46 +02:00
Lukas Barragan Torres
63bb3f60ac add TimerSelectionScreen to imports 2023-04-18 10:43:17 +02:00
lbarraga
ecea5746f4 werkende timers 2023-04-17 21:07:04 +02:00
lbarraga
076381915d fix issues 2023-04-17 16:00:58 +02:00
lbarraga
ce001898fd Merge branch 'development' into timers 2023-04-17 11:57:33 +02:00
lbarraga
bf93428fdc Merge branch 'development' into timers 2023-04-17 10:48:48 +02:00
Lukas Barragan Torres
85f8abacf0 #65 added session screen to navgraph 2023-04-17 10:12:27 +02:00
lbarraga
89eda17bc2 #40 timer_overview screen added to navgraph 2023-04-16 23:34:19 +02:00
5e2c8de521 #18 Edit and delete profile implemented 2023-04-16 22:40:43 +02:00
3ff4f82298 #18 Move to edit screen on click 2023-04-16 20:53:47 +02:00
e4066dedd7 #14 Basic navigation around the app 2023-04-15 10:00:21 +02:00
13140d4e3c Make use of open instead of always openAndPopUp 2023-04-15 09:45:41 +02:00