Merge branch 'master' into feature/get_pre

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into feature/get_pre_canvas # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java # app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java # app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java # app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java README master
commit 86402695e572b9951c1b45a8208a53c5b0cfa142 2 parents 4abec34 + c3cb4cd k-fujii authored on 28 Oct 2021

Browse code

Merge branch 'master' into feature/get_pre_canvas

# Conflicts:
#	app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java
#	app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java
#	app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java
#	app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java
#	app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java

README master

commit 86402695e572b9951c1b45a8208a53c5b0cfa142

2 parents 4abec34 + c3cb4cd

k-fujii authored on 28 Oct 2021

Patch

Unified Split

Showing 59 changed files

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/build.gradle

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/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/AnimationViewModel.java

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

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

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/paint/PaintCanvas.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/PenDetailsFragment.java

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

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/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.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/userpage/UserListViewAdapter.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java

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

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

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

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

Show notes View app/src/main/res/drawable/higeorgie.png 100644 → 0

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/drawable/nitta_manga.jpg 0 → 100644

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

Ignore Space Show notes View app/src/main/res/drawable/nitta_naoya.jpg 0 → 100644

Show notes View app/src/main/res/drawable/note.png 100644 → 0

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

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_page.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/animation_home_header.xml 0 → 100644

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

Ignore Space Show notes View app/src/main/res/layout/fragment_create.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_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_search.xml

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

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

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

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

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

Show line notes below