Browse code Merge branch 'master' into SendScreenShotActivity # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java README master
commit ac146b129f6fcb14c6f240f6ed55f1620808cfcc 2 parents 03382bc + 1541508 t-tai authored on 5 Oct 2021

Showing 18 changed files

• .idea/misc.xml
• 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/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/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/PaintModelContainer.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/models/PageOperationModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/page/SwipeDirectionType.java
• app/src/main/res/layout/activity_page.xml
• app/src/main/res/layout/activity_paint.xml

Ignore Space Show notes View .idea/misc.xml

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/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/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/PaintModelContainer.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/models/PageOperationModel.java

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

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

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

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

Show line notes below