Merge branch 'master' into ViewPager2

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into ViewPager2 # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java # app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java # app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java # app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java # app/src/main/res/layout/activity_follow_list.xml # app/src/main/res/layout/activity_follower_list.xml README master
commit 9049304e7507efc0c8b21d8bde31eb0b64095de4 2 parents e8338d9 + d5280b7 d-matsuura authored on 4 Nov 2021

Browse code

# Conflicts:
#	app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java
#	app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java
#	app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java
#	app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java
#	app/src/main/res/layout/activity_follow_list.xml
#	app/src/main/res/layout/activity_follower_list.xml

README master

commit 9049304e7507efc0c8b21d8bde31eb0b64095de4

2 parents e8338d9 + d5280b7

d-matsuura authored on 4 Nov 2021

Patch

Unified Split

Showing 11 changed files

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

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

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

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

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

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

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

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

Show line notes below