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

app/src/main/java/kr/co/zumo/app/lifeplus/helper/ActionBarHelper.java

@@ -13,7 +13,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
-import android.widget.RadioGroup;
+
+import java.util.ArrayList;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
@@ -41,7 +42,15 @@ public class ActionBarHelper extends Helper {
   private Toolbar toolbar;
   private ProgressBar progressBar;
   private ConstraintLayout layoutCategoryTab;
-  private RadioGroup categoryMainTab;
+  private ConstraintLayout categoryMainTab;
+
+  private RadioButton radioButtonCategory1;
+  private RadioButton radioButtonCategory2;
+  private RadioButton radioButtonCategory3;
+  private RadioButton radioButtonCategory4;
+  private RadioButton radioButtonCategory5;
+
+  private ArrayList<RadioButton> radioButtons;
 
   private Builder builder;
 
@@ -79,6 +88,18 @@ public class ActionBarHelper extends Helper {
     progressBar = appBarLayout.findViewById(R.id.progress_bar);
     layoutCategoryTab = appBarLayout.findViewById(R.id.layout_category_main_tab);
     categoryMainTab = appBarLayout.findViewById(R.id.category_main_tab);
+    radioButtonCategory1 = appBarLayout.findViewById(R.id.tab_first_category);
+    radioButtonCategory2 = appBarLayout.findViewById(R.id.tab_second_category);
+    radioButtonCategory3 = appBarLayout.findViewById(R.id.tab_third_category);
+    radioButtonCategory4 = appBarLayout.findViewById(R.id.tab_fourth_category);
+    radioButtonCategory5 = appBarLayout.findViewById(R.id.tab_fifth_category);
+
+    radioButtons = new ArrayList<>();
+    radioButtons.add(radioButtonCategory1);
+    radioButtons.add(radioButtonCategory2);
+    radioButtons.add(radioButtonCategory3);
+    radioButtons.add(radioButtonCategory4);
+    radioButtons.add(radioButtonCategory5);
 
     Log.i("APP# ActionBarHelper | init", "|" + "progressBar: " + progressBar);
   }
@@ -264,6 +285,10 @@ public class ActionBarHelper extends Helper {
     layoutCategoryTab.setVisibility(View.GONE);
 
     if (newBuilder.selectedCategoryIndex > -1) {
+      //초기화
+      for (int i = 0; i < radioButtons.size(); i++) {
+        radioButtons.get(i).setChecked(false);
+      }
       ((RadioButton) categoryMainTab.getChildAt(newBuilder.selectedCategoryIndex)).setChecked(true);
     }
 

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

@@ -58,22 +58,24 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@color/CFFFFFF"
+      android:orientation="horizontal"
+      android:paddingTop="24dp"
       android:visibility="gone"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
       tools:visibility="visible"
       >
 
-      <RadioGroup
+      <android.support.constraint.ConstraintLayout
         android:id="@+id/category_main_tab"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:layout_marginBottom="26dp"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        >
+        android:paddingStart="6dp"
+        android:paddingEnd="6dp"
+        android:paddingBottom="26dp"
+        app:layout_constraintBottom_toBottomOf="parent">
 
         <RadioButton
           android:id="@+id/tab_first_category"
@@ -90,7 +92,10 @@
           android:textAlignment="center"
           android:textColor="@drawable/my_faq_radio_text_selector"
           android:textSize="12dp"
-          />
+          app:layout_constraintEnd_toStartOf="@+id/tab_second_category"
+          app:layout_constraintHorizontal_bias="0.5"
+          app:layout_constraintHorizontal_chainStyle="spread"
+          app:layout_constraintStart_toStartOf="parent"/>
 
         <RadioButton
           android:id="@+id/tab_second_category"
@@ -107,7 +112,10 @@
           android:textAlignment="center"
           android:textColor="@drawable/my_faq_radio_text_selector"
           android:textSize="12dp"
-          />
+          app:layout_constraintEnd_toStartOf="@+id/tab_third_category"
+          app:layout_constraintHorizontal_bias="0.5"
+          app:layout_constraintHorizontal_chainStyle="spread"
+          app:layout_constraintStart_toEndOf="@+id/tab_first_category"/>
 
         <RadioButton
           android:id="@+id/tab_third_category"
@@ -124,7 +132,10 @@
           android:textAlignment="center"
           android:textColor="@drawable/my_faq_radio_text_selector"
           android:textSize="12dp"
-          />
+          app:layout_constraintEnd_toStartOf="@+id/tab_fourth_category"
+          app:layout_constraintHorizontal_bias="0.5"
+          app:layout_constraintHorizontal_chainStyle="spread"
+          app:layout_constraintStart_toEndOf="@+id/tab_second_category"/>
 
         <RadioButton
           android:id="@+id/tab_fourth_category"
@@ -141,7 +152,10 @@
           android:textAlignment="center"
           android:textColor="@drawable/my_faq_radio_text_selector"
           android:textSize="12dp"
-          />
+          app:layout_constraintEnd_toStartOf="@+id/tab_fifth_category"
+          app:layout_constraintHorizontal_bias="0.5"
+          app:layout_constraintHorizontal_chainStyle="spread"
+          app:layout_constraintStart_toEndOf="@+id/tab_third_category"/>
 
         <RadioButton
           android:id="@+id/tab_fifth_category"
@@ -158,8 +172,11 @@
           android:textAlignment="center"
           android:textColor="@drawable/my_faq_radio_text_selector"
           android:textSize="12sp"
-          />
-      </RadioGroup>
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintHorizontal_bias="0.5"
+          app:layout_constraintHorizontal_chainStyle="spread"
+          app:layout_constraintStart_toEndOf="@+id/tab_fourth_category"/>
+      </android.support.constraint.ConstraintLayout>
 
       <View
         android:layout_width="match_parent"