GitBucket
|
Merge branch 'master' into inviteActivity
# Conflicts: # .idea/misc.xml |
|---|
|
|
| .idea/misc.xml |
|---|
|
Too large
|
| app/build.gradle |
|---|
|
Too large
|
| app/src/main/AndroidManifest.xml |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/Acanthus.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/entities/Pen.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/entities/Position.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailViewModel.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/button/AlphaButton.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/button/PushButton.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/help/HowToUseActivity.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/help/InquiryActivity.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/logout/LogoutActivity.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/AppInformationActivity.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/PrivacyPolicyActivity.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/others/TermsOfServiceActivity.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintOnionCanvas.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintScreenShot.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/StrokeCanvasView.java 0 → 100644 |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserListViewAdapter.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java |
|---|
|
Too large
|
| app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java |
|---|
|
Too large
|
| app/src/main/res/drawable/acanthus_icon_black_500x500_removebg.png 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/flame_login.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/flame_theme_color.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/flame_theme_color_stroke.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/flame_underline.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/higeorgie.png 100644 → 0 |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_cancel_24.xml |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_fast_forward.xml |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_fast_rewind.xml |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_group_add.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_library_add.xml |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_pause.xml |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_pending.xml |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_person_add_alt_1.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_play_arrow.xml |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_refresh.xml |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_video_library.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_baseline_west.xml |
|---|
|
Too large
|
| app/src/main/res/drawable/ic_launcher.png 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/nitta_lab.png 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/nitta_manga.jpg 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/nitta_manga_removebg.png 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/nitta_naoya.jpg 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/drawable/note.png 100644 → 0 |
|---|
|
Too large
|
| app/src/main/res/drawable/shape_style.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/layout/activity_animation.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_animation_detail.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_app_information.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/layout/activity_follow_list.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_follower_list.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_how_to_use.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/layout/activity_inquiry.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/layout/activity_invite.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_login_screen.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_logout.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/layout/activity_main.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_page.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_paint.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_privacy_policy.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/layout/activity_sign_up.xml |
|---|
|
Too large
|
| app/src/main/res/layout/activity_terms_of_service.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/layout/activity_userpage.xml |
|---|
|
Too large
|
| app/src/main/res/layout/animation_home.xml |
|---|
|
Too large
|
| app/src/main/res/layout/animation_home_header.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/layout/follow_or_follower_list.xml |
|---|
|
Too large
|
| app/src/main/res/layout/fragment_create.xml |
|---|
|
Too large
|
| app/src/main/res/layout/fragment_edit.xml |
|---|
|
Too large
|
| app/src/main/res/layout/fragment_edit_header.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/layout/fragment_home.xml |
|---|
|
Too large
|
| app/src/main/res/layout/fragment_mypage.xml |
|---|
|
Too large
|
| app/src/main/res/layout/fragment_pen_detail.xml |
|---|
|
Too large
|
| app/src/main/res/layout/fragment_search.xml |
|---|
|
Too large
|
| app/src/main/res/layout/work_list.xml |
|---|
|
Too large
|
| app/src/main/res/menu/bottom_nav_menu.xml |
|---|
|
Too large
|
| app/src/main/res/menu/bottom_nav_paint.xml |
|---|
|
Too large
|
| app/src/main/res/menu/botton_nav_icon.xml 100644 → 0 |
|---|
|
Too large
|
| app/src/main/res/menu/top_nav_main.xml 0 → 100644 |
|---|
|
Too large
|
| app/src/main/res/navigation/mobile_navigation.xml |
|---|
|
Too large
|
| app/src/main/res/values/colors.xml |
|---|
|
Too large
|
| app/src/main/res/values/strings.xml |
|---|
|
Too large
|
| app/src/main/res/values/themes.xml |
|---|
|
Too large
|
| build.gradle |
|---|
|
Too large
|