Merge branch 'master' into fixShopsRest

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into fixShopsRest # 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 TimerViewModel accountViewModel_hiroki changeicon deleteMethod ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel
commit b8dad142d3de862fab963899f21060a93daac849 2 parents 1a4ed95 + dc7cc88 m-mifune authored on 13 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 TimerViewModel accountViewModel_hiroki changeicon deleteMethod ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel

commit b8dad142d3de862fab963899f21060a93daac849

2 parents 1a4ed95 + dc7cc88

m-mifune authored on 13 Jun 2023

Patch

Unified Split

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/drawable/ic_current_location.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/icon.jpg 0 → 100644

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

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

Ignore Space Show notes View app/src/main/res/layout/activity_login.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_my_page_editor.xml 0 → 100644

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

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

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

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

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

Show line notes below