Commit graph

53 commits

Author SHA1 Message Date
Emma Vandewalle
2cf09d7a93 Merge branch 'frontend/link-settings-info' into 'main'
feat: buttons for popups linked

Closes #40

See merge request EmmaVandewalle/writand!47
2024-09-06 09:59:04 +00:00
EmmaVandewalle
91fbf5645a feat: buttons for popups linked 2024-09-06 11:45:50 +02:00
Robin Meersman
295aac3c9d Merge branch 'frontend/globaluiconstants' into 'main'
Frontend - add global constants to generally style components in a same manner

See merge request EmmaVandewalle/writand!44
2024-09-06 09:11:50 +00:00
Robin Meersman
a94a900df2 Frontend - add global constants to generally style components in a same manner 2024-09-06 09:11:50 +00:00
Emma Vandewalle
09ce863d23 Merge branch 'frontend/infoscreen' into 'main'
feat: info popup screen implemented + some grammar fixed in other files

Closes #3

See merge request EmmaVandewalle/writand!43
2024-09-05 19:20:54 +00:00
Emma Vandewalle
0c98426f98 feat: info popup screen implemented + some grammar fixed in other files 2024-09-05 19:20:53 +00:00
Robin Meersman
aab1891835 Merge branch 'frontend/filetree' into 'main'
feat: frontend/Filetree

Closes #2

See merge request EmmaVandewalle/writand!37
2024-09-05 19:18:43 +00:00
Robin Meersman
c381040efc feat: frontend/Filetree 2024-09-05 19:18:43 +00:00
Emma Vandewalle
7609fd4d9d Merge branch 'frontend/settings-popup' into 'main'
feat: settings popup implemented

Closes #1

See merge request EmmaVandewalle/writand!41
2024-09-01 11:17:44 +00:00
Emma Vandewalle
fb44396f46 feat: settings popup implemented 2024-09-01 11:17:44 +00:00
Emma Vandewalle
e796e2dfc1 Merge branch 'frontend/fix-editor-hilt' into 'main'
fix: @HiltViewmodel deleted as there is no Inject constructor

See merge request EmmaVandewalle/writand!40
2024-08-23 21:02:17 +00:00
EmmaVandewalle
c4b4c94ca4 fix: @HiltViewmodel deleted as there is no Inject constructor 2024-08-23 15:47:06 +02:00
Emma Vandewalle
10c4b0e5c5 Merge branch 'frontend/editor-setup' into 'main'
feat: setup of top- and bottombar

Closes #4 and #5

See merge request EmmaVandewalle/writand!39
2024-08-23 07:24:58 +00:00
Emma Vandewalle
a7d0d746cb feat: setup of top- and bottombar 2024-08-23 07:24:58 +00:00
Emma Vandewalle
c2277d0c15 Merge branch 'frontend/splashscreen' into 'main'
feat: splashscreen implemented

Closes #23

See merge request EmmaVandewalle/writand!38
2024-08-18 13:39:26 +00:00
EmmaVandewalle
f9b8a7ed4d feat: splashscreen implemented 2024-08-17 22:01:13 +02:00
Emma Vandewalle
b7cb3eb27c Merge branch 'frontend/welcome-screens' into 'main'
feat: welcome screens

Closes #13

See merge request EmmaVandewalle/writand!35
2024-08-16 21:10:10 +00:00
Emma Vandewalle
5c56947c4f feat: welcome screens 2024-08-16 21:10:10 +00:00
Emma Vandewalle
c822126703 Merge branch 'frontend/WViewModel-fix' into 'main'
fix: declared WViewModel as open te allow inheritance

See merge request EmmaVandewalle/writand!36
2024-07-27 19:45:11 +00:00
Robin Meersman
55e78a4301 fix: declared WViewModel as open te allow inheritance 2024-07-27 21:37:40 +02:00
Emma Vandewalle
1d405d7ec4 Merge branch 'frontend/launch-catching' into 'main'
feat: added a launchCatching

See merge request EmmaVandewalle/writand!34
2024-07-27 18:33:13 +00:00
Robin Meersman
3b95fffad8 feat: added a launchCatching 2024-07-27 18:33:13 +00:00
Robin Meersman
273c36d2f8 Merge branch 'frontend/navigation' into 'main'
feat: setup of navigation and main screens files

