Merge branch 'master' into ShopsViewModel

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into ShopsViewModel # Conflicts: # .idea/deploymentTargetDropDown.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 98a7c8cdba37a1063a97956d1b923960225f26d5 2 parents 5e1061d + 59c6b29 t-nagao authored on 15 Jun 2023

Browse code

# Conflicts:
#	.idea/deploymentTargetDropDown.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 98a7c8cdba37a1063a97956d1b923960225f26d5

2 parents 5e1061d + 59c6b29

t-nagao authored on 15 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/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/PostsViewHolder.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/ShopActivityAdapter.java

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

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

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

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

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/entities/PostJson.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/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_my_page_editor.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_shop_create.xml 0 → 100644

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

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

Show line notes below