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

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CategoryFirstMainFilterDialog.java

@@ -8,9 +8,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-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.FilterBean;
+import kr.co.zumo.app.lifeplus.view.custom.CustomSquareCheckBox;
 
 /**
  * FirstCategoryFilterDialog
@@ -25,8 +29,13 @@ import kr.co.zumo.app.R;
 
 public class CategoryFirstMainFilterDialog extends DialogBase {
 
-  private ImageView imageViewCancel;
+  private static final int CATEGORY_FIRST_ID = 0;
+  private static final int CATEGORY_SECOND_ID = 1;
+  private static final int CATEGORY_THIRD_ID = 2;
+  private static final int CATEGORY_FOURTH_ID = 3;
+  private static final int CATEGORY_FIFTH_ID = 4;
 
+  private List<FilterBean> data;
 
   @Nullable
   @Override
@@ -34,21 +43,107 @@ public class CategoryFirstMainFilterDialog extends DialogBase {
     return inflater.inflate(R.layout.dialog_category_first_main, container, false);
   }
 
-  @Override
-  public void onActivityCreated(Bundle savedInstanceState) {
-    super.onActivityCreated(savedInstanceState);
-    //Full Screen dialog
-    Window window = getDialog().getWindow();
-    window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+      super.onActivityCreated(savedInstanceState);
+      //Full Screen dialog
+      Window window = getDialog().getWindow();
+      window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
 
 
-    imageViewCancel = getView().findViewById(R.id.image_view_cancel_main);
-    imageViewCancel.setOnClickListener(view -> {
+      getView().findViewById(R.id.image_view_cancel_main).setOnClickListener(view -> {
       if (null != getResultListener()) {
         getResultListener().onDialogCanceled(CategoryFirstMainFilterDialog.this);
       }
     });
 
+    getView().findViewById(R.id.text_view_show_contents).setOnClickListener(view -> {
+      if (null != getResultListener()) {
+        init();
+      }
+    });
+
+
+  }
+
+  /**
+   * 선택된 필터 value 값을 가지고 온다.
+   */
+  private void init() {
+
+    data = new ArrayList<>();
+    ArrayList<CustomSquareCheckBox> firstCategoryCheckboxList = new ArrayList<>();
+
+    //주말 활동
+    firstCategoryCheckboxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_first_check_1)));
+    firstCategoryCheckboxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_first_check_2)));
+    firstCategoryCheckboxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_first_check_3)));
+    firstCategoryCheckboxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_first_check_4)));
+    firstCategoryCheckboxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_first_check_5)));
+
+    for (int i = 0; i < firstCategoryCheckboxList.size(); ++i) {
+      CustomSquareCheckBox firstCategoryCheckBox = firstCategoryCheckboxList.get(i);
+      if (firstCategoryCheckBox.isChecked()) {
+        data.add(new FilterBean(CATEGORY_FIRST_ID, i));
+      }
+
+    }
+
+
+    //동반 유형
+    ArrayList<CustomSquareCheckBox> secondCategoryCheckboxList = new ArrayList<>();
+    secondCategoryCheckboxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_second_check_1)));
+    secondCategoryCheckboxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_second_check_2)));
+    secondCategoryCheckboxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_second_check_3)));
+    secondCategoryCheckboxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_second_check_4)));
+
+    for (int i = 0; i < secondCategoryCheckboxList.size(); ++i) {
+      CustomSquareCheckBox secondCategoryCheckBox =  secondCategoryCheckboxList.get(i);
+      if (secondCategoryCheckBox.isChecked()) {
+        data.add(new FilterBean(CATEGORY_SECOND_ID, i));
+      }
+    }
+
+
+    //지역
+    ArrayList<CustomSquareCheckBox> thirdCategoryCheckBoxList= new ArrayList<>();
+    thirdCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_third_check_1)));
+    thirdCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_third_check_2)));
+    thirdCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_third_check_3)));
+    thirdCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_third_check_4)));
+    thirdCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_third_check_5)));
+    thirdCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_third_check_6)));
+    for(int i = 0; i<thirdCategoryCheckBoxList.size(); ++i){
+      CustomSquareCheckBox thirdCategoryCheckBox = thirdCategoryCheckBoxList.get(i);
+      if(thirdCategoryCheckBox.isChecked()){
+        data.add(new FilterBean(CATEGORY_THIRD_ID, i));
+      }
+    }
+
+    //활동상황
+
+    ArrayList<CustomSquareCheckBox> fourthCategoryCheckBoxList = new ArrayList<>();
+    fourthCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_fourth_check_1)));
+    fourthCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_fourth_check_2)));
+    fourthCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_fourth_check_3)));
+    fourthCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_fourth_check_4)));
+    fourthCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_fourth_check_5)));
+    fourthCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_fourth_check_6)));
+    fourthCategoryCheckBoxList.add(((CustomSquareCheckBox) getView().findViewById(R.id.filter_fourth_check_7)));
+
+    for (int i = 0; i < fourthCategoryCheckBoxList.size(); ++i) {
+      CustomSquareCheckBox fourthCategoryCheckBox =  fourthCategoryCheckBoxList.get(i);
+      if (fourthCategoryCheckBox.isChecked()) {
+        data.add(new FilterBean(CATEGORY_FOURTH_ID, i));
+      }
+    }
+
+    //주차여부
+    CustomSquareCheckBox fifthCategoryCheckBox = ((CustomSquareCheckBox) getView().findViewById(R.id.filter_fifth_check_1));
+    if(fifthCategoryCheckBox.isChecked()){
+      data.add(new FilterBean(CATEGORY_FIFTH_ID, 0));
+    }
+
 
   }
 

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

