[카테고리메인][Common] 베네핏 플래그 추가

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type1/FirstCategoryMainAdapter.java

@@ -43,7 +43,6 @@ public class FirstCategoryMainAdapter extends RecyclerView.Adapter<CategoryMainV
   public FirstCategoryMainAdapter(Context context, List<CategoryBannerBean> bannerBeans, List<CategoryContentsBean> contentsBeans, IEventListener listener) {
     this.context = context;
     this.inflater = (LayoutInflater) this.context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
     this.bannerBeans = bannerBeans;
     this.contentsBeans = contentsBeans;
     this.listener = listener;

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type1/FirstCategoryMainItemViewHolder.java

@@ -2,6 +2,7 @@ package kr.co.zumo.app.lifeplus.view.screen.category.type1;
 
 import android.graphics.Bitmap;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -14,6 +15,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.APIData;
 import kr.co.zumo.app.lifeplus.bean.api.CategoryContentsBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -34,6 +36,7 @@ public class FirstCategoryMainItemViewHolder extends CategoryMainViewHolder<Cate
 
   private ImageView imageViewMainFirstCategory;
   private TextView textViewMainFirstCategory;
+  private ConstraintLayout layoutFlag;
   private View dim0;
   private View dim1;
 
@@ -42,6 +45,7 @@ public class FirstCategoryMainItemViewHolder extends CategoryMainViewHolder<Cate
 
     imageViewMainFirstCategory = itemView.findViewById(R.id.image_view_main_first_category);
     textViewMainFirstCategory = itemView.findViewById(R.id.text_view_main_first_category);
+    layoutFlag = itemView.findViewById(R.id.layout_flag);
     dim0 = itemView.findViewById(R.id.view_dim_0);
     dim1 = itemView.findViewById(R.id.view_dim_1);
   }
@@ -78,6 +82,7 @@ public class FirstCategoryMainItemViewHolder extends CategoryMainViewHolder<Cate
         })
         .into(imageViewMainFirstCategory);
       textViewMainFirstCategory.setText(bean.getTwoLineTitle());
