Merge remote-tracking branch 'origin/master' into PostAct_bugs
# Conflicts: # app/src/main/java/com/example/nemophila/PostActivity.java |
---|
.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 0 → 100644 |
---|
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 |
---|