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

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/MoreInfoDialog.java

@@ -15,6 +15,7 @@ import kr.co.zumo.app.lifeplus.bean.api.ContentsMoreInfoBean;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
 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.custom.contents.CustomMoreInfoView;
 
@@ -75,7 +76,7 @@ public class MoreInfoDialog extends DialogBottomBase<ICustomDialogListener<MoreI
     for (int i = 0; i < contentsMoreInfoBeanList.size(); i++) {
       CustomMoreInfoView customMoreInfoView = null;
       ContentsMoreInfoBean contentsMoreInfoBean = contentsMoreInfoBeanList.get(i);
-      if (null != contentsMoreInfoBean.getMoreInfo() && !contentsMoreInfoBean.getMoreInfo().trim().equals("")) {
+      if (null != contentsMoreInfoBean.getMoreInfo() && StringUtil.isFull(contentsMoreInfoBean.getMoreInfo())) {
         switch (contentsMoreInfoBean.getDetailType()) {
           case PERIOD_INFO:
             customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_date, contentsMoreInfoBean.getMoreInfo());

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

@@ -2,6 +2,8 @@ package kr.co.zumo.app.lifeplus.view.screen.contents;
 
 import android.view.View;
 
+import kr.co.zumo.app.lifeplus.bean.api.ContentsMoreInfoBean;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 
 /**
@@ -24,9 +26,11 @@ public class ContentsCardListicleHolder extends ContentsCardHolder {
   @Override
   protected void bindInternal() {
     super.bindInternal();
-
     layoutMoreInfo.setVisibility(bean.getMoreInfoList().size() == 0 ? View.GONE : View.VISIBLE);
-
+    for (int i = 0; i < bean.getMoreInfoList().size(); ++i) {
+      ContentsMoreInfoBean contentsMoreInfoBean = bean.getMoreInfoList().get(i);
+      layoutMoreInfo.setVisibility(null != contentsMoreInfoBean.getMoreInfo() && StringUtil.isFull(contentsMoreInfoBean.getMoreInfo()) ? View.VISIBLE: View.GONE);
+    }
     layoutMoreInfo.setOnClickListener(view -> {
       listener.onEvent(new Event.Builder(Event.MORE).index(getAdapterPosition()).build());
     });

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

@@ -10,6 +10,8 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDescriptionBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailImageBean;
+import kr.co.zumo.app.lifeplus.bean.api.ContentsMoreInfoBean;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.custom.contents.CustomListicleImageView;
 import kr.co.zumo.app.lifeplus.view.custom.contents.CustomListicleInformationView;
@@ -56,14 +58,15 @@ public class ContentsListicleHolder extends ContentsHolder<ContentsDetailBean> {
     }
 
     layoutMoreInfoPopup.setVisibility(bean.getMoreInfoList().size() == 0 ? View.GONE : View.VISIBLE);
+    for (int i = 0; i < bean.getMoreInfoList().size(); ++i) {
+      ContentsMoreInfoBean contentsMoreInfoBean = bean.getMoreInfoList().get(i);
+      layoutMoreInfoPopup.setVisibility(null != contentsMoreInfoBean.getMoreInfo() && StringUtil.isFull(contentsMoreInfoBean.getMoreInfo()) ? View.VISIBLE : View.GONE);
+    }
 
     layoutMoreInfoPopup.setOnClickListener(view -> {
       listener.onEvent(new Event.Builder(Event.MORE).index(getAdapterPosition()).build());
     });
-
-    for (int i = 0; i < bean.getMoreInfoList().size(); i++) {
-      //  Log.e("APP#  ContentsListicleHolder | attach", "|" + bean.getMoreInfoList().get(i).getDetailType() + "," + bean.getMoreInfoList().get(i).getMoreInfo());
-    }
+    
   }
 
   @Override

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+  <gradient
+    android:angle="90"
+    android:endColor="#00000000"
+    android:centerColor="#26000000"
+    android:startColor="#66000000"
+    android:type="linear" />
+</shape>

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

@@ -25,10 +25,10 @@
   <View
     android:layout_width="match_parent"
     android:layout_height="226dp"
-    android:rotation="180"
     android:background="@drawable/card_cover_dim_top"
-    app:layout_constraintStart_toStartOf="parent"
+    android:rotation="180"
     app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"/>
 
   <android.support.constraint.ConstraintLayout
@@ -73,6 +73,12 @@
 
   </android.support.constraint.ConstraintLayout>
 
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="72dp"
+    android:background="@drawable/card_dim_bottom_40"
+    app:layout_constraintBottom_toBottomOf="parent"/>
+
   <TextView
     android:id="@+id/text_view_page_number"
     android:layout_width="wrap_content"
@@ -88,4 +94,5 @@
     app:layout_constraintEnd_toEndOf="parent"
     tools:text="1 / 5"
     />
+
 </android.support.constraint.ConstraintLayout>

app/src/main/res/values/dimens.xml

@@ -17,4 +17,107 @@
   <dimen name="main_contents_image_horizontal_padding_end">12dp</dimen>
   <dimen name="main_contents_first_image_offset_from_bottom">286dp</dimen> <!-- 45dp + (26+12)/2dp + 222dp -->
 
+  <!--opacity 설정-->
+  <!--100% — FF-->
+  <!--99% — FC-->
+  <!--98% — FA-->
+  <!--97% — F7-->
+  <!--96% — F5-->
+  <!--95% — F2-->
+  <!--94% — F0-->
+  <!--93% — ED-->
+  <!--92% — EB-->
+  <!--91% — E8-->
+  <!--90% — E6-->
+  <!--89% — E3-->
+  <!--88% — E0-->
+  <!--87% — DE-->
+  <!--86% — DB-->
+  <!--85% — D9-->
+  <!--84% — D6-->
+  <!--83% — D4-->
+  <!--82% — D1-->
+  <!--81% — CF-->
+  <!--80% — CC-->
+  <!--79% — C9-->
+  <!--78% — C7-->
+  <!--77% — C4-->
+  <!--76% — C2-->
+  <!--75% — BF-->
+  <!--74% — BD-->
+  <!--73% — BA-->
+  <!--72% — B8-->
+  <!--71% — B5-->
+  <!--70% — B3-->
+  <!--69% — B0-->
+  <!--68% — AD-->
+  <!--67% — AB-->
+  <!--66% — A8-->
+  <!--65% — A6-->
+  <!--64% — A3-->
+  <!--63% — A1-->
+  <!--62% — 9E-->
+  <!--61% — 9C-->
+  <!--60% — 99-->
+  <!--59% — 96-->
+  <!--58% — 94-->
+  <!--57% — 91-->
+  <!--56% — 8F-->
+  <!--55% — 8C-->
+  <!--54% — 8A-->
+  <!--53% — 87-->
+  <!--52% — 85-->
+  <!--51% — 82-->
+  <!--50% — 80-->
+  <!--49% — 7D-->
+  <!--48% — 7A-->
+  <!--47% — 78-->
+  <!--46% — 75-->
+  <!--45% — 73-->
+  <!--44% — 70-->
+  <!--43% — 6E-->
+  <!--42% — 6B-->
+  <!--41% — 69-->
+  <!--40% — 66-->
+  <!--39% — 63-->
+  <!--38% — 61-->
+  <!--37% — 5E-->
+  <!--36% — 5C-->
+  <!--35% — 59-->
+  <!--34% — 57-->
+  <!--33% — 54-->
+  <!--32% — 52-->
+  <!--31% — 4F-->
+  <!--30% — 4D-->
+  <!--29% — 4A-->
+  <!--28% — 47-->
+  <!--27% — 45-->
+  <!--26% — 42-->
+  <!--25% — 40-->
+  <!--24% — 3D-->
+  <!--23% — 3B-->
+  <!--22% — 38-->
+  <!--21% — 36-->
+  <!--20% — 33-->
+  <!--19% — 30-->
+  <!--18% — 2E-->
+  <!--17% — 2B-->
+  <!--16% — 29-->
+  <!--15% — 26-->
+  <!--14% — 24-->
+  <!--13% — 21-->
+  <!--12% — 1F-->
+  <!--11% — 1C-->
+  <!--10% — 1A-->
+  <!--9% — 17-->
+  <!--8% — 14-->
+  <!--7% — 12-->
+  <!--6% — 0F-->
+  <!--5% — 0D-->
+  <!--4% — 0A-->
+  <!--3% — 08-->
+  <!--2% — 05-->
+  <!--1% — 03-->
+  <!--0% — 00-->
+
 </resources>