Browse code Merge remote-tracking branch 'origin/master' into PostAct_bugs # Conflicts: # app/src/main/java/com/example/nemophila/PostActivity.java FriendActivity FriendActivity_1017 changeicon filter_ic_seturl geticon icon layoutFix master
commit 87c72e5fa7a1d0ef30ff20151c7ef9e483a941a0 2 parents 3ea730f + 66a2fb2 k-kimoto authored on 12 Oct

Showing 26 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/nemophila/LoginActivity.java
• app/src/main/java/com/example/nemophila/MapsActivity.java
• app/src/main/java/com/example/nemophila/MapsFragment.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/PostActivity.java
• app/src/main/java/com/example/nemophila/ShopActivity.java
• app/src/main/java/com/example/nemophila/entities/ErrorType.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/PostsViewModel.java
• app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java
• app/src/main/res/drawable/ic_backpage.xml
• app/src/main/res/layout/activity_friend.xml
• app/src/main/res/layout/activity_login.xml
• app/src/main/res/layout/activity_maps.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_shop.xml
• app/src/main/res/layout/activity_sign_up.xml
• app/src/main/res/layout/layout_my_page_activity_posts.xml
• app/src/main/res/layout/layout_shop_activity_posts.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/AndroidManifest.xml

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/MapsActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/MapsFragment.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/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/entities/ErrorType.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/PostsViewModel.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/ic_backpage.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_login.xml

Ignore Space Show notes View app/src/main/res/layout/activity_maps.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/activity_shop.xml

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

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

Show line notes below