Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/series/ContentsSeriesViewHolder.java

@@ -2,7 +2,6 @@ package kr.co.zumo.app.lifeplus.view.screen.contents.series;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -14,6 +13,8 @@ import kr.co.zumo.app.lifeplus.bean.api.SeriesItemBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
+import kr.co.zumo.app.lifeplus.view.custom.BookmarkCheckbox;
+import kr.co.zumo.app.lifeplus.view.custom.LikeCheckbox;
 
 /**
  * ContentsSeriesViewHolder
@@ -30,8 +31,8 @@ public class ContentsSeriesViewHolder extends RecyclerView.ViewHolder {
   private ImageView imageViewSeries;
   private TextView textViewSmall;
   private TextView textViewBig;
-  private CheckBox checkBoxLike;
-  private CheckBox checkBoxBookmark;
+  private LikeCheckbox checkBoxLike;
+  private BookmarkCheckbox checkBoxBookmark;
   private SeriesItemBean bean;
   private IEventListener listener;
   private int index;

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

@@ -145,11 +145,11 @@ public class BookMarkListPresenter extends Presenter<BookMarkListModel, IBookMar
       case Event.SUCCESS:
         if (integer == Event.CONTENTS_BOOKMARK) {
           // 북마크의 북마크(체크박스)
-          view.setBookmarkContentsBookmarked(event.getIndex(), event.getBool());
+          //view.setBookmarkContentsBookmarked(event.getIndex(), event.getBool());
         }
         else if (integer == Event.CONTENTS_LIKE) {
           // 북마크의 좋아요(체크박스)
-          view.setBookmarkContentsLiked(event.getIndex(), event.getBool());
+         // view.setBookmarkContentsLiked(event.getIndex(), event.getBool());
         }
         else {
           doubleChecker.checkSecond();

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

@@ -1,7 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
 import android.view.View;
-import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -10,8 +9,11 @@ import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
+import kr.co.zumo.app.lifeplus.view.custom.BookmarkCheckbox;
+import kr.co.zumo.app.lifeplus.view.custom.LikeCheckbox;
 
 /**
  * BookMarkViewHolder
@@ -26,13 +28,15 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
 public class BookMarkListViewHolder extends BookMarkListView {
   private ImageView imageViewBookMark;
   private TextView textViewBookMarkTitle;
-  private CheckBox checkBoxLike;
-  private CheckBox checkBoxBookMark;
+  private TextView textViewBookMarkSubTitle;
+  private LikeCheckbox checkBoxLike;
+  private BookmarkCheckbox checkBoxBookMark;
 
   public BookMarkListViewHolder(View itemView) {
     super(itemView);
     imageViewBookMark = itemView.findViewById(R.id.image_view_book_mark);
     textViewBookMarkTitle = itemView.findViewById(R.id.text_view_book_mark_title);
+    textViewBookMarkSubTitle = itemView.findViewById(R.id.text_view_book_mark_sub_title);
     checkBoxLike = itemView.findViewById(R.id.like_check);
     checkBoxBookMark = itemView.findViewById(R.id.book_mark_check);
   }
@@ -48,6 +52,15 @@ public class BookMarkListViewHolder extends BookMarkListView {
         .apply(new RequestOptions().placeholder(R.drawable.image_loading_small))
         .load(bean.getImageUrl()).into(imageViewBookMark);
       textViewBookMarkTitle.setText(bean.getTwoLineTitle());
+
+      if (bean.getSubTitle() != null && StringUtil.isFull(bean.getSubTitle())) {
+        textViewBookMarkSubTitle.setVisibility(View.VISIBLE);
+        textViewBookMarkSubTitle.setText(bean.getSubTitle());
+      }
+      else {
+        textViewBookMarkSubTitle.setVisibility(View.GONE);
+      }
+
       checkBoxLike.setChecked(bean.isLiked());
       checkBoxBookMark.setChecked(bean.isBookmarked());
 

app/src/main/res/drawable/icon_bookmark_on.xml

@@ -3,12 +3,6 @@
         android:height="14dp"
         android:viewportWidth="56"
         android:viewportHeight="56">
-  <group
-    android:pivotX="28"
-    android:pivotY="28"
-    android:scaleX="0.7"
-    android:scaleY="0.7">
-
     <path
       android:fillColor="#F27824"
       android:fillType="evenOdd"
@@ -17,5 +11,4 @@
       android:strokeColor="#F27824"
       android:strokeLineCap="round"
       android:strokeLineJoin="round"/>
-  </group>
 </vector>

app/src/main/res/drawable/icon_like_on.xml

@@ -3,17 +3,11 @@
         android:height="14dp"
         android:viewportWidth="56"
         android:viewportHeight="56">
-  <group
-    android:pivotX="28"
-    android:pivotY="28"
-    android:scaleX="0.7"
-    android:scaleY="0.7">
 
-    <path
-      android:fillColor="#F27824"
-      android:fillType="evenOdd"
-      android:pathData="M28,49c-0.59,0 -1.18,-0.189 -2,-1 -4.317,-3.066 -17.15,-13.075 -20,-19 -3.917,-6.905 -1.705,-15.942 5,-20 1.873,-1.364 4.19,-2 6,-2 4.479,0 8.39,1.959 11,6 2.611,-4.042 6.522,-6 11,-6 1.81,0 4.126,0.636 6,2 6.705,4.058 8.916,13.095 5,20 -2.85,5.925 -15.685,15.934 -20,19 -0.82,0.811 -1.41,1 -2,1z"
-      android:strokeWidth="4"
-      android:strokeColor="#F27824"/>
-  </group>
+  <path
+    android:fillColor="#F27824"
+    android:fillType="evenOdd"
+    android:pathData="M28,49c-0.59,0 -1.18,-0.189 -2,-1 -4.317,-3.066 -17.15,-13.075 -20,-19 -3.917,-6.905 -1.705,-15.942 5,-20 1.873,-1.364 4.19,-2 6,-2 4.479,0 8.39,1.959 11,6 2.611,-4.042 6.522,-6 11,-6 1.81,0 4.126,0.636 6,2 6.705,4.058 8.916,13.095 5,20 -2.85,5.925 -15.685,15.934 -20,19 -0.82,0.811 -1.41,1 -2,1z"
+    android:strokeWidth="4"
+    android:strokeColor="#F27824"/>
 </vector>

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

@@ -46,18 +46,43 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="18dp"
       android:layout_marginTop="16dp"
+      android:ellipsize="end"
       android:lineSpacingExtra="6sp"
+      android:maxLength="25"
+      android:maxLines="2"
       android:textColor="@color/C000000"
       android:textSize="14sp"
-      app:layout_constraintBottom_toTopOf="@id/layout_like_bookmark"
+      app:layout_constraintBottom_toTopOf="@id/text_view_book_mark_sub_title"
       app:layout_constraintStart_toEndOf="@+id/image_view_book_mark"
       app:layout_constraintTop_toTopOf="parent"
       app:layout_constraintVertical_chainStyle="packed"
-      app:layout_goneMarginBottom="27dp"
+      app:layout_goneMarginBottom="10dp"
       app:layout_goneMarginTop="27dp"
       tools:text="@string/book_mark_default_text2"
       />
 
+    <TextView
+      android:id="@+id/text_view_book_mark_sub_title"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="18dp"
+      android:layout_marginTop="7dp"
+      android:layout_marginBottom="13dp"
+      android:ellipsize="end"
+      android:lineSpacingExtra="3.5sp"
+      android:maxWidth="120dp"
+      android:maxLines="1"
+      android:singleLine="true"
+      android:textColor="@color/C666666"
+      android:textSize="12sp"
+      app:layout_constraintBottom_toTopOf="@+id/layout_like_bookmark"
+      app:layout_constraintStart_toEndOf="@+id/image_view_book_mark"
+      app:layout_constraintTop_toBottomOf="@id/text_view_book_mark_title"
+      app:layout_constraintVertical_chainStyle="packed"
+      tools:text="한가위 송편빚기 교실dddd"
+      tools:visibility="visible"
+      />
+
     <android.support.constraint.ConstraintLayout
       android:id="@+id/layout_like_bookmark"
       android:layout_width="wrap_content"
@@ -69,36 +94,27 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintHorizontal_bias="1.0"
       app:layout_constraintStart_toEndOf="@+id/image_view_book_mark"
-      app:layout_constraintTop_toBottomOf="@+id/text_view_book_mark_title"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_book_mark_sub_title"
       >
 
-      <CheckBox
+      <kr.co.zumo.app.lifeplus.view.custom.LikeCheckbox
         android:id="@+id/like_check"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@null"
-        android:button="@null"
         android:drawableLeft="@drawable/custom_like_check"
         android:paddingStart="6dp"
         android:paddingEnd="4dp"
-        android:saveEnabled="false"
-        android:text=""
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"/>
 
-      <CheckBox
+      <kr.co.zumo.app.lifeplus.view.custom.BookmarkCheckbox
         android:id="@+id/book_mark_check"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@null"
-        android:button="@null"
-        android:drawableLeft="@drawable/custom_book_mark_check"
         android:paddingStart="4dp"
         android:paddingEnd="6dp"
-        android:saveEnabled="false"
-        android:text=""
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/like_check"
         app:layout_constraintTop_toTopOf="parent"/>

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

@@ -67,37 +67,27 @@
     app:layout_constraintTop_toBottomOf="@+id/text_view_series_title"
     >
 
-    <CheckBox
+    <kr.co.zumo.app.lifeplus.view.custom.LikeCheckbox
       android:id="@+id/like_check"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:background="@null"
-      android:button="@null"
-      android:drawableLeft="@drawable/custom_like_check"
       android:paddingStart="9dp"
       android:paddingTop="7dp"
       android:paddingEnd="4dp"
       android:paddingBottom="7dp"
-      android:saveEnabled="false"
-      android:text=""
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:layout_constraintVertical_bias="0.0"/>
 
-    <CheckBox
+    <kr.co.zumo.app.lifeplus.view.custom.BookmarkCheckbox
       android:id="@+id/book_mark_check"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:background="@null"
-      android:button="@null"
-      android:drawableLeft="@drawable/custom_book_mark_check"
       android:paddingStart="4dp"
       android:paddingTop="7dp"
       android:paddingEnd="9dp"
       android:paddingBottom="7dp"
-      android:saveEnabled="false"
-      android:text=""
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toEndOf="@+id/like_check"
       app:layout_constraintTop_toTopOf="parent"/>