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

app/src/main/java/kr/co/zumo/app/lifeplus/bean/WithShownListBean.java

@@ -20,6 +20,9 @@ import kr.co.zumo.app.lifeplus.bean.api.WithShownItemBean;
 public class WithShownListBean extends JsonBeanBase {
 
   private List<WithShownItemBean> withItemList;
+  //임시추가
+  private boolean isWithShownPageTagType = true;
+
 
   public List<WithShownItemBean> getWithItemList() {
     return withItemList;
@@ -28,4 +31,12 @@ public class WithShownListBean extends JsonBeanBase {
   public void setWithItemList(List<WithShownItemBean> withItemList) {
     this.withItemList = withItemList;
   }
+
+  public boolean isWithShownPageTagType() {
+    return isWithShownPageTagType;
+  }
+
+  public void setWithShownPageTagType(boolean withShownPageTagType) {
+    isWithShownPageTagType = withShownPageTagType;
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/recommend/RecommendContentsView.java

@@ -43,6 +43,12 @@ public class RecommendContentsView extends ConstraintLayout {
   private IndexScrollListener indexScrollListener;
   private LinearLayoutManager layoutManager;
 
+  private String type;
+
+  public static final String CONTENTS_TAG = "1";
+  public static final String CONTENTS_LOGIC = "2";
+  public static final String EVENT = "3";
+
   public RecommendContentsView(Context context) {
     super(context);
     init(context);
@@ -117,6 +123,13 @@ public class RecommendContentsView extends ConstraintLayout {
 
   }
 
+  public void setWithShownPageType(String type) {
+    this.type = type;
+    if (null != type) {
+      setTitleArea(type);
+    }
+  }
+
   public void draw(Context context, List<WithShownItemBean> withItemList, IEventListener listener) {
     this.withItemList = withItemList;
 
@@ -130,4 +143,25 @@ public class RecommendContentsView extends ConstraintLayout {
     recyclerViewRecommendContents.setAdapter(recommendContentsViewAdapter);
 
   }
+
+  public void setTitleArea(String type) {
+    int titleRes = 0;
+    int subTitleRes = 0;
+
+    switch (type) {
+      case CONTENTS_TAG:
+        titleRes = R.string.with_shown_contents_with_tag;
+        subTitleRes = R.string.with_shown_contents_with_tag_detail;
+        break;
+      case CONTENTS_LOGIC:
+        titleRes = R.string.with_shown_contents;
+        subTitleRes = R.string.with_shown_contents_detail;
+        break;
+      default:
+        break;
+
+    }
+    textViewTitle.setText(titleRes);
+    textViewSubTitle.setText(subTitleRes);
+  }
 }

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

@@ -28,6 +28,7 @@ public class ContentsWithShownHolder extends ContentsHolder<WithShownListBean> {
 
   @Override
   protected void bindInternal() {
+    recommendContentsView.setWithShownPageType(bean.isWithShownPageTagType() ? RecommendContentsView.CONTENTS_TAG : RecommendContentsView.CONTENTS_LOGIC);
     recommendContentsView.draw(itemView.getContext(), bean.getWithItemList(), listener);
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/info/SettingTermsFragment.java

@@ -141,8 +141,8 @@ public class SettingTermsFragment extends FragmentBase<SettingTermsPresenter> im
         title = title.trim();
 
         contents.setText(StringUtil.fromHtml(
-          new StringBuilder().append("<b>").append(bean.isMandatory() ? ResourceUtil.getString(R.string.agree_required) : ResourceUtil.getString(R.string.agree_option))
-            .append("</b> ").append("<font color='#999999'>").append(title).append("</font>").toString()));
+          new StringBuilder().append(bean.isMandatory() ? ResourceUtil.getString(R.string.agree_required) : ResourceUtil.getString(R.string.agree_option))
+            .append(" <font color='#999999'>").append(title).append("</font>").toString()));
 
         contents.setOnClickListener(v -> {
           notifyDetailPressed(index);

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

@@ -49,6 +49,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:lineSpacingExtra="5.5sp"
+          android:paddingTop="7dp"
           android:paddingBottom="23dp"
           android:textColor="@color/C000000"
           android:textSize="14sp"
@@ -60,7 +61,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:lineSpacingExtra="5.5sp"
-          android:paddingBottom="13dp"
+          android:paddingBottom="17dp"
           android:textColor="@color/C000000"
           android:textSize="14sp"
           tools:text="@string/sign_up_completed_birth_date"
@@ -147,10 +148,11 @@
               android:paddingEnd="40dp"
               android:textColor="@color/C666666"
               android:textSize="14sp"
+              android:textColorHint="@color/C999999"
               app:layout_constraintEnd_toStartOf="@+id/text_registration"
               app:layout_constraintHorizontal_chainStyle="spread_inside"
               app:layout_constraintStart_toStartOf="parent"
-              tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"/>
+              tools:text=""/>
 
             <TextView
               android:id="@+id/text_registration"
@@ -234,6 +236,7 @@
       <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
         android:paddingEnd="15dp"
         >
 
@@ -448,7 +451,7 @@
     android:id="@+id/layout_cancel"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="@color/C000000"
+    android:background="@color/C333333"
     android:visibility="gone"
     app:layout_constraintBottom_toBottomOf="parent"
     tools:visibility="visible">

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

@@ -78,7 +78,7 @@
         android:padding="2dp"
         android:text="@string/phone_identify_name"
         android:textColor="@color/C999999"
-        android:textSize="12sp"
+        android:textSize="14sp"
         />
 
       <TextView
@@ -88,7 +88,7 @@
         android:gravity="center_horizontal"
         android:padding="2dp"
         android:textColor="@color/C000000"
-        android:textSize="12sp"
+        android:textSize="14sp"
         tools:text="@string/sign_up_completed_name"
         />
     </LinearLayout>