Merge branch 'master' into friendLayout

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into friendLayout # Conflicts: # .idea/deploymentTargetDropDown.xml Cahnge_ ErrorType FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon NewBranch PostAct Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master postAct_genre set_genre
commit 3f6cb9c841424b68a3d009fe6fa2a9946fe51105 2 parents 72b3129 + 6f49090 t-nagao authored on 20 Jul 2023

Patch

Unified Split

Showing 12 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/RequestedActivity.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/resources/AccountsRest.java

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/resources/ShopsRest.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

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

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

Show line notes below