Browse code Merge branch 'master' into feature/#170_create_page_edit # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java README master
commit ef2482816ec38e2962688ed686be46316983f6a1 2 parents c5764dd + f5e6647 k-fujii authored on 7 Oct 2021

Showing 20 changed files

• .idea/gradle.xml
• .idea/misc.xml
• .idea/runConfigurations.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java
• app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/Page.java
• app/src/main/java/org/ntlab/acanthus_client/entities/Position.java
• app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java
• app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.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/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/PaintToolBar.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/SendScreenShotActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java
• app/src/main/res/layout/activity_paint.xml
• app/src/main/res/layout/activity_send_screen_shot.xml
• app/src/main/res/values/themes.xml

Ignore Space Show notes View .idea/gradle.xml

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View .idea/runConfigurations.xml 0 → 100644

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

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/AnimationJson.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/entities/Position.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.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/main_menu_ui/home/HomeViewModel.java

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/values/themes.xml

Show line notes below