Merge remote-tracking branch 'origin/master' into Main2_7_6

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge remote-tracking branch 'origin/master' into Main2_7_6_2 # Conflicts: # app/src/main/AndroidManifest.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 LogSignACT MPA MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre sighlogact
commit 37694a954dcc51bb5404607252c5bf77d778724b 2 parents 987a50a + 61ea0e0 r-nishimura authored on 11 Jul 2023

Browse code

Merge remote-tracking branch 'origin/master' into Main2_7_6_2

# Conflicts:
#	app/src/main/AndroidManifest.xml

Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 LogSignACT MPA MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre sighlogact

commit 37694a954dcc51bb5404607252c5bf77d778724b

2 parents 987a50a + 61ea0e0

r-nishimura authored on 11 Jul 2023

Patch

Unified Split

Showing 28 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/build.gradle

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/com/example/nemophila/FriendActivity.java

Show notes View app/src/main/java/com/example/nemophila/FriendActivityAdapter.java 100644 → 0

Show notes View app/src/main/java/com/example/nemophila/FriendDataModel.java 100644 → 0

Show notes View app/src/main/java/com/example/nemophila/FriendsViewHolder.java 100644 → 0

Ignore Space Show notes View app/src/main/java/com/example/nemophila/MyPageActivity.java

Show notes View app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java 100644 → 0

Ignore Space Show notes View app/src/main/java/com/example/nemophila/PostActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/PostDataModel.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/PostsViewHolder.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/RequestingActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/RequestingDialogFragment.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/ShopActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/SignUpActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/entities/AccountNameJson.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/FriendsRest.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java

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

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

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

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

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

Ignore Space Show notes View build.gradle

Ignore Space Show notes View gradle/wrapper/gradle-wrapper.properties

Show line notes below