Merge branch 'master' into MyPageAct

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'master' into MyPageAct # Conflicts: # build.gradle Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre sighlogact
commit 274c367bc365a10b40147ef4f2b5b8f73e256c87 2 parents b543cc9 + aaac856 d-matsuura authored on 6 Jul 2023

Browse code

# Conflicts:
#	build.gradle

Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct RequestedAc Sample ShopsViewModel accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM geticon icon layoutFix logout master postAct_genre set_genre sighlogact

commit 274c367bc365a10b40147ef4f2b5b8f73e256c87

2 parents b543cc9 + aaac856

d-matsuura authored on 6 Jul 2023

Patch

Unified Split

Showing 32 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml 0 → 100644

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/FriendActivity.java

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

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

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/PostActivity.java

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/menu/navdrawer_menu.xml 0 → 100644

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

Ignore Space Show notes View app/src/main/res/values-night/themes.xml

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

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

Ignore Space Show notes View build.gradle

Show line notes below