diff --git a/DdamiApp/app/.idea/caches/build_file_checksums.ser b/DdamiApp/app/.idea/caches/build_file_checksums.ser index 61cdc87..82b1f2e 100644 Binary files a/DdamiApp/app/.idea/caches/build_file_checksums.ser and b/DdamiApp/app/.idea/caches/build_file_checksums.ser differ diff --git a/DdamiApp/app/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml b/DdamiApp/app/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml new file mode 100644 index 0000000..e60ec6e --- /dev/null +++ b/DdamiApp/app/.idea/libraries/Gradle__io_reactivex_rxjava2_rxkotlin_2_3_0_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/DetailActivity.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/DetailActivity.java index 4deeba9..3cb0089 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/DetailActivity.java +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/DetailActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.os.Bundle; import android.util.Log; -import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.EditText; @@ -22,11 +21,8 @@ import com.doubleslash.ddamiapp.R; import com.doubleslash.ddamiapp.adapter.CommentAdapter; import com.doubleslash.ddamiapp.adapter.DetailImgAdapter; -import com.doubleslash.ddamiapp.model.CommentItem; import com.doubleslash.ddamiapp.model.DetailImgItem; -import com.doubleslash.ddamiapp.model.DetailPieceCommentDAO; import com.doubleslash.ddamiapp.network.kotlin.ApiService; -import com.google.gson.JsonObject; import java.util.ArrayList; @@ -48,6 +44,8 @@ public class DetailActivity extends AppCompatActivity { ExpandableListView commentView; RecyclerView recyclerView; + String token; + @SuppressLint("CheckResult") protected void onCreate(Bundle savedInstanceState) { @@ -69,25 +67,87 @@ protected void onCreate(Bundle savedInstanceState) { addComment=(ImageButton)findViewById(R.id.add_comment); commentWrite=(EditText)findViewById(R.id.comment_write); - + viewCnt.bringToFront(); + heartCnt.bringToFront(); + ImageView heartImag = (ImageView)findViewById(R.id.detail_heart); + ImageView viewImag = (ImageView)findViewById(R.id.detail_view); + heartImag.bringToFront(); + viewImag.bringToFront(); detailText = (TextView) findViewById(R.id.detail_text); detail_img_recyclerview = (RecyclerView)findViewById(R.id.detail_img_recyclerview); - JsonObject inputJson = new JsonObject(); - - Intent intent = getIntent(); String fileId = intent.getStringExtra("FileId"); - Log.d("진희: fileId 확인 ",fileId ); + Log.d("진희: fileId 확인 ",fileId); + + token = getIntent().getStringExtra("token"); + Toast.makeText(this,"token = " + token, Toast.LENGTH_LONG).show(); + + Log.d("진희: token 확인 ",token); + + + ApiService.INSTANCE.getLikeList().getLikeList(token) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + it -> { + Log.e("tttestlist",it.toString()); + + for(int i=0; i { + Log.e("tttest",it.toString()); + },it -> { + Log.e("ffffailed",it.toString()); + }); + + } + }); + + + Log.e("tttestlist",it.toString()); + },it -> { + Log.e("ffffailedlist",it.toString()); + }); + ApiService.INSTANCE.getDetailPieceService().getDeatil(fileId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe( it -> { + ArrayList hasField = new ArrayList<>(); for(int i =0; i { - Log.e("tttest",it.toString()); - },it -> { - Log.e("ffffailed",it.toString()); - }); - } - }); - - detailBack.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -309,4 +332,4 @@ private void setExpandableListViewHeight(ExpandableListView listView, } -} +} \ No newline at end of file diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/login/LoginActivity.kt b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/login/LoginActivity.kt index 1f0e7b1..322e22d 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/login/LoginActivity.kt +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/login/LoginActivity.kt @@ -6,8 +6,12 @@ import android.os.Bundle import android.util.Log import android.widget.Toast import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.Fragment import com.doubleslash.ddamiapp.R +import com.doubleslash.ddamiapp.activity.DetailActivity import com.doubleslash.ddamiapp.activity.MainActivity +import com.doubleslash.ddamiapp.fragment.LikeFragment +import com.doubleslash.ddamiapp.fragment.MyRoomFragment import com.doubleslash.ddamiapp.network.kotlin.ApiService import com.doubleslash.ddamiapp.util.KeyboardVisibilityUtils import com.google.gson.JsonObject @@ -60,6 +64,22 @@ class LoginActivity : AppCompatActivity() { intent.putExtra("id", input.get("userId").toString()) startActivity(intent) finish() + + + val detailintent = Intent(this@LoginActivity, DetailActivity::class.java) + detailintent.putExtra("token", it.token) +// finish() + + val fragment: Fragment = LikeFragment() // Fragment 생성 + val bundle = Bundle(1) // 파라미터는 전달할 데이터 개수 + bundle.putString("token", it.token) // key , value + fragment.setArguments(bundle) + + val fragment2: Fragment = MyRoomFragment() // Fragment 생성 + val bundle2 = Bundle(1) // 파라미터는 전달할 데이터 개수 + bundle2.putString("token", it.token) // key , value + fragment2.setArguments(bundle2) + }, { Toast.makeText(applicationContext, "$it", Toast.LENGTH_SHORT).show() Log.e("영환", it.toString()) @@ -78,4 +98,4 @@ class LoginActivity : AppCompatActivity() { } } -} +} \ No newline at end of file diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/CommentAdapter.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/CommentAdapter.java index e096367..922fa7a 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/CommentAdapter.java +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/CommentAdapter.java @@ -74,6 +74,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, View convertView viewHolder.commentNic.setText(getGroup(groupPosition)); viewHolder.commentContext.setText(getGroup(groupPosition)); + viewHolder.commentProfile.setImageResource(R.drawable.img_detailview_commenter2); return v; } @@ -126,4 +127,4 @@ class ViewHolder{ public TextView commentNic, cYear, cMonth, cDay, commentContext, recomments; } -} +} \ No newline at end of file diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/LikeAdapter.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/LikeAdapter.java index 9610021..694e71f 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/LikeAdapter.java +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/LikeAdapter.java @@ -9,6 +9,7 @@ import com.doubleslash.ddamiapp.R; import com.doubleslash.ddamiapp.model.LikeItem; +import com.doubleslash.ddamiapp.model.MainItem; import com.doubleslash.ddamiapp.viewholder.LikeViewHolder; import java.util.ArrayList; @@ -16,21 +17,21 @@ public class LikeAdapter extends RecyclerView.Adapter { - public LikeAdapter(ArrayList list_like) { - this.list_like = list_like; - } - private ArrayList list_like; + public OnLikeItemClickListener onLikeListItemClicked; - public OnItemClickListener mOnItemClickListener = null; - - public interface OnItemClickListener { - void onItemClick(View view, LikeItem likeVO); - } - - public void setOnItemClickListener(OnItemClickListener listener) { - mOnItemClickListener = listener; + public LikeAdapter(ArrayList list_like, OnLikeItemClickListener itemViewClickListener) { + this.list_like = list_like; + this.onLikeListItemClicked = itemViewClickListener; } +// +// public interface OnItemClickListener { +// void onItemClick(LikeItem likeVO); +// } +// +// public void setOnItemClickListener(OnItemClickListener listener) { +// this.mOnItemClickListener = listener; +// } @NonNull @Override @@ -41,24 +42,7 @@ public LikeViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType @Override public void onBindViewHolder(@NonNull LikeViewHolder holder, int position) { - holder.adapt(list_like.get(position)); -// -// holder.heartPiece.setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View view) { -// -// -// holder.heartPiece.setImageResource(R.drawable.btn_detailview_heart); -// } -// }); -// holder.layoutLikeList.setOnClickListener(new View.OnClickListener() { -// -// @Override -// public void onClick(View v) { -// //작업물 상세로 이동 -// mOnItemClickListener.onItemClick(v, likeVO); -// } -// }); + holder.adapt(list_like.get(position),onLikeListItemClicked); } @Override diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnItemClickListener.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnItemClickListener.java index 6e0cf36..b67486d 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnItemClickListener.java +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnItemClickListener.java @@ -1,5 +1,6 @@ package com.doubleslash.ddamiapp.adapter; +import com.doubleslash.ddamiapp.model.LikeItem; import com.doubleslash.ddamiapp.model.MainItem; public interface OnItemClickListener { diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnLikeItemClickListener.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnLikeItemClickListener.java new file mode 100644 index 0000000..0957907 --- /dev/null +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/adapter/OnLikeItemClickListener.java @@ -0,0 +1,7 @@ +package com.doubleslash.ddamiapp.adapter; + +import com.doubleslash.ddamiapp.model.LikeItem; + +public interface OnLikeItemClickListener { + void onLikeListItemClicked(LikeItem item); +} diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/LikeFragment.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/LikeFragment.java index dab2671..f3f11f8 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/LikeFragment.java +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/LikeFragment.java @@ -8,6 +8,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageButton; +import android.widget.Toast; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; @@ -16,7 +17,10 @@ import androidx.recyclerview.widget.RecyclerView; import com.doubleslash.ddamiapp.R; +import com.doubleslash.ddamiapp.activity.DetailActivity; import com.doubleslash.ddamiapp.adapter.LikeAdapter; +import com.doubleslash.ddamiapp.adapter.MainAdapter; +import com.doubleslash.ddamiapp.adapter.OnLikeItemClickListener; import com.doubleslash.ddamiapp.model.LikeItem; import com.doubleslash.ddamiapp.model.MyLikeListItemDAO; import com.doubleslash.ddamiapp.network.kotlin.ApiService; @@ -27,7 +31,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; -public class LikeFragment extends Fragment implements LikeAdapter.OnItemClickListener { +public class LikeFragment extends Fragment implements OnLikeItemClickListener { ImageButton likeBack; @@ -78,36 +82,43 @@ public void onClick(View view) { for (int i = 0; i < it.getLikes().size(); i++) { MyLikeListItemDAO like = it.getLikes().get(i); - list.add(new LikeItem(like.getFileUrl().get(0), + list.add(new LikeItem( + like.getId(), + like.getFileUrl().get(0), like.getTitle(), - // like.getAuthor().getUserProfile(), + // like.getAuthor().getUserProfile(), like.getAuthor().getUserId())); } - mLikeAdapter = new LikeAdapter(list); - mLikeAdapter.setOnItemClickListener(this); - like_recyclerview.setAdapter(mLikeAdapter); + like_recyclerview.setAdapter(new LikeAdapter(list, this::onLikeListItemClicked)); RecyclerView.LayoutManager mLayoutManager = new GridLayoutManager(getActivity(), 2); like_recyclerview.setLayoutManager(mLayoutManager); //comments - Log.e("tttest",it.toString()); - },it -> { - Log.e("failed",it.toString()); + Log.e("tttest", it.toString()); + }, it -> { + Log.e("failed", it.toString()); }); return view; } @Override - public void onItemClick(View view, LikeItem likeVO) { + public void onLikeListItemClicked(LikeItem item) { + //작품 상세보시로 이동, id값 같이 - Log.e("RecyclerVIew :: ", likeVO.toString()); - } + Log.e("RecyclerVIew :: ", item.toString()); -} + Toast.makeText(getContext(), item.getNicname(), Toast.LENGTH_SHORT).show(); + Intent detailIntent = new Intent(getActivity(), DetailActivity.class); + detailIntent.putExtra("token", token); + detailIntent.putExtra("FileId", item.getPieceId()); + startActivity(detailIntent); + + } +} diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/MyRoomFragment.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/MyRoomFragment.java index 42c117e..c74333e 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/MyRoomFragment.java +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/MyRoomFragment.java @@ -14,11 +14,13 @@ import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.doubleslash.ddamiapp.R; +import com.doubleslash.ddamiapp.activity.DetailActivity; import com.doubleslash.ddamiapp.activity.MainActivity; import com.doubleslash.ddamiapp.activity.WritingActivity; import com.doubleslash.ddamiapp.adapter.MyroomAdapter; @@ -45,6 +47,15 @@ public class MyRoomFragment extends Fragment { Button btn_modify, btn_follow; FloatingActionButton btn_fab; + String token; + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + token = getActivity().getIntent().getStringExtra("token"); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -146,8 +157,9 @@ public boolean onInterceptTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEv Log.e("hhhhere", "현재 터치한 item의 position은 " + currentItem.getId()); //switch fragment to DetailActivity onItemClicked - Intent intent = new Intent(getActivity(), MainActivity.class); + Intent intent = new Intent(getActivity(), DetailActivity.class); intent.putExtra("FileId", currentItem.getId()); + intent.putExtra("token", token); startActivity(intent); return true; } @@ -164,7 +176,7 @@ public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) { }; recyclerView.addOnItemTouchListener(onItemTouchListener); - + //FloatingActionButton onClick event btn_fab.setOnClickListener(new View.OnClickListener() { @Override @@ -198,4 +210,4 @@ public void onClick(View view) { return view; } -} +} \ No newline at end of file diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/shop/ShopFirstFragment.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/shop/ShopFirstFragment.java index dbcdc7e..0960879 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/shop/ShopFirstFragment.java +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/fragment/shop/ShopFirstFragment.java @@ -97,13 +97,6 @@ public void onClick(View view) { } }); -// filter.setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View view) { -// ((MainActivity)getActivity()).replaceFragment(FilterFragment.newInstance()); -// } -// }); - return v; } diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/model/LikeItem.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/model/LikeItem.java index af77e43..5e277bd 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/model/LikeItem.java +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/model/LikeItem.java @@ -4,29 +4,29 @@ public class LikeItem { - private int num; + private String pieceId; private String image; private String title; private String profile; private String nicname; private Boolean heart; - private ArrayList likelist; - public LikeItem(String image, String title, + public LikeItem(String pieceId, String image, String title, //String profile, String nicname) { + this.pieceId = pieceId; this.image = image; this.title = title; // this.profile = profile; this.nicname = nicname; } - public int getNum() { - return num; + public String getPieceId() { + return pieceId; } - public void setNum(int num) { - this.num = num; + public void setPieceId(String pieceId) { + this.pieceId = pieceId; } public String getImage() { @@ -68,17 +68,6 @@ public Boolean getHeart() { public void setHeart(Boolean heart) { this.heart = heart; } - - public ArrayList getLikelist() { - return likelist; - } - - public void setLikelist(ArrayList likelist) { - this.likelist = likelist; - } - - - @Override public String toString() { return "ListVO{" + @@ -86,8 +75,7 @@ public String toString() { ", title='" + title + '\'' + ", profile='" + profile + '\'' + ", nicname='" + nicname + '\'' + - ", heart='" + heart + '\'' + - ", likelist=" + likelist + + ", pieceId='" + pieceId + '}'; } } \ No newline at end of file diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/network/kotlin/LikeTFApi.kt b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/network/kotlin/LikeTFApi.kt index f0d973c..ccb6e68 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/network/kotlin/LikeTFApi.kt +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/network/kotlin/LikeTFApi.kt @@ -1,7 +1,9 @@ package com.doubleslash.ddamiapp.network.kotlin import com.doubleslash.ddamiapp.model.DetailPieceDAO +import com.doubleslash.ddamiapp.model.LikeTFDAO import io.reactivex.Single +import retrofit2.Call import retrofit2.http.Header import retrofit2.http.POST import retrofit2.http.Path diff --git a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/viewholder/LikeViewHolder.java b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/viewholder/LikeViewHolder.java index d7f3c9e..50c4c55 100644 --- a/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/viewholder/LikeViewHolder.java +++ b/DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/viewholder/LikeViewHolder.java @@ -14,6 +14,8 @@ import com.doubleslash.ddamiapp.R; import com.doubleslash.ddamiapp.adapter.LikeAdapter; +import com.doubleslash.ddamiapp.adapter.OnItemClickListener; +import com.doubleslash.ddamiapp.adapter.OnLikeItemClickListener; import com.doubleslash.ddamiapp.model.DetailImgItem; import com.doubleslash.ddamiapp.model.LikeItem; import com.squareup.picasso.Picasso; @@ -32,19 +34,21 @@ public LikeViewHolder(@NonNull View itemView) { private TextView title = (TextView) itemView.findViewById(R.id.title_piece); @SuppressLint("SetTextI18n") - public void adapt(LikeItem likeItem){ + public void adapt(LikeItem likeItem, OnLikeItemClickListener viewClickListener2){ + layoutLikeList.setOnClickListener( + new View.OnClickListener() { + @Override + public void onClick(View view) { + viewClickListener2.onLikeListItemClicked(likeItem); + } + } + ); Picasso.get().load(likeItem.getImage()).fit().into(likeListImage); title.setText(likeItem.getTitle()); likeNic.setText(likeItem.getNicname()); -// if(likeItem.getHeart()==true){ -// heartPiece.setSelected(true); -// }else if(likeItem.getHeart()==false){ -// heartPiece.setSelected(false); -// } - likeProfile.setBackground(new ShapeDrawable(new OvalShape())); likeProfile.setClipToOutline(true); Picasso.get().load(likeItem.getProfile()).into(likeProfile); diff --git a/DdamiApp/app/src/main/res/drawable-hdpi/img_detailview_commenter2.png b/DdamiApp/app/src/main/res/drawable-hdpi/img_detailview_commenter2.png new file mode 100644 index 0000000..8d2e89e Binary files /dev/null and b/DdamiApp/app/src/main/res/drawable-hdpi/img_detailview_commenter2.png differ diff --git a/DdamiApp/app/src/main/res/drawable-ldpi/img_detailview_commenter2.png b/DdamiApp/app/src/main/res/drawable-ldpi/img_detailview_commenter2.png new file mode 100644 index 0000000..64bc6ee Binary files /dev/null and b/DdamiApp/app/src/main/res/drawable-ldpi/img_detailview_commenter2.png differ diff --git a/DdamiApp/app/src/main/res/drawable-mdpi/img_detailview_commenter2.png b/DdamiApp/app/src/main/res/drawable-mdpi/img_detailview_commenter2.png new file mode 100644 index 0000000..9188270 Binary files /dev/null and b/DdamiApp/app/src/main/res/drawable-mdpi/img_detailview_commenter2.png differ diff --git a/DdamiApp/app/src/main/res/drawable-xhdpi/img_detailview_commenter2.png b/DdamiApp/app/src/main/res/drawable-xhdpi/img_detailview_commenter2.png new file mode 100644 index 0000000..4904048 Binary files /dev/null and b/DdamiApp/app/src/main/res/drawable-xhdpi/img_detailview_commenter2.png differ diff --git a/DdamiApp/app/src/main/res/drawable-xxhdpi/img_detailview_commenter2.png b/DdamiApp/app/src/main/res/drawable-xxhdpi/img_detailview_commenter2.png new file mode 100644 index 0000000..e943aa7 Binary files /dev/null and b/DdamiApp/app/src/main/res/drawable-xxhdpi/img_detailview_commenter2.png differ diff --git a/DdamiApp/app/src/main/res/drawable-xxxhdpi/img_detailview_commenter2.png b/DdamiApp/app/src/main/res/drawable-xxxhdpi/img_detailview_commenter2.png new file mode 100644 index 0000000..54a31d6 Binary files /dev/null and b/DdamiApp/app/src/main/res/drawable-xxxhdpi/img_detailview_commenter2.png differ diff --git a/DdamiApp/app/src/main/res/drawable/shape_detail_layout.xml b/DdamiApp/app/src/main/res/drawable/shape_detail_layout.xml index 4f1e2e7..d327fee 100644 --- a/DdamiApp/app/src/main/res/drawable/shape_detail_layout.xml +++ b/DdamiApp/app/src/main/res/drawable/shape_detail_layout.xml @@ -1,6 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10,6 +38,7 @@ + @@ -42,6 +71,7 @@ + @@ -50,6 +80,7 @@ + + \ No newline at end of file diff --git a/DdamiApp/app/src/main/res/layout/activity_detail.xml b/DdamiApp/app/src/main/res/layout/activity_detail.xml index 66b3924..0260add 100644 --- a/DdamiApp/app/src/main/res/layout/activity_detail.xml +++ b/DdamiApp/app/src/main/res/layout/activity_detail.xml @@ -1,12 +1,11 @@ - - + + + - - - - - - - - - - - + + + + + + + + @@ -260,4 +273,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/DdamiApp/app/src/main/res/layout/likelist_item_cardview.xml b/DdamiApp/app/src/main/res/layout/likelist_item_cardview.xml index bc6a4c2..9a7dc19 100644 --- a/DdamiApp/app/src/main/res/layout/likelist_item_cardview.xml +++ b/DdamiApp/app/src/main/res/layout/likelist_item_cardview.xml @@ -5,8 +5,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/layout_like_list" android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_margin="8dp" + android:layout_width="180dp" + android:layout_height="200dp">