Merge branch 'master' into post

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into post # Conflicts: # .idea/misc.xml # app/src/main/res/values/strings.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct Test TimerViewModel accountViewModel_hiroki changeicon deleteMethod ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre shop sighlogact testFrendsViewModel
commit bbd4dd1fc888c341dd0b5be53127e62934ec2164 2 parents fb17633 + 28e9678 k-fujii authored on 30 May 2023

Browse code

# Conflicts:
#	.idea/misc.xml
#	app/src/main/res/values/strings.xml

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

commit bbd4dd1fc888c341dd0b5be53127e62934ec2164

2 parents fb17633 + 28e9678

k-fujii authored on 30 May 2023

Patch

Unified Split

Showing 7 changed files

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 0 → 100644

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

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

Show notes View app/src/main/res/layout/activity_maps.xml 100644 → 0

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

Show line notes below