Browse code Merge branch 'master' into not_friend_pin FriendActivity FriendActivity_1017 MypageEditor_icon accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master set_genre
commit 4cfee234c6ae3d27ebe093dc239eaa2156d1efbe 2 parents 5ab3143 + e0b81f5 t-nagao authored on 28 Sep 2023

Showing 22 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/java/com/example/nemophila/FriendActivity.java
• app/src/main/java/com/example/nemophila/MapsDialogFragment.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/RequestingDialogFragment.java
• app/src/main/java/com/example/nemophila/ShopActivity.java
• app/src/main/java/com/example/nemophila/TestActivity.java
• app/src/main/java/com/example/nemophila/entities/ErrorType.java
• app/src/main/java/com/example/nemophila/entities/Shop.java
• app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
• app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
• app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java
• app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java
• app/src/main/res/layout/activity_friend.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_test.xml
• app/src/main/res/layout/layout_friend_dialog.xml
• app/src/main/res/layout/layout_my_page_activity_posts.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/java/com/example/nemophila/FriendActivity.java

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

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

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

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

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

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

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

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

Show line notes below