+      layoutFlag.setVisibility(APIData.isTrue(bean.getFlagBenefit())? View.VISIBLE : View.GONE);
     }
 
     imageViewMainFirstCategory.setOnClickListener(v -> {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type2/SecondCategoryViewHolder.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.category.type2;
 
+import android.support.constraint.ConstraintLayout;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -8,6 +9,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.APIData;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainViewHolder;
@@ -27,12 +29,14 @@ class SecondCategoryViewHolder extends CategoryMainViewHolder {
   private ImageView imageViewMainSecondCategory;
   private TextView textViewSubTitle;
   private TextView textViewTitle;
+  private ConstraintLayout layoutFlag;
 
   public SecondCategoryViewHolder(View itemView) {
     super(itemView);
     imageViewMainSecondCategory = itemView.findViewById(R.id.image_view_main_second_category);
     textViewSubTitle = itemView.findViewById(R.id.text_view_sub_title);
     textViewTitle = itemView.findViewById(R.id.text_view_title);
+    layoutFlag = itemView.findViewById(R.id.layout_flag);
   }
 
   @Override
@@ -54,6 +58,7 @@ class SecondCategoryViewHolder extends CategoryMainViewHolder {
 
       textViewSubTitle.setText(bean.getSubTitle());
       textViewTitle.setText(bean.getTitle());
+      layoutFlag.setVisibility(APIData.isTrue(bean.getFlagBenefit()) ? View.VISIBLE : View.GONE);
     }
 
     itemView.setOnClickListener(v -> {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type3/ThirdCategoryMainItemViewHolder.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.category.type3;
 
+import android.support.constraint.ConstraintLayout;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -8,6 +9,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.APIData;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainViewHolder;
@@ -26,9 +28,11 @@ public class ThirdCategoryMainItemViewHolder extends CategoryMainViewHolder {
 
   private ImageView imageViewMainThirdCategory;
   private TextView textViewMainThirdCategory;
+  private ConstraintLayout layoutFlag;
 
   public ThirdCategoryMainItemViewHolder(View itemView) {
     super(itemView);
+    layoutFlag = itemView.findViewById(R.id.layout_flag);
     imageViewMainThirdCategory = itemView.findViewById(R.id.image_view_main_third_category);
     textViewMainThirdCategory = itemView.findViewById(R.id.text_view_main_third_category);
   }
@@ -48,6 +52,7 @@ public class ThirdCategoryMainItemViewHolder extends CategoryMainViewHolder {
         .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewMainThirdCategory.getContext(), R.drawable.image_loading_middle)))
         .load(bean.getImageUrl()).into(imageViewMainThirdCategory);
       textViewMainThirdCategory.setText(bean.getTwoLineTitle());
+      layoutFlag.setVisibility(APIData.isTrue(bean.getFlagBenefit()) ? View.VISIBLE : View.GONE);
     }
 
     itemView.setOnClickListener(v -> {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type5/FifthCategoryMainItemViewHolder.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.category.type5;
 
+import android.support.constraint.ConstraintLayout;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -8,6 +9,7 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.APIData;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.screen.category.CategoryMainViewHolder;
@@ -27,12 +29,14 @@ public class FifthCategoryMainItemViewHolder extends CategoryMainViewHolder {
   private ImageView imageViewMainFifthCategory;
   private TextView textViewSubTitle;
   private TextView textViewTitle;
+  private ConstraintLayout layoutFlag;
 
   public FifthCategoryMainItemViewHolder(View itemView) {
     super(itemView);
     imageViewMainFifthCategory = itemView.findViewById(R.id.image_view_thumbnail);
     textViewSubTitle = itemView.findViewById(R.id.text_view_sub_title);
     textViewTitle = itemView.findViewById(R.id.text_view_title);
+    layoutFlag = itemView.findViewById(R.id.layout_flag);
 
   }
 
@@ -55,6 +59,7 @@ public class FifthCategoryMainItemViewHolder extends CategoryMainViewHolder {
 
       textViewTitle.setText(bean.getTitle());
       textViewSubTitle.setText(bean.getSubTitle());
+      layoutFlag.setVisibility(APIData.isTrue(bean.getFlagBenefit()) ? View.VISIBLE : View.GONE);
     }
 
     itemView.setOnClickListener(v -> {

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

@@ -21,6 +21,31 @@
     android:background="@drawable/rectangle_dim_black_50"
     />
 
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_flag"
+    android:layout_width="40dp"
+    android:layout_height="16dp"
+    android:layout_marginStart="6dp"
+    android:layout_marginTop="6dp"
+    android:background="@color/CFF0053"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/benefit_en"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="9sp"
+      android:textStyle="bold"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      />
+
+  </android.support.constraint.ConstraintLayout>
+
   <TextView
     android:id="@+id/text_view_banner_item"
     android:layout_width="wrap_content"

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

@@ -32,8 +32,8 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="5dp"
     android:layout_marginEnd="28dp"
-    android:ellipsize="end"
     android:layout_marginBottom="17dp"
+    android:ellipsize="end"
     android:lineSpacingExtra="6sp"
     android:maxWidth="150dp"
     android:maxLines="2"
@@ -57,4 +57,31 @@
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     tools:src="@drawable/img_bestbucket_banner_1"/>
+
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_flag"
+    android:layout_width="40dp"
+    android:layout_height="16dp"
+    android:layout_marginStart="6dp"
+    android:layout_marginTop="6dp"
+    android:layout_marginEnd="6dp"
+    android:background="@color/CFF0053"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/benefit_en"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="9sp"
+      android:textStyle="bold"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      />
+
+  </android.support.constraint.ConstraintLayout>
+
 </android.support.constraint.ConstraintLayout>

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

@@ -10,14 +10,35 @@
     android:id="@+id/image_view_main_first_category"
     android:layout_width="0dp"
     android:layout_height="0dp"
-    android:scaleType="center"
+    android:scaleType="fitXY"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintDimensionRatio="V, 151:202"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     app:srcCompat="@drawable/img_bestbucket_1"/>
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_flag"
+    android:layout_width="35dp"
+    android:layout_height="35dp"
+    android:layout_marginStart="14dp"
+    android:background="@color/CFF0053"
+    app:layout_constraintStart_toStartOf="parent">
 
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/benefit_en"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="9sp"
+      android:textStyle="bold"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      />
+
+  </android.support.constraint.ConstraintLayout>
   <View
     android:id="@+id/view_dim_0"
     android:layout_width="match_parent"

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

@@ -16,6 +16,28 @@
     app:layout_constraintStart_toStartOf="parent"
     tools:src="@drawable/img_bestbucket_banner_1"
     />
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_flag"
+    android:layout_width="35dp"
+    android:layout_height="35dp"
+    android:layout_marginStart="14dp"
+    android:background="@color/CFF0053"
+    app:layout_constraintStart_toStartOf="parent">
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/benefit_en"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="9sp"
+      android:textStyle="bold"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      />
+
+  </android.support.constraint.ConstraintLayout>
 
   <TextView
     android:id="@+id/text_view_sub_title"

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

@@ -17,6 +17,32 @@
     tools:src="@drawable/img_bestbucket_banner_1"
     />
 
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_flag"
+    android:layout_width="40dp"
+    android:layout_height="16dp"
+    android:layout_marginStart="6dp"
+    android:layout_marginTop="6dp"
+    android:background="@color/CFF0053"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="4sp"
+      android:text="@string/benefit_en"
+      android:textColor="@color/CFFFFFF"
+      android:textSize="9sp"
+      android:textStyle="bold"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      />
+
+  </android.support.constraint.ConstraintLayout>
+
   <TextView
     android:id="@+id/text_view_main_third_category"
     android:layout_width="wrap_content"

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

@@ -418,6 +418,7 @@
   <string name="user">회원</string>
   <string name="coupon">쿠폰</string>
   <string name="benefit">혜택</string>
+  <string name="benefit_en">Benefit</string>
   <string name="other">기타</string>
 
   <!-- 북마크 소트 -->