@@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,6 +21,8 @@ import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
 import kr.co.zumo.app.lifeplus.manager.IActionBarListener;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.view.custom.main.series.IMainSeriesContract;
+import kr.co.zumo.app.lifeplus.view.custom.main.series.MainSeriesPresenter;
 import kr.co.zumo.app.lifeplus.view.custom.main.series.MainSeriesView;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
@@ -50,9 +53,15 @@ public class FourthCategoryMainFragment extends FragmentBase<FourthCategoryMainP
     recyclerViewFourthCategoryMain = findViewById(R.id.recycler_view_fourth_category_main);
     doDataSetting();
     mainSeriesView.init(getActivity(), textImageBeanList, 10);
+    MainSeriesPresenter mainSeriesPresenter = new MainSeriesPresenter(mainSeriesView, new IMainSeriesContract.Listener() {
+      @Override
+      public void onClickItem(int position) {
+        Log.i("APP# FirstCategoryMainFragment | onClickItem", "|" + "position: " + position);
+      }
+    });
     FourthCategoryMainAdapter fourthCategoryMainAdapter = new FourthCategoryMainAdapter(getActivity());
     LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false);
-    recyclerViewFourthCategoryMain.setLayoutManager(linearLayoutManager );
+    recyclerViewFourthCategoryMain.setLayoutManager(linearLayoutManager);
     recyclerViewFourthCategoryMain.addItemDecoration(new RecyclerView.ItemDecoration() {
       @Override
       public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {

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

@@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,6 +21,8 @@ import kr.co.zumo.app.lifeplus.manager.IActionBarListener;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.custom.main.series.IMainSeriesContract;
+import kr.co.zumo.app.lifeplus.view.custom.main.series.MainSeriesPresenter;
 import kr.co.zumo.app.lifeplus.view.custom.main.series.MainSeriesView;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
@@ -51,6 +54,12 @@ public class SecondCategoryMainFragment extends FragmentBase<SecondCategoryMainP
     recyclerViewSecondCategoryMain = findViewById(R.id.recycler_view_second_category_main);
     doDataSetting();
     mainSeriesView.init(getActivity(), textImageBeanList, 10);
+    MainSeriesPresenter mainSeriesPresenter = new MainSeriesPresenter(mainSeriesView, new IMainSeriesContract.Listener() {
+      @Override
+      public void onClickItem(int position) {
+        Log.i("APP# FirstCategoryMainFragment | onClickItem", "|" + "position: " + position);
+      }
+    });
     SecondCategoryMainAdapter secondCategoryMainAdapter = new SecondCategoryMainAdapter(getActivity());
 
     recyclerViewSecondCategoryMain.addItemDecoration(new RecyclerView.ItemDecoration() {

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

@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,6 +19,8 @@ import kr.co.zumo.app.lifeplus.bean.TextImageBean;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
 import kr.co.zumo.app.lifeplus.manager.IActionBarListener;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.view.custom.main.series.IMainSeriesContract;
+import kr.co.zumo.app.lifeplus.view.custom.main.series.MainSeriesPresenter;
 import kr.co.zumo.app.lifeplus.view.custom.main.series.MainSeriesView;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
@@ -49,6 +52,12 @@ public class ThirdCategoryMainFragment extends FragmentBase<ThirdCategoryMainPre
     recyclerViewThirdCategoryMain = findViewById(R.id.recycler_view_third_category_main);
     doDataSetting();
     mainSeriesView.init(getActivity(), textImageBeanList, 10);
+    MainSeriesPresenter mainSeriesPresenter = new MainSeriesPresenter(mainSeriesView, new IMainSeriesContract.Listener() {
+      @Override
+      public void onClickItem(int position) {
+        Log.i("APP# FirstCategoryMainFragment | onClickItem", "|" + "position: " + position);
+      }
+    });
     ThirdCategoryMainAdapter thirdCategoryMainAdapter = new ThirdCategoryMainAdapter(getActivity());
     GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(), 2);
     gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {

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

@@ -251,12 +251,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/layout_seventh_main">
 
-        <kr.co.zumo.app.lifeplus.view.custom.CustomSquareArrowCheckBox
+        <kr.co.zumo.app.lifeplus.view.custom.CustomSquareCheckBox
           android:id="@+id/filter_third_check_1"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginEnd="7dp"
-          app:ArrowCheckBoxText="@string/first_filter_case_2_contents_1"
+          app:checkBoxText="@string/first_filter_case_2_contents_1"
           app:layout_constraintEnd_toStartOf="@+id/filter_third_check_2"
           app:layout_constraintStart_toStartOf="parent"/>
 
@@ -289,13 +289,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/layout_eight_main">
 
-        <kr.co.zumo.app.lifeplus.view.custom.CustomSquareArrowCheckBox
+        <kr.co.zumo.app.lifeplus.view.custom.CustomSquareCheckBox
           android:id="@+id/filter_third_check_4"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:clickable="true"
-          android:focusable="true"
-          app:ArrowCheckBoxText="@string/first_filter_case_2_contents_4"
+          app:checkBoxText="@string/first_filter_case_2_contents_4"
           app:layout_constraintEnd_toStartOf="@+id/filter_third_check_5"
           app:layout_constraintStart_toStartOf="parent"/>