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

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/contents/CustomListicleImageViewHolder.java

@@ -10,6 +10,7 @@ import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailImageBean;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
@@ -49,8 +50,7 @@ public class CustomListicleImageViewHolder extends RecyclerView.ViewHolder {
     // TODO: copyright 처리
     if (null != bean.getCopyRight()) {
       textViewCopyRight.setText(bean.getCopyRight());
-    }
-    else {
+    }else if(AppUtil.isDebug()){
       textViewCopyRight.setText(R.string.copy_right);
     }
 

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

@@ -19,6 +19,7 @@ import java.util.List;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailBean;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.Visibler;
@@ -124,8 +125,7 @@ public class ContentsListicleCoverHolder extends ContentsHolder<ContentsDetailBe
     // TODO: copyright 처리
     if (null != bean.getCopyRight()) {
       textViewCopyRight.setText(bean.getCopyRight());
-    }
-    else {
+    }else if(AppUtil.isDebug()){
       textViewCopyRight.setText(R.string.copy_right);
     }
 

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

@@ -171,10 +171,12 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="24dp"
+    android:layout_marginBottom="15dp"
     android:gravity="center_horizontal"
     android:lineSpacingExtra="3sp"
     android:textColor="@color/C66FFFFFF"
     android:textSize="8sp"
+    app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/text_view_tag1"

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

@@ -25,7 +25,7 @@
     android:layout_marginBottom="14dp"
     android:gravity="center_horizontal"
     android:lineSpacingExtra="3sp"
-    android:textColor="@color/C888888"
+    android:textColor="@color/C66FFFFFF"
     android:textSize="8sp"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintStart_toStartOf="parent"