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

commit 9ae7126da687206c546e424136512641c0c65694 2 parents b3e2e0b + 45e80c0 r-nishimura authored on 20 Jun 2023

Showing 21 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/nemophila/ChangePwActivity.java
• app/src/main/java/com/example/nemophila/LoginActivity.java
• app/src/main/java/com/example/nemophila/MyPageActivity.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/ShopActivity.java
• app/src/main/java/com/example/nemophila/ShopCreateActivity.java
• app/src/main/java/com/example/nemophila/SignUpActivity.java
• app/src/main/java/com/example/nemophila/TestActivity.java
• app/src/main/java/com/example/nemophila/entities/Shop.java
• app/src/main/java/com/example/nemophila/resources/AccountsRest.java
• app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.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_change_pw.xml
• app/src/main/res/layout/activity_my_page_editor.xml
• app/src/main/res/layout/activity_shop.xml
• app/src/main/res/layout/activity_shop_create.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/AndroidManifest.xml

Show notes View app/src/main/java/com/example/nemophila/ChangePwActivity.java 100644 → 0

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/MyPageActivity.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/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/java/com/example/nemophila/TestActivity.java

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/resources/AccountsRest.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/PostsViewModel.java

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

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

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_shop.xml

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

Show line notes below