Browse code Merge branch 'master' into feature/get_pre_canvas # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java README master
commit 98d1ba71c126ecddb7411fccb372e16af1dbe8d4 2 parents 2f09629 + 8d257ec k-fujii authored on 2 Nov 2021

Showing 66 changed files

• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/acanthus_client/entities/EditorJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/InvitesJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.java
• app/src/main/java/org/ntlab/acanthus_client/resources/gallery/InvitesRest.java
• app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/button/AlphaButton.java
• app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.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/create/CreateFragment.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/home/HomeFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/help/HowToUseActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/help/InquiryActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/logout/LogoutActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/AppInformationActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/PrivacyPolicyActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/TermsOfServiceActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintScreenShot.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/StrokeCanvasView.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java
• app/src/main/res/drawable/flame_underline.xml
• app/src/main/res/drawable/ic_baseline_cancel_24.xml
• app/src/main/res/drawable/ic_baseline_group_add.xml
• app/src/main/res/drawable/ic_launcher.png
• app/src/main/res/drawable/shape_style.xml
• app/src/main/res/layout/activity_animation.xml
• app/src/main/res/layout/activity_app_information.xml
• app/src/main/res/layout/activity_how_to_use.xml
• app/src/main/res/layout/activity_inquiry.xml
• app/src/main/res/layout/activity_login_screen.xml
• app/src/main/res/layout/activity_logout.xml
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/activity_paint.xml
• app/src/main/res/layout/activity_privacy_policy.xml
• app/src/main/res/layout/activity_sign_up.xml
• app/src/main/res/layout/activity_terms_of_service.xml
• app/src/main/res/layout/activity_userpage.xml
• app/src/main/res/layout/animation_home.xml
• app/src/main/res/layout/animation_home_header.xml
• app/src/main/res/layout/fragment_edit.xml
• app/src/main/res/layout/fragment_edit_header.xml
• app/src/main/res/layout/fragment_home.xml
• app/src/main/res/layout/fragment_mypage.xml
• app/src/main/res/layout/fragment_pen_detail.xml
• app/src/main/res/layout/fragment_search.xml
• app/src/main/res/layout/invites_list.xml
• app/src/main/res/layout/work_list.xml
• app/src/main/res/menu/bottom_nav_menu.xml
• app/src/main/res/menu/bottom_nav_paint.xml
• app/src/main/res/menu/botton_nav_top.xml
• app/src/main/res/menu/top_nav_main.xml
• app/src/main/res/navigation/mobile_navigation.xml
• app/src/main/res/values/colors.xml
• app/src/main/res/values/themes.xml
• build.gradle

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/InvitesJson.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/LoginResponseJson.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/views/MainActivity.java

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/button/AlphaButton.java

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

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/create/CreateFragment.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/home/HomeFragment.java

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/help/HowToUseActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/help/InquiryActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/logout/LogoutActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/AppInformationActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/PrivacyPolicyActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/TermsOfServiceActivity.java 0 → 100644

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

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/ListViewAdapter.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/PaintScreenShot.java

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

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

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

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/res/drawable/flame_underline.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/ic_baseline_cancel_24.xml

Ignore Space Show notes View app/src/main/res/drawable/ic_baseline_group_add.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/ic_launcher.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/shape_style.xml

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

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

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

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

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

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

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

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

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

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_terms_of_service.xml 0 → 100644

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

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

Ignore Space Show notes View app/src/main/res/layout/animation_home_header.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_edit_header.xml 0 → 100644

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/menu/bottom_nav_menu.xml

Ignore Space Show notes View app/src/main/res/menu/bottom_nav_paint.xml

Show notes View app/src/main/res/menu/botton_nav_top.xml 100644 → 0

Ignore Space Show notes View app/src/main/res/menu/top_nav_main.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/navigation/mobile_navigation.xml

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

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

Ignore Space Show notes View build.gradle

Show line notes below