Merge remote-tracking branch 'origin/TestPostJson' into TestPostJson
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
|
---|
.idea/misc.xml |
---|
app/src/main/AndroidManifest.xml |
---|
app/src/main/java/com/example/nemophila/PostsViewHolder.java 0 → 100644 |
---|
app/src/main/java/com/example/nemophila/ShopActivity.java |
---|
app/src/main/java/com/example/nemophila/ShopActivityAdapter.java |
---|
app/src/main/java/com/example/nemophila/ShopActivityViewHolder.java 100644 → 0 |
---|
app/src/main/java/com/example/nemophila/ShopCreateActivity.java 0 → 100644 |
---|
app/src/main/res/layout/activity_shop.xml |
---|
app/src/main/res/layout/activity_shop_create.xml 0 → 100644 |
---|
app/src/main/res/layout/layout_shop_activity_posts.xml |
---|