See merge request EmmaVandewalle/writand!31
2024-07-25 18:40:04 +00:00
Emma Vandewalle
d580bbbb1f feat: setup of navigation and main screens files 2024-07-25 18:40:04 +00:00
Emma Vandewalle
72b63766d9 Merge branch 'frontend/material3-migration' into 'main'
other: migrated to material version 3 (originally version 2)

See merge request EmmaVandewalle/writand!33
2024-07-25 18:11:15 +00:00
Robin Meersman
ba9c58d02a other: migrated to material version 3 (originally version 2) 2024-07-25 18:11:15 +00:00
Robin Meersman
937c42ba57 Merge branch 'frontend/fix-name' into 'main'
fix: not full name of app in unique button

See merge request EmmaVandewalle/writand!30
2024-07-25 10:36:34 +00:00
EmmaVandewalle
6aef2fefdc fix: not full name of app in unique button 2024-07-25 12:35:27 +02:00
Emma Vandewalle
921a547cf2 Merge branch 'backend/TOS' into 'main'
feat: added TOS-repository

Closes #14

See merge request EmmaVandewalle/writand!28
2024-07-25 10:29:09 +00:00
Robin Meersman
5687487ff5 feat: added TOS-repository 2024-07-25 10:29:09 +00:00
Robin Meersman
1538e34603 Merge branch 'frontend/basics' into 'main'
feat: frontend basics filled

See merge request EmmaVandewalle/writand!29
2024-07-24 20:18:16 +00:00
Emma Vandewalle
ee247feb3d feat: frontend basics filled 2024-07-24 20:18:16 +00:00
Robin Meersman
b8cce8941d Merge branch 'frontend/themes' into 'main'
feat: colors for writand theme

See merge request EmmaVandewalle/writand!27
2024-07-24 18:05:05 +00:00
emmavdwa
a8c04a12c0 feat: colors for writand theme 2024-07-23 21:30:06 +02:00
Robin Meersman
773bc7e4f7 Merge branch 'backend/fix-projects-structure' into 'main'
fix: better structure and example Quotes is changed to real name

See merge request EmmaVandewalle/writand!26
2024-07-23 19:07:11 +00:00
Robin Meersman
115663839a Merge branch 'backend/datastore-settings' into 'main'
feat: datastore for settings with repository

Closes #8

See merge request EmmaVandewalle/writand!25
2024-07-23 19:05:57 +00:00
Emma Vandewalle
0016931726 feat: datastore for settings with repository 2024-07-23 19:05:56 +00:00
emmavdwa
c8a01582eb fix: better structure and example Quotes is changed to real name 2024-07-23 20:57:54 +02:00
Emma Vandewalle
bfd19884a7 Merge branch 'backend/filetree' into 'main'
feat: Filetree API

Closes #21

See merge request EmmaVandewalle/writand!23
2024-07-22 19:58:43 +00:00
Emma Vandewalle
b1fa2baf76 feat: Filetree API 2024-07-22 19:58:43 +00:00
Robin Meersman
8def0b92a8 Merge branch 'backend/db-projects' into 'main'
feat: projects local database and repository made

Closes #9

See merge request EmmaVandewalle/writand!24
2024-07-22 19:08:25 +00:00
Emma Vandewalle
cd9f462e74 feat: projects local database and repository made 2024-07-22 19:08:25 +00:00
RobinMeersman
c228d11895
fix: delete local.properties
This file is added in the gitignore, thus needs to be deleted from github
2024-07-18 21:38:50 +02:00
RobinMeersman
cbb32046e0 feat: added directory structure 2024-07-18 21:37:41 +02:00
EmmaVandewalle
45b9f48f2f
fix: delete .gradle directory 2024-07-18 21:01:56 +02:00
RobinMeersman
a13a2a21cc feat: expanded gitignore 2024-07-18 20:59:39 +02:00
emmavdwa
342bad37f2 feat: added logo with(out) background 2024-07-16 20:48:16 +02:00
emmavdwa
6920c6d025 feat: starting kotlin project 2024-07-16 09:40:31 +02:00
emmavdwa
ef34af2dd9 feat: add gitignore of kotlin project 2024-07-16 09:39:49 +02:00
emmavdwa
4e26221357 update: clean project 2024-07-16 09:34:57 +02:00