Merge branch 'master' into ShopsViewModel

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into ShopsViewModel # Conflicts: # app/src/main/AndroidManifest.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit 8fef6cb6b7be1705be261d299eafed0f918638ea 2 parents 6b2bc79 + cd931f8 t-nagao authored on 22 Jun 2023

Browse code

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

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

commit 8fef6cb6b7be1705be261d299eafed0f918638ea

2 parents 6b2bc79 + cd931f8

t-nagao authored on 22 Jun 2023

Patch

Unified Split

Showing 23 changed files

Ignore Space Show notes View .idea/misc.xml

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/ShopActivityAdapter.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/Account.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/PostsRest.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/PostsViewModel.java

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

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

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

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

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

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

Show line notes below