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

# Conflicts:
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/faq/FAQFragment.java

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

@@ -0,0 +1,31 @@
+package kr.co.zumo.app.lifeplus.bean;
+
+import android.support.annotation.DrawableRes;
+
+/**
+ * ImageBEAN
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-23]   [최초 작성]
+ * @since 2018-10-23
+ */
+public class ImageBean extends JsonBeanBase {
+
+  @DrawableRes
+  private int drawableResource;
+
+  public ImageBean(int drawableResource) {
+    this.drawableResource = drawableResource;
+  }
+
+  public int getDrawableResource() {
+    return drawableResource;
+  }
+
+  public void setDrawableResource(int drawableResource) {
+    this.drawableResource = drawableResource;
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/main/banner/MainBannerView.java

@@ -0,0 +1,56 @@
+package kr.co.zumo.app.lifeplus.view.custom.main.banner;
+
+import android.content.Context;
+import android.support.constraint.ConstraintLayout;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.LinearSnapHelper;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SnapHelper;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+
+import java.util.List;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.ImageBean;
+import kr.co.zumo.app.lifeplus.view.fragment.main.category.banner.MainBannerAdapter;
+
+/**
+ * MainBannerView
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-23]   [최초 작성]
+ * @since 2018-10-23
+ */
+public class MainBannerView extends ConstraintLayout {
+
+  private MainBannerAdapter mainBannerAdapter;
+  private RecyclerView recyclerView;
+
+  public MainBannerView(Context context) {
+    super(context);
+  }
+
+  public MainBannerView(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public MainBannerView(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  public void init(Context context, List<ImageBean> textImageBeanList, int itemCount) {
+    LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    inflater.inflate(R.layout.main_banner_view, this);
+    SnapHelper snapHelper = new LinearSnapHelper();
+    snapHelper.attachToRecyclerView(recyclerView );
+    recyclerView = (RecyclerView) findViewById(R.id.recycler_view_main_banner_view);
+    recyclerView.setLayoutManager(new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false));
+    mainBannerAdapter = new MainBannerAdapter(context, inflater, textImageBeanList, itemCount);
+    recyclerView.setAdapter(mainBannerAdapter);
+  }
+
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/main/category/FirstCategoryMainGridViewHolder.java

@@ -31,7 +31,7 @@ public class FirstCategoryMainGridViewHolder extends RecyclerView.ViewHolder {
   public void doDataSetting(){
 
     imageViewMainFirstCategory.setImageDrawable(itemView.getResources().getDrawable(R.drawable.img_bestbucket_1));
-    textViewMainFirstCategory.setText(R.string.bucket_list);
+    textViewMainFirstCategory.setText(R.string.contents_category1_action_bar_title);
 
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/main/category/FirstCategoryMainLinearViewHolder.java

@@ -2,9 +2,13 @@ package kr.co.zumo.app.lifeplus.view.fragment.main.category;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
-import android.widget.ImageView;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.ImageBean;
+import kr.co.zumo.app.lifeplus.view.custom.main.banner.MainBannerView;
 
 /**
  * FirstCategoryMainLinearViewHolder
@@ -18,15 +22,21 @@ import kr.co.zumo.app.R;
  */
 public class FirstCategoryMainLinearViewHolder extends RecyclerView.ViewHolder {
 
-  private ImageView imageViewMainFirstCategory;
+  private MainBannerView mainBannerViewFirstCategory;
 
   public FirstCategoryMainLinearViewHolder(View itemView) {
     super(itemView);
-    imageViewMainFirstCategory = itemView.findViewById(R.id.image_view_main_first_category);
+    mainBannerViewFirstCategory = itemView.findViewById(R.id.main_banner_view_first_category);
   }
 
   public void doDataSetting() {
-    imageViewMainFirstCategory.setImageDrawable(itemView.getResources().getDrawable(R.drawable.img_bestbucket_banner_5));
+
+    List<ImageBean> imageBeanList =  new ArrayList<>();
+    imageBeanList.add(new ImageBean(R.drawable.img_bestbucket_banner_1));
+    imageBeanList.add(new ImageBean(R.drawable.img_bestbucket_banner_2));
+    mainBannerViewFirstCategory.init(itemView.getContext(), imageBeanList, 2 );
 
   }
+
+
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/main/category/banner/MainBannerAdapter.java

@@ -0,0 +1,55 @@
+package kr.co.zumo.app.lifeplus.view.fragment.main.category.banner;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.ImageBean;
+
+/**
+ * MainBannerAdapter
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-23]   [최초 작성]
+ * @since 2018-10-23
+ */
+public class MainBannerAdapter extends RecyclerView.Adapter<MainBannerViewHolder> {
+
+  private Context context;
+  private List<ImageBean> imageBeanList;
+  private LayoutInflater inflater;
+  private int itemCount;
+
+  public MainBannerAdapter(Context context, LayoutInflater inflater, List<ImageBean> imageBeanList, int itemCount) {
+    this.context = context;
+    this.inflater = inflater;
+    this.imageBeanList = imageBeanList;
+    this.itemCount = itemCount;
+  }
+
+  @NonNull
+  @Override
+  public MainBannerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    View view = inflater.inflate(R.layout.main_banner_view_item , parent, false);
+    return new MainBannerViewHolder(view);
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull MainBannerViewHolder holder, int position) {
+    holder.doDataSetting(imageBeanList.get(position));
+  }
+
+  @Override
+  public int getItemCount() {
+    return itemCount;
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/main/category/banner/MainBannerViewHolder.java

@@ -0,0 +1,32 @@
+package kr.co.zumo.app.lifeplus.view.fragment.main.category.banner;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.ImageBean;
+
+/**
+ * MainBannerViewHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-23]   [최초 작성]
+ * @since 2018-10-23
+ */
+public class MainBannerViewHolder extends RecyclerView.ViewHolder {
+
+  private ImageView imageViewBannerItem;
+
+  public MainBannerViewHolder(View itemView) {
+    super(itemView);
+    imageViewBannerItem = itemView.findViewById(R.id.image_view_banner_item);
+  }
+
+  public void doDataSetting(ImageBean bean){
+    imageViewBannerItem.setImageDrawable(itemView.getResources().getDrawable(bean.getDrawableResource()));
+  }
+}

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_marginTop="26dp"
+  android:layout_marginBottom="26dp"
+  android:layout_height="wrap_content">
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/recycler_view_main_banner_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
+</android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_marginTop="26dp"
+  android:layout_marginBottom="26dp"
+  android:layout_height="wrap_content">
+
+  <ImageView
+    android:id="@+id/image_view_banner_item"
+    android:layout_width="match_parent"
+    android:layout_height="122dp"
+    android:scaleType="fitXY"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:srcCompat="@drawable/img_bestbucket_banner_5"/>
+</android.support.constraint.ConstraintLayout>

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

@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
-  android:layout_marginTop="26dp"
-  android:layout_marginBottom="26dp"
   android:layout_height="wrap_content">
 
-  <ImageView
-    android:id="@+id/image_view_main_first_category"
-    android:layout_width="match_parent"
-    android:layout_height="122dp"
-    android:scaleType="fitXY"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:srcCompat="@drawable/img_bestbucket_banner_5"/>
+<kr.co.zumo.app.lifeplus.view.custom.main.banner.MainBannerView
+  android:id="@+id/main_banner_view_first_category"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"/>
+
 </android.support.constraint.ConstraintLayout>