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

commit d6cafbf9c4812eef043ce3ed114ceaa8b95940a6 2 parents f138f5c + a83ef92 k-kimoto authored on 8 Jun 2023

Showing 27 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/nemophila/FriendActivity.java
• app/src/main/java/com/example/nemophila/GpsActivity.java
• app/src/main/java/com/example/nemophila/MainActivity.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/RequestedActivity.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/Shop.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/drawable/ic_current_location.xml
• app/src/main/res/drawable/icon.jpg
• app/src/main/res/layout/activity_friend.xml
• app/src/main/res/layout/activity_gps.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_requested.xml
• app/src/main/res/layout/activity_shop.xml
• app/src/main/res/layout/activity_test.xml
• app/src/main/res/values/strings.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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/FriendActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/GpsActivity.java 0 → 100644

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

Ignore Space Show notes View app/src/main/java/com/example/nemophila/Nemophila.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/nemophila/RequestedActivity.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/TestActivity.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/PostsViewModel.java 0 → 100644

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

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

Ignore Space Show notes View app/src/main/res/drawable/icon.jpg 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_friend.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_gps.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 0 → 100644

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

Ignore Space Show notes View app/src/main/res/layout/activity_requested.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/layout/activity_test.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below