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

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

@@ -0,0 +1,38 @@
+package kr.co.zumo.app.lifeplus.bean;
+
+/**
+ * FilterBean
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-11-05]   [최초 작성]
+ * @since 2018-11-05
+ */
+public class FilterBean extends JsonBeanBase {
+
+  private int categoryId;
+  private int checkedIndex;
+
+  public FilterBean(int categoryId, int checkedIndex) {
+    this.categoryId = categoryId;
+    this.checkedIndex = checkedIndex;
+  }
+
+  public int getCategoryId() {
+    return categoryId;
+  }
+
+  public void setCategoryId(int categoryId) {
+    this.categoryId = categoryId;
+  }
+
+  public int getCheckedIndex() {
+    return checkedIndex;
+  }
+
+  public void setCheckedIndex(int checkedIndex) {
+    this.checkedIndex = checkedIndex;
+  }
+}

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

@@ -6,7 +6,6 @@ import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.constraint.ConstraintLayout;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.widget.CheckBox;
 
@@ -89,9 +88,8 @@ public class CustomSquareArrowCheckBox extends ConstraintLayout {
   public void setOnClickListener(@Nullable OnClickListener listener) {
     this.listener = listener;
   }
-  
-  public boolean isChecked(){
-    Log.e("APP#  CustomSquareArrowCheckBox | isChecked", "|" + isChecked());
+
+  public boolean isChecked() {
     return checkBox.isChecked();
   }
 }

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

@@ -74,4 +74,7 @@ public class CustomSquareCheckBox extends ConstraintLayout  {
     checkBox.setText(stringResource);
   }
 
+  public boolean isChecked(){
+    return checkBox.isChecked();
+  }
 }

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

@@ -49,6 +49,7 @@ public class CategoryFirstMainFilterDialog extends DialogBase {
       }
     });
 
+
   }