[마이][Bug] 메인/북마크 레이아웃 수정

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/LifeplusContentsBean.java

@@ -141,18 +141,23 @@ public class LifeplusContentsBean extends JsonBeanBase {
   public String getTwoLineTitle() {
     // 타이틀 줄바꿈이 사라져서 강제로 줄바꿈 해줌
     String twoLineTitle = this.title;
-    twoLineTitle = twoLineTitle.replace("\n", " ").replace("  ", " ");
-    String[] titles = twoLineTitle.split(" ");
-    int len = titles.length;
-    int target = len > 5 ? 2 : 1;
-    StringBuilder stringBuilder = new StringBuilder();
-    for (int i = 0; i < len; ++i) {
-      stringBuilder.append(titles[i]).append(" ");
-      if (i == target) {
-        stringBuilder.append("\n");
+    if (twoLineTitle.contains("\n")) {
+      return twoLineTitle;
+    }
+    else {
+//      twoLineTitle = twoLineTitle.replace("\n", " ").replace("  ", " ");
+      String[] titles = twoLineTitle.split(" ");
+      int len = titles.length;
+      int target = len > 5 ? 2 : 1;
+      StringBuilder stringBuilder = new StringBuilder();
+      for (int i = 0; i < len; ++i) {
+        stringBuilder.append(titles[i]).append(" ");
+        if (i == target) {
+          stringBuilder.append("\n");
+        }
       }
+      return stringBuilder.toString();
     }
-    return stringBuilder.toString();
   }
 
   public LifeplusContentsBean clone() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/BookMarkListViewHolder.java

@@ -43,7 +43,7 @@ public class BookMarkListViewHolder extends BookMarkListView {
     if (null != bean) {
 
       Glide.with(imageViewBookMark).load(bean.getImageUrl()).into(imageViewBookMark);
-      textViewBookMarkTitle.setText(bean.getTitle());
+      textViewBookMarkTitle.setText(bean.getTwoLineTitle());
       checkBoxLike.setChecked(bean.isLiked());
       checkBoxBookMark.setChecked(bean.isBookmarked());
 

app/src/main/res/layout/book_mark_list_view.xml

@@ -8,23 +8,23 @@
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/fifth_layout"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintBottom_toBottomOf="parent"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
     <ImageView
       android:id="@+id/image_view_book_mark"
       android:layout_width="165dp"
       android:layout_height="124dp"
       android:scaleType="centerCrop"
-      tools:src="@drawable/img_bestbucket_banner_1"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toStartOf="@+id/text_view_book_mark_title"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"/>
+      app:layout_constraintTop_toTopOf="parent"
+      tools:src="@drawable/img_bestbucket_banner_1"/>
 
     <TextView
       android:id="@+id/text_view_book_mark_title"
@@ -65,7 +65,7 @@
         android:button="@null"
         android:drawableLeft="@drawable/custom_like_check"
         android:paddingStart="6dp"
-        android:paddingEnd="5dp"
+        android:paddingEnd="4dp"
         android:saveEnabled="false"
         android:text=""
         app:layout_constraintBottom_toBottomOf="parent"
@@ -80,8 +80,8 @@
         android:background="@null"
         android:button="@null"
         android:drawableLeft="@drawable/custom_book_mark_check"
-        android:paddingStart="6dp"
-        android:paddingEnd="5dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="6dp"
         android:saveEnabled="false"
         android:text=""
         app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/fragment_my_main.xml

@@ -421,7 +421,7 @@
           android:button="@null"
           android:drawableLeft="@drawable/custom_like_check"
           android:paddingStart="6dp"
-          android:paddingEnd="5dp"
+          android:paddingEnd="4dp"
           android:saveEnabled="false"
           android:text=""
           app:layout_constraintBottom_toBottomOf="parent"
@@ -436,8 +436,8 @@
           android:background="@null"
           android:button="@null"
           android:drawableLeft="@drawable/custom_book_mark_check"
-          android:paddingStart="6dp"
-          android:paddingEnd="5dp"
+          android:paddingStart="4dp"
+          android:paddingEnd="6dp"
           android:saveEnabled="false"
           android:text=""
           app:layout_constraintBottom_toBottomOf="parent"
@@ -506,8 +506,8 @@
           android:background="@null"
           android:button="@null"
           android:drawableLeft="@drawable/custom_like_check"
-          android:paddingStart="5dp"
-          android:paddingEnd="6dp"
+          android:paddingStart="6dp"
+          android:paddingEnd="4dp"
           android:saveEnabled="false"
           android:text=""
           app:layout_constraintBottom_toBottomOf="parent"
@@ -523,7 +523,7 @@
           android:background="@null"
           android:button="@null"
           android:drawableLeft="@drawable/custom_book_mark_check"
-          android:paddingStart="5dp"
+          android:paddingStart="4dp"
           android:paddingEnd="6dp"
           android:saveEnabled="false"
           android:text=""