Browse code Merge branch 'AddRequested' into CreateReqested # Conflicts: # .idea/misc.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopsViewModel SignAct accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre sighlogact testFrendsViewModel

commit 097497e13fe9e7e6e7307cfbfc1dc6cd66b3c03c 2 parents 8211bec + f3f9238 m-mifune authored on 6 Jul 2023

Showing 23 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/nemophila/MyPageActivity.java
• app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java
• app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
• app/src/main/java/com/example/nemophila/Nemophila.java
• app/src/main/java/com/example/nemophila/PostActivity.java
• app/src/main/java/com/example/nemophila/RequestingActivity.java
• app/src/main/java/com/example/nemophila/ShopActivity.java
• app/src/main/java/com/example/nemophila/resources/FriendsRest.java
• app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
• app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
• app/src/main/res/drawable/circle_button.xml
• app/src/main/res/drawable/ic_current_location.xml
• app/src/main/res/drawable/ic_mypage.xml
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/activity_my_page_editor.xml
• app/src/main/res/layout/activity_mypage.xml
• app/src/main/res/layout/activity_post.xml
• app/src/main/res/layout/activity_requesting.xml
• app/src/main/res/layout/activity_shop.xml
• app/src/main/res/values/strings.xml

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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

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

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/Nemophila.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/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/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/drawable/circle_button.xml 0 → 100644

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

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

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

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

Ignore Space Show notes View app/src/main/res/layout/activity_post.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/values/strings.xml

Show line notes below