Browse code Merge remote-tracking branch 'origin/master' into dialog_maps_shopslist # Conflicts: # .idea/deploymentTargetDropDown.xml Cahnge_ ErrorType FixShopViewModel FriendActivity FriendActivity_1017 MPA MypageEditor_icon Sample accountViewModel_hiroki changeicon deleteMethod filter_ic_seturl geticon icon layoutFix logout master postAct_genre set_genre
commit d82458b7996e3b739b2b997bc1d71cedbbc1e8c6 2 parents a3ff1e1 + 4931809 r-nishimura authored on 20 Jul 2023

Showing 20 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/java/com/example/nemophila/FriendActivity.java
• app/src/main/java/com/example/nemophila/MyPageActivity.java
• app/src/main/java/com/example/nemophila/RequestedActivity.java
• app/src/main/java/com/example/nemophila/RequestingActivity.java
• app/src/main/java/com/example/nemophila/resources/AccountsRest.java
• app/src/main/java/com/example/nemophila/resources/FriendsRest.java
• app/src/main/java/com/example/nemophila/resources/ShopsRest.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/ShopsViewModel.java
• app/src/main/res/drawable/blue_circle_button.xml
• app/src/main/res/drawable/ic_baseline_replay_24.xml
• app/src/main/res/layout/activity_friend.xml
• app/src/main/res/layout/activity_my_page_editor.xml
• app/src/main/res/layout/activity_mypage.xml
• app/src/main/res/layout/friend_list_item.xml
• app/src/main/res/layout/layout_friends_activity.xml
• app/src/main/res/layout/layout_my_page_activity_posts.xml

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/drawable/ic_baseline_replay_24.xml 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_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/friend_list_item.xml 0 → 100644

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

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

Show line notes below