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

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge remote-tracking branch 'origin/master' into logon_sign_act # Conflicts: # .idea/misc.xml # 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 ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit 3a73f802e3b0cec7461fd2167c729fdd8edec961 2 parents da0e2b2 + ad2042e k-kimoto authored on 13 Jun 2023

Browse code

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

# Conflicts:
#	.idea/misc.xml
#	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 ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel

commit 3a73f802e3b0cec7461fd2167c729fdd8edec961

2 parents da0e2b2 + ad2042e

k-kimoto authored on 13 Jun 2023

Patch

Unified Split

Showing 18 changed files

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/MainActivity.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 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/ShopActivityViewHolder.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/Post.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/java/com/example/nemophila/viewmodels/ShopsViewModel.java

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

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

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

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

Show line notes below