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

app/src/main/assets/on_boarding/new/framer/framer.vekter.js

@@ -308,14 +308,14 @@
 	var __layer_7__ = new Layer({
 		"parent": Title,
 		"backgroundColor": null,
-		"width": 876,
+		"width": 980,
 		"x": 80,
 		"height": 69,
 		"constraintValues": {
 			"left": 80,
 			"height": 69,
 			"centerAnchorX": 0.4170692431561997,
-			"width": 876,
+			"width": 980,
 			"top": 1189,
 			"centerAnchorY": 0.55412137681159424
 		},
@@ -329,7 +329,7 @@
 		"name": "title2",
 		"backgroundSize": "fill",
 		"backgroundColor": null,
-		"width": 796,
+		"width": 884 ,
 		"x": 40,
 		"height": 45,
 		"constraintValues": {
@@ -337,7 +337,7 @@
 			"aspectRatioLocked": true,
 			"height": 45,
 			"centerAnchorX": 0.5,
-			"width": 900,
+			"width": 884 ,
 			"top": 12,
 			"centerAnchorY": 0.5
 		},
@@ -352,7 +352,7 @@
 		"name": "bt_arrow",
 		"backgroundColor": null,
 		"width": 400,
-		"x": 842,
+		"x": 900,
 		"height": 124,
 		"constraintValues": {
 			"left": 842,

app/src/main/assets/on_boarding/zumo/framer/framer.vekter.js

@@ -1269,14 +1269,14 @@
 	var __layer_23__ = new Layer({
 		"parent": Title,
 		"backgroundColor": null,
-		"width": 876,
+		"width": 980,
 		"x": 80,
 		"height": 69,
 		"constraintValues": {
 			"left": 80,
 			"height": 69,
 			"centerAnchorX": 0.4170692431561997,
-			"width": 876,
+			"width": 980,
 			"top": 1189,
 			"centerAnchorY": 0.55412137681159424
 		},
@@ -1290,7 +1290,7 @@
 		"name": "title2",
 		"backgroundSize": "fill",
 		"backgroundColor": null,
-		"width": 796,
+		"width": 884 ,
 		"x": 40,
 		"height": 45,
 		"constraintValues": {
@@ -1298,7 +1298,7 @@
 			"aspectRatioLocked": true,
 			"height": 45,
 			"centerAnchorX": 0.5,
-			"width": 900,
+			"width": 884 ,
 			"top": 12,
 			"centerAnchorY": 0.5
 		},
@@ -1313,7 +1313,7 @@
 		"name": "bt_arrow",
 		"backgroundColor": null,
 		"width": 400,
-		"x": 842,
+		"x": 900,
 		"height": 124,
 		"constraintValues": {
 			"left": 842,

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

@@ -130,6 +130,7 @@ public class ContentsItemBean extends LifeplusContentsBean {
     return type;
   }
 
+
   /**
    * 이미지 리스트 중에서 첫 번째 것을 가져온다.
    * - html / mov url 을 반환한다.
@@ -149,7 +150,7 @@ public class ContentsItemBean extends LifeplusContentsBean {
     super.setListAttributeType(listAttributeType);
 
     // 하위 이미지에게도 타입 지정해줌
-    if(null != getItemImageList()) {
+    if (null != getItemImageList()) {
       for (ContentsDetailImageBean contentsDetailImageBean : getItemImageList()) {
         contentsDetailImageBean.setListAttributeType(listAttributeType);
       }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type4/FourthCategoryMainItemViewHolder.java

@@ -10,7 +10,6 @@ import com.bumptech.glide.request.RequestOptions;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.CategoryContentsBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
-import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainViewHolder;
 
@@ -28,14 +27,12 @@ public class FourthCategoryMainItemViewHolder extends CategoryMainViewHolder<Cat
 
   private TextView textViewMainFourthCategoryTitle1;
   private TextView textViewMainFourthCategoryTitle2;
-  private TextView textViewMainFourthCategoryTitle3;
   private ImageView imageViewMainFourthCategory;
 
   public FourthCategoryMainItemViewHolder(View itemView) {
     super(itemView);
     textViewMainFourthCategoryTitle1 = itemView.findViewById(R.id.text_view_main_fourth_category_title1);
     textViewMainFourthCategoryTitle2 = itemView.findViewById(R.id.text_view_main_fourth_category_title2);
-    textViewMainFourthCategoryTitle3 = itemView.findViewById(R.id.text_view_main_fourth_category_title3);
     imageViewMainFourthCategory = itemView.findViewById(R.id.image_view_main_fourth_category);
   }
 
@@ -44,7 +41,6 @@ public class FourthCategoryMainItemViewHolder extends CategoryMainViewHolder<Cat
     imageViewMainFourthCategory = null;
     textViewMainFourthCategoryTitle1 = null;
     textViewMainFourthCategoryTitle2 = null;
-    textViewMainFourthCategoryTitle3 = null;
   }
 
   @Override
@@ -60,8 +56,6 @@ public class FourthCategoryMainItemViewHolder extends CategoryMainViewHolder<Cat
 
       textViewMainFourthCategoryTitle1.setText(bean.getSubTitle());
       textViewMainFourthCategoryTitle2.setText(bean.getTwoLineTitle());
-      String subCategory = bean.getSubCategory();
-      textViewMainFourthCategoryTitle3.setText(StringUtil.isFull(subCategory) ? subCategory : "");
     }
 
     itemView.setOnClickListener(v -> {

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

@@ -17,6 +17,7 @@ import com.bumptech.glide.request.target.Target;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsItemBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusImageBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -41,6 +42,7 @@ public class ContentsOverviewHolder extends RecyclerView.ViewHolder {
   private TextView textViewCategoryNumber;
   private IEventListener listener;
   private ContentsItemBean contentsItemBean;
+  private ImageView flagVideo;
   private int index;
 
   public ContentsOverviewHolder(View itemView) {
@@ -50,6 +52,7 @@ public class ContentsOverviewHolder extends RecyclerView.ViewHolder {
     textViewSubTitle = itemView.findViewById(R.id.text_view_sub_title);
     textViewCategoryNumber = itemView.findViewById(R.id.text_view_category_number);
     dim = itemView.findViewById(R.id.view_dim);
+    flagVideo = itemView.findViewById(R.id.image_view_video);
     Visibler.invisible(dim);
   }
 
@@ -92,6 +95,8 @@ public class ContentsOverviewHolder extends RecyclerView.ViewHolder {
     imageViewItem.setOnClickListener(v -> {
       listener.onEvent(new Event.Builder(Event.CLICK).index(index).build());
     });
+    Log.e("APP#  ContentsOverviewHolder | attach", "contentsItemBean.getImageType() |" + contentsItemBean.getImageType());
+    flagVideo.setVisibility(LifeplusImageBean.TYPE_MOVIE.equals(contentsItemBean.getImageType()) ? View.VISIBLE : View.GONE);
   }
 
   public void detach() {

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

@@ -0,0 +1,7 @@
+<vector android:height="22dp" android:viewportHeight="88"
+    android:viewportWidth="88" android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M44,44m-42,0a42,42 0,1 1,84 0a42,42 0,1 1,-84 0"
+        android:strokeColor="#FFF" android:strokeWidth="4"/>
+    <path android:fillColor="#FFF" android:fillType="evenOdd" android:pathData="M57.683,47.04L35.73,59.713a2.932,2.932 0,0 1,-4.398 -2.539v-25.35a2.932,2.932 0,0 1,4.398 -2.54l21.954,12.676a2.932,2.932 0,0 1,0 5.078z"/>
+</vector>

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

@@ -29,6 +29,8 @@
     android:maxLines="1"
     android:textColor="@color/C666666"
     android:textSize="11sp"
+    app:layout_constraintBottom_toTopOf="@+id/text_view_series_title"
+    app:layout_constraintHorizontal_chainStyle="packed"
     app:layout_constraintStart_toStartOf="@+id/text_view_series_title"
     app:layout_constraintTop_toTopOf="parent"
     tools:text="취미랭킹 05"
@@ -39,28 +41,29 @@
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginStart="18dp"
-    android:layout_marginTop="5dp"
     android:layout_marginEnd="18dp"
+    android:layout_marginBottom="7dp"
     android:ellipsize="end"
     android:lineSpacingExtra="4sp"
     android:maxLines="2"
     android:textColor="@color/C000000"
     android:textSize="14sp"
     app:layout_constrainedWidth="true"
-    app:layout_constraintBottom_toTopOf="@+id/layout_like_series"
+    app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHorizontal_chainStyle="packed"
     app:layout_constraintStart_toEndOf="@+id/image_view_series"
     app:layout_constraintTop_toBottomOf="@+id/text_view_series_category"
-    app:layout_goneMarginBottom="27dp"
+    app:layout_goneMarginBottom="17dp"
     app:layout_goneMarginTop="27dp"
-    tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
-    />
+    tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"/>
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/layout_like_series"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="9dp"
+    android:visibility="gone"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintHorizontal_bias="1.0"
     app:layout_constraintStart_toEndOf="@+id/image_view_series"

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

@@ -50,11 +50,10 @@
 
   <ImageView
     android:id="@+id/image_view_thumbnail"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
+    android:layout_width="124dp"
+    android:layout_height="93dp"
     android:scaleType="centerCrop"
     app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintDimensionRatio="V, 124:93"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     tools:src="@drawable/img_bestbucket_banner_1"/>

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

@@ -10,7 +10,6 @@
     android:id="@+id/text_view_main_fourth_category_title1"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:layout_marginTop="7dp"
     android:layout_marginEnd="28dp"
     android:ellipsize="end"
     android:lineSpacingExtra="4sp"
@@ -23,7 +22,7 @@
     app:layout_constraintHorizontal_chainStyle="packed"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintVertical_chainStyle="spread_inside"
+    app:layout_constraintVertical_chainStyle="packed"
     tools:text="알짜배기 투자전략dddddddddddddd"/>
 
   <TextView
@@ -47,6 +46,7 @@
     tools:text="개미 벗어나기
누구나 주개미 벗어나기
누구나 주개미 벗어나기
누구나 주개미 벗어나기
누구나 주개미 벗어나기
누구나 주개미 벗어나기
누구나 주"/>
 
   <TextView
+    android:visibility="gone"
     android:id="@+id/text_view_main_fourth_category_title3"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
@@ -66,11 +66,10 @@
 
   <ImageView
     android:id="@+id/image_view_main_fourth_category"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
+    android:layout_width="124dp"
+    android:layout_height="93dp"
     android:scaleType="centerCrop"
     app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintDimensionRatio="V, 124:93"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     tools:src="@drawable/img_bestbucket_banner_1"/>

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

@@ -23,11 +23,11 @@
     android:id="@+id/view_dim"
     android:layout_width="0dp"
     android:layout_height="0dp"
-    app:layout_constraintStart_toStartOf="@id/image_view_item"
-    app:layout_constraintTop_toTopOf="@id/image_view_item"
+    android:background="@drawable/rectangle_dim_contents_detail_total"
     app:layout_constraintBottom_toBottomOf="@id/image_view_item"
     app:layout_constraintEnd_toEndOf="@id/image_view_item"
-    android:background="@drawable/rectangle_dim_contents_detail_total"
+    app:layout_constraintStart_toStartOf="@id/image_view_item"
+    app:layout_constraintTop_toTopOf="@id/image_view_item"
     />
 
   <TextView
@@ -85,4 +85,15 @@
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     tools:text="1"/>
+
+  <ImageView
+    android:id="@+id/image_view_video"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dp"
+    android:layout_marginEnd="10dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:srcCompat="@drawable/icon_videoplay_small"
+    />
 </android.support.constraint.ConstraintLayout>