Merge branch 'master' into test

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into test_map6 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 20b8c963930c4f7aec7ead103fe9c6d5fcfcc74b 2 parents c96ca75 + c5db5ae r-nishimura authored on 15 Jun 2023

Browse code

Merge branch 'master' into test_map6

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 20b8c963930c4f7aec7ead103fe9c6d5fcfcc74b

2 parents c96ca75 + c5db5ae

r-nishimura authored on 15 Jun 2023

Patch

Unified Split

Showing 8 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/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/resources/AccountsRest.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_shop_create.xml

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

Show line notes below