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

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

@@ -36,6 +36,7 @@ import kr.co.zumo.app.lifeplus.view.Visibler;
 public class ContentsCardCoverHolder extends ContentsHolder<ContentsItemBean> {
 
   private ImageView imageViewCardListicleCover;
+  private ImageView imageViewShopping;
   private View dimTop;
   private View dimBottom;
 
@@ -44,11 +45,13 @@ public class ContentsCardCoverHolder extends ContentsHolder<ContentsItemBean> {
     imageViewCardListicleCover = itemView.findViewById(R.id.image_view_card_listicle_cover);
     dimTop = itemView.findViewById(R.id.view_dim_top);
     dimBottom = itemView.findViewById(R.id.view_dim_bottom);
+    imageViewShopping = itemView.findViewById(R.id.shopping_icon);
     Visibler.invisible(dimTop, dimBottom);
   }
 
   @Override
   protected void bindInternal() {
+    imageViewShopping.setVisibility(ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(bean.getListAttributeType()) ? View.VISIBLE : View.GONE);
     imageViewCardListicleCover.setScaleType(ImageView.ScaleType.CENTER);
     Glide.with(imageViewCardListicleCover)
       .asBitmap()

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

@@ -38,6 +38,7 @@ public class ContentsListicleCoverHolder extends ContentsHolder<ContentsItemBean
 
   private ImageView imageViewBackground;
   private ImageView imageViewArrow;
+  private ImageView imageViewShopping;
   private TextView textViewCategory1;
   private TextView textViewCategory2;
   private TextView textViewSubTitle;
@@ -54,6 +55,7 @@ public class ContentsListicleCoverHolder extends ContentsHolder<ContentsItemBean
     super(itemView);
     imageViewBackground = itemView.findViewById(R.id.image_view_background);
     imageViewArrow = itemView.findViewById(R.id.image_view_arrow);
+    imageViewShopping = itemView.findViewById(R.id.shopping_icon);
     textViewCategory1 = itemView.findViewById(R.id.text_view_category1);
     textViewCategory2 = itemView.findViewById(R.id.text_view_category2);
     textViewSubTitle = itemView.findViewById(R.id.text_view_sub_title);
@@ -72,6 +74,7 @@ public class ContentsListicleCoverHolder extends ContentsHolder<ContentsItemBean
   @Override
   protected void bindInternal() {
 
+    imageViewShopping.setVisibility(ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(bean.getListAttributeType()) ? View.VISIBLE : View.GONE);
     imageViewBackground.setScaleType(ImageView.ScaleType.CENTER);
     Glide.with(imageViewBackground)
       .asBitmap().load(bean.getImageUrl())

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAgreeFragment.java

@@ -174,7 +174,7 @@ public class SignUpAgreeFragment extends FragmentBase<SignUpAgreePresenter> impl
       title = title.trim();
       checkBox.setText(StringUtil.fromHtml(
         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()));
+          .append("<font color='#999999'>").append(" ").append(title).append("</font>").toString()));
       checkBox.setChecked(bean.isChecked());
       checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
         bean.setChecked(isChecked);

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

@@ -0,0 +1,9 @@
+<vector android:height="26dp" android:viewportHeight="104"
+    android:viewportWidth="104" android:width="26dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000" android:fillType="nonZero"
+        android:pathData="M28.834,32.478l-4.101,58.044h54.534l-4.1,-58.044H28.833z"
+        android:strokeColor="#FFF" android:strokeWidth="6.957"/>
+    <path android:fillColor="#00000000" android:fillType="nonZero"
+        android:pathData="M63,36V25.5c0,-6.119 -4.701,-10.5 -9.333,-10.5C46.7,15 42,19.381 42,25.5V36"
+        android:strokeColor="#FFF" android:strokeWidth="6.957"/>
+</vector>

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

@@ -34,4 +34,15 @@
     android:background="@drawable/card_dim_bottom_12"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintBottom_toBottomOf="parent"/>
+
+  <ImageView
+    android:id="@+id/shopping_icon"
+    android:layout_width="wrap_content"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    android:layout_marginEnd="25dp"
+    android:layout_marginBottom="23dp"
+    android:layout_height="wrap_content"
+    app:srcCompat="@drawable/icon_shopping_wh"
+    />
 </android.support.constraint.ConstraintLayout>

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

@@ -186,4 +186,15 @@
     tools:text="© instagram @robococodd"
     />
 
+  <ImageView
+    android:id="@+id/shopping_icon"
+    android:layout_width="wrap_content"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    android:layout_marginEnd="25dp"
+    android:layout_marginBottom="23dp"
+    android:layout_height="wrap_content"
+    app:srcCompat="@drawable/icon_shopping_wh"
+    />
+
 </android.support.constraint.ConstraintLayout>

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

@@ -14,9 +14,11 @@
     android:layout_marginBottom="4dp"
     android:background="@drawable/custom_rectangle_radio_selector"
     android:button="@null"
+    android:includeFontPadding="false"
+    android:singleLine="true"
     android:drawableLeft="@drawable/custom_check_box"
     android:drawablePadding="8dp"
-    android:lineSpacingExtra="4sp"
+    android:lineSpacingExtra="0sp"
     android:paddingStart="23dp"
     android:paddingTop="17dp"
     android:paddingEnd="23dp"

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

@@ -206,7 +206,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/rectangle_black_radius_2"
-        android:lineSpacingExtra="6sp"
+        android:lineSpacingExtra="0sp"
         android:text="@string/confirm"
         android:textColor="@color/CFFFFFF"
         android:textSize="15sp"

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

@@ -38,7 +38,9 @@
           android:checked="true"
           android:drawableLeft="@drawable/radio_selector"
           android:drawablePadding="8dp"
-          android:lineSpacingExtra="6sp"
+          android:includeFontPadding="false"
+          android:lineSpacingExtra="0sp"
+          android:singleLine="true"
           android:text="@string/user"
           android:textColor="@drawable/my_faq_radio_text_selector"
           android:textSize="14sp"
@@ -53,7 +55,9 @@
           android:button="@null"
           android:drawableLeft="@drawable/radio_selector"
           android:drawablePadding="8dp"
-          android:lineSpacingExtra="6sp"
+          android:includeFontPadding="false"
+          android:lineSpacingExtra="0sp"
+          android:singleLine="true"
           android:text="@string/coupon"
           android:textColor="@drawable/my_faq_radio_text_selector"
           android:textSize="14sp"
@@ -68,7 +72,9 @@
           android:button="@null"
           android:drawableLeft="@drawable/radio_selector"
           android:drawablePadding="8dp"
-          android:lineSpacingExtra="6sp"
+          android:includeFontPadding="false"
+          android:lineSpacingExtra="0sp"
+          android:singleLine="true"
           android:text="@string/benefit"
           android:textColor="@drawable/my_faq_radio_text_selector"
           android:textSize="14sp"
@@ -82,7 +88,9 @@
           android:button="@null"
           android:drawableLeft="@drawable/radio_selector"
           android:drawablePadding="8dp"
-          android:lineSpacingExtra="6sp"
+          android:includeFontPadding="false"
+          android:lineSpacingExtra="0sp"
+          android:singleLine="true"
           android:text="@string/other"
           android:textColor="@drawable/my_faq_radio_text_selector"
           android:textSize="14sp"
@@ -247,10 +255,10 @@
         android:id="@+id/button_cancel"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
         android:layout_marginEnd="4dp"
         android:layout_weight="2"
         android:background="@drawable/input_black_border"
+        android:lineSpacingExtra="0sp"
         android:text="@string/cancel"
         />
 
@@ -258,11 +266,10 @@
         android:id="@+id/button_registration"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
         android:layout_marginStart="4dp"
         android:layout_weight="2"
         android:background="@drawable/button_black_background"
-        android:lineSpacingExtra="6sp"
+        android:lineSpacingExtra="0sp"
         android:text="@string/registration"
         android:textColor="@color/CFFFFFF"
         android:textSize="15sp"

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

@@ -214,7 +214,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/rectangle_black_radius_2"
-        android:lineSpacingExtra="6sp"
+        android:lineSpacingExtra="0sp"
         android:text="@string/rest_member_button"
         android:textColor="@color/CFFFFFF"
         android:textSize="15sp"

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

@@ -59,7 +59,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:gravity="center_horizontal"
-      android:lineSpacingExtra="7sp"
+      android:lineSpacingExtra="0sp"
       android:textAlignment="center"
       android:textColor="#000000"
       android:textSize="17sp"
@@ -149,7 +149,7 @@
       android:layout_height="wrap_content"
       android:layout_gravity="right"
       android:layout_marginEnd="2dp"
-      android:lineSpacingExtra="3sp"
+      android:lineSpacingExtra="0sp"
       android:padding="10dp"
       android:text="@string/pin_code_reset_underline"
       android:textColor="@color/C666666"
@@ -203,7 +203,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"
@@ -225,7 +225,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"
@@ -246,7 +246,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"
@@ -282,7 +282,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"
@@ -303,7 +303,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"
@@ -324,7 +324,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"
@@ -360,7 +360,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"
@@ -380,7 +380,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"
@@ -401,7 +401,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"
@@ -437,7 +437,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="14sp"
         android:text="@string/sign_up_shuffle"
@@ -457,7 +457,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:lineSpacingExtra="10sp"
+        android:lineSpacingExtra="0sp"
         android:textColor="@color/C666666"
         android:textSize="25sp"
         tools:text="2"

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

@@ -207,7 +207,7 @@
         android:layout_height="42dp"
         android:layout_gravity="bottom"
         android:background="@drawable/rectangle_black_radius_2"
-        android:lineSpacingExtra="6sp"
+        android:lineSpacingExtra="0sp"
         android:text="@string/confirm"
         android:textColor="@color/CFFFFFF"
         android:textSize="15sp"

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

@@ -471,6 +471,7 @@
         android:layout_gravity="bottom"
         android:layout_marginEnd="4dp"
         android:layout_weight="2"
+        android:lineSpacingExtra="0sp"
         android:background="@drawable/input_black_border"
         android:text="@string/cancel"
         />
@@ -483,7 +484,7 @@
         android:layout_marginStart="4dp"
         android:layout_weight="2"
         android:background="@drawable/rectangle_black_radius_2"
-        android:lineSpacingExtra="6sp"
+        android:lineSpacingExtra="0sp"
         android:text="@string/user_quit_request"
         android:textColor="@color/CFFFFFF"
         android:textSize="15sp"

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

@@ -228,6 +228,7 @@
         android:layout_marginEnd="4dp"
         android:layout_weight="2"
         android:background="@drawable/input_black_border"
+        android:lineSpacingExtra="0sp"
         android:text="@string/cancel"
         />
 
@@ -239,7 +240,7 @@
         android:layout_marginStart="4dp"
         android:layout_weight="2"
         android:background="@drawable/rectangle_black_radius_2"
-        android:lineSpacingExtra="6sp"
+        android:lineSpacingExtra="0sp"
         android:text="@string/quit"
         android:textColor="@color/CFFFFFF"
         android:textSize="15sp"

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

@@ -68,6 +68,7 @@
       android:layout_alignParentBottom="true"
       android:layout_gravity="bottom"
       android:background="@drawable/rectangle_black_radius_2"
+      android:lineSpacingExtra="0sp"
       android:text="@string/confirm"
       android:textColor="@color/CFFFFFF"
       android:textSize="15sp"/>