Commit graph

36 commits

Author SHA1 Message Date
lbarraga
46109ac4ff Resolved merge conflicts (call with friends) 2023-05-04 00:12:04 +02:00
3e721be32c Merge branch 'development' into addTimer 2023-05-03 22:46:39 +02:00
ee7914d0c9 Merge pull request #93 from SELab1/custom_timer
Custom timer
2023-05-03 22:09:06 +02:00
1bf96c2200 Add missing resources #94 2023-05-02 22:50:28 +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
5a2632c08a Add snackbars for missing features 2023-05-01 19:28:50 +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
b2e2941795 Restructuring strings 2023-05-01 19:04:40 +02:00
lbarraga
e4fc0a9a07 #30 added edit screen specific text 2023-05-01 13:09:24 +02:00
024ce85266 #26 select time for custom timer 2023-04-29 17:55:20 +02:00
Rune Dyselinck
94336348c5 merge dev 2023-04-28 15:50:44 +02:00
Rune Dyselinck
f46063eba1 isSession vervangend door null waaarden 2023-04-25 20:58:14 +02:00
lbarraga
5148d2de4e session recap 2023-04-25 18:14:07 +02:00
reyniersbram
826acc1186 created studystate for functional timer to improve localisation 2023-04-18 14:58:16 +02:00
Lukas Barragan Torres
d409294ad8 added start 2023-04-18 08:40: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
lbarraga
d43d326b41 #40 added some keywords for timer display 2023-04-16 23:38:05 +02:00
5e2c8de521 #18 Edit and delete profile implemented 2023-04-16 22:40:43 +02:00
f263b34c12 #18 Working update username 2023-04-16 22:08:35 +02:00
8ad82dda43 #18 Basic structure of editing profile screen 2023-04-16 21:49:56 +02:00
3ff4f82298 #18 Move to edit screen on click 2023-04-16 20:53:47 +02:00
3900e3c18a #18 add edit profile button 2023-04-16 20:53:35 +02:00
b790b55ab2 #14 temporary update does not work 2023-04-15 13:32:38 +02:00
da3f8d3377 Use resources in navbar 2023-04-15 09:26:44 +02:00
lbarraga
03acb3781e #59 added username strings 2023-04-13 17:22:10 +02:00
12fe0c852e #52 poging tot herstructureren -- WERK NIET 2023-04-12 16:34:13 +02:00
22b5a27102 #52 Complete sidebar without functionality 2023-04-12 09:34:09 +02:00
01bb858b9d Temporary update before I go to sleep 2023-04-11 23:26:50 +02:00
lbarraga
0b76199d3c added home 2023-04-11 15:57:23 +02:00
lbarraga
5065b194e8 added homescreen text 2023-04-11 15:55:37 +02:00
815c166fc8 Fix typo in strings.xml
Add point because consistencu
2023-04-09 08:07:40 +02:00
lbarraga
c17debab71 added string resources (en) 2023-04-08 17:51:04 +02:00
reyniersbram
96a71725b0 created project 2023-03-25 16:16:15 +01:00