Browse code Merge branch 'master' into FixFriendsRest # Conflicts: # .idea/misc.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 MPA 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 33be90faa21b65b374341065ace4e8e752bcd9c0 2 parents 312745b + 207c1f0 m-mifune authored on 13 Jul 2023

Showing 11 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/java/com/example/nemophila/FriendActivity.java
• app/src/main/java/com/example/nemophila/LoginActivity.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/ShopActivity.java
• app/src/main/java/com/example/nemophila/ShopCreateActivity.java
• app/src/main/java/com/example/nemophila/SignUpActivity.java
• app/src/main/res/layout/activity_sign_up.xml
• app/src/main/res/layout/layout_friends_activity.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/LoginActivity.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/ShopActivity.java

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

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

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

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

Show line notes below