Browse code Merge branch 'master' into Test # Conflicts: # .idea/misc.xml # app/src/main/AndroidManifest.xml # app/src/main/res/values/strings.xml Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct Test 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 eafda43d53c30bb853d1e7b7aa024fbb63d78807 2 parents bc6a413 + 2f2eeb9 t-nagao authored on 8 Jun 2023

Showing 16 changed files

• .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/RequestedActivity.java
• app/src/main/java/com/example/nemophila/ShopActivity.java
• app/src/main/res/layout/activity_friend.xml
• app/src/main/res/layout/activity_gps.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/values/strings.xml

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/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/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_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/values/strings.xml

Show line notes below