Browse code Merge remote-tracking branch 'remotes/origin/master' into homeFragment # Conflicts: # .idea/misc.xml README master
commit 73e36f21a2b85c01e0ba6dfc6f9424744aeb0ba2 2 parents e72f478 + 9f9e221 h-fuji authored on 22 Jun 2021

Showing 34 changed files

• .idea/misc.xml
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
• app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java
• app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java
• app/src/main/java/org/ntlab/acanthus_client/entities/Page.java
• app/src/main/java/org/ntlab/acanthus_client/resources/accounts/InvitedRest.java
• app/src/main/java/org/ntlab/acanthus_client/resources/accounts/WorkRest.java
• app/src/main/java/org/ntlab/acanthus_client/resources/gallery/EditorsRest.java
• app/src/main/java/org/ntlab/acanthus_client/resources/gallery/GalleryRest.java
• app/src/main/java/org/ntlab/acanthus_client/resources/gallery/InvitesRest.java
• app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/search/SearchFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/MyPaint.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java
• app/src/main/res/img/title.jpg
• app/src/main/res/layout/activity_animation.xml
• app/src/main/res/layout/activity_paint.xml
• app/src/main/res/layout/activity_sign_up.xml
• app/src/main/res/layout/activity_title.xml
• app/src/main/res/layout/fragment_edit.xml
• app/src/main/res/layout/fragment_search.xml

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/build.gradle

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/Acanthus.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/Page.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/accounts/InvitedRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/accounts/WorkRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/gallery/EditorsRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/gallery/GalleryRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/gallery/InvitesRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/search/SearchFragment.java

Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/MyPaint.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java

Show notes View app/src/main/res/img/title.jpg 100644 → 0

Ignore Space Show notes View app/src/main/res/layout/activity_animation.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_paint.xml

Ignore Space Show notes View app/src/main/res/layout/activity_sign_up.xml

Ignore Space Show notes View app/src/main/res/layout/activity_title.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_edit.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_search.xml

Show line notes below