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

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

@@ -52,6 +52,7 @@ public class ActionBarHelper extends Helper {
   private ConstraintLayout layoutCategoryTab;
   private ConstraintLayout categoryMainTab;
 
+
   private List<RadioButton> radioButtons;
 
   private ActionBarBuilder builder;
@@ -171,7 +172,7 @@ public class ActionBarHelper extends Helper {
 
     titleClickListener = null;
     scrollListener = null;
-    
+
     return new ActionBarBuilder(this, activity);
   }
 
@@ -462,10 +463,15 @@ public class ActionBarHelper extends Helper {
   }
 
   private void setCategoryTabVisible() {
+
     if (navigationBar.isArrowOpened()) {
       layoutCategoryTab.setVisibility(View.VISIBLE);
+//      layoutCategoryTab.setTranslationY((float) -ResourceUtil.dpToPx(123));
+//      layoutCategoryTab.animate().withLayer().translationY(0f).setDuration(500).start();
     }
     else {
+//      layoutCategoryTab.setTranslationY(0f);
+//      layoutCategoryTab.animate().withLayer().translationY((float) -ResourceUtil.dpToPx(123)).setDuration(500).start();
       layoutCategoryTab.setVisibility(View.GONE);
     }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventWinnerFragment.java

@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.constraint.ConstraintLayout;
 import android.support.constraint.ConstraintSet;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,6 +39,7 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
   private TextView textViewWinnerDate;
   private TextView textViewAnnouncementNotice;
   private ConstraintLayout layoutContainer;
+
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
     return inflater.inflate(R.layout.fragment_announcement_winner, container, false);
@@ -136,16 +138,22 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
       layoutContainer.addView(textViewNumber, layoutParams);
 
       constraintSet.clone(layoutContainer);
+      constraintSet.constrainWidth(textViewEmail.getId(), 0);
       constraintSet.connect(textViewEmail.getId(), ConstraintSet.START, emailId, ConstraintSet.START, 0);
       constraintSet.connect(textViewEmail.getId(), ConstraintSet.TOP, emailId, ConstraintSet.BOTTOM, marginEnd);
+      constraintSet.connect(textViewEmail.getId(), ConstraintSet.END, R.id.text_view_name, ConstraintSet.START, marginEnd);
       emailId = textViewEmail.getId();
 
+      constraintSet.constrainWidth(textViewName.getId(), 0);
       constraintSet.connect(textViewName.getId(), ConstraintSet.START, nameId, ConstraintSet.START, 0);
       constraintSet.connect(textViewName.getId(), ConstraintSet.TOP, nameId, ConstraintSet.BOTTOM, marginEnd);
+      constraintSet.connect(textViewName.getId(), ConstraintSet.END, R.id.text_view_phone, ConstraintSet.START, marginEnd);
       nameId = textViewName.getId();
 
+      constraintSet.constrainWidth(textViewNumber.getId(), 0);
       constraintSet.connect(textViewNumber.getId(), ConstraintSet.START, numberId, ConstraintSet.START, 0);
       constraintSet.connect(textViewNumber.getId(), ConstraintSet.TOP, numberId, ConstraintSet.BOTTOM, marginEnd);
+      constraintSet.connect(textViewNumber.getId(), ConstraintSet.END, ConstraintSet.PARENT_ID, ConstraintSet.END, marginEnd);
       numberId = textViewNumber.getId();
 
       constraintSet.applyTo(layoutContainer);
@@ -160,6 +168,9 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
   private void setTextStyle(TextView textView) {
     textView.setId(View.generateViewId());
     textView.setTextSize(12);
+    textView.setWidth(0);
+    textView.setSingleLine();
+    textView.setEllipsize(TextUtils.TruncateAt.END);
     textView.setTextColor(ResourceUtil.getColor(R.color.C666666));
   }
 }

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

@@ -61,141 +61,149 @@
           />
       </RelativeLayout>
 
-      <!--카테고리 메인 탭-->
-      <android.support.constraint.ConstraintLayout
-        android:id="@+id/layout_category_main_tab"
+      <LinearLayout
+        android:id="@+id/layout_container_tab"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/CFFFFFF"
-        android:orientation="horizontal"
-        android:paddingTop="24dp"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:orientation="vertical"
+        tools:background="@color/CE5E5E5"
         tools:visibility="visible"
         >
-
+        <!--카테고리 메인 탭-->
         <android.support.constraint.ConstraintLayout
-          android:id="@+id/category_main_tab"
+          android:id="@+id/layout_category_main_tab"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:paddingStart="6dp"
-          android:paddingEnd="6dp"
-          android:paddingBottom="26dp"
+          android:background="@color/CFFFFFF"
+          android:orientation="horizontal"
+          android:paddingTop="24dp"
+          android:visibility="invisible"
           app:layout_constraintBottom_toBottomOf="parent"
-          tools:visibility="visible">
-
-          <RadioButton
-            android:id="@+id/tab_first_category"
-            android:layout_width="56dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="2dp"
-            android:background="@null"
-            android:button="@null"
-            android:drawableTop="@drawable/category_main_first_tab"
-            android:drawablePadding="8dp"
-            android:lineSpacingExtra="4dp"
-            android:text="@string/contents_category1_tab_title"
-            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"
-            android:layout_width="56dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:layout_marginEnd="2dp"
-            android:background="@null"
-            android:button="@null"
-            android:drawableTop="@drawable/category_main_second_tab"
-            android:drawablePadding="8dp"
-            android:lineSpacingExtra="4dp"
-            android:text="@string/contents_category2_tab_title"
-            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"
-            android:layout_width="56dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:layout_marginEnd="2dp"
-            android:background="@null"
-            android:button="@null"
-            android:drawableTop="@drawable/category_main_third_tab"
-            android:drawablePadding="8dp"
-            android:lineSpacingExtra="4dp"
-            android:text="@string/contents_category3_tab_title"
-            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"
-            android:layout_width="56dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
-            android:layout_marginEnd="2dp"
-            android:background="@null"
-            android:button="@null"
-            android:drawableTop="@drawable/category_main_fourth_tab"
-            android:drawablePadding="8dp"
-            android:lineSpacingExtra="4dp"
-            android:text="@string/contents_category4_tab_title"
-            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"
-            android:layout_width="56dp"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent"
+          tools:visibility="visible"
+          >
+
+          <android.support.constraint.ConstraintLayout
+            android:id="@+id/category_main_tab"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="2dp"
-            android:background="@null"
-            android:button="@null"
-            android:drawableTop="@drawable/category_main_fifth_tab"
-            android:drawablePadding="8dp"
-            android:lineSpacingExtra="4sp"
-            android:text="@string/contents_category5_tab_title"
-            android:textAlignment="center"
-            android:textColor="@drawable/my_faq_radio_text_selector"
-            android:textSize="12sp"
-            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:paddingStart="6dp"
+            android:paddingEnd="6dp"
+            android:paddingBottom="26dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:visibility="visible">
+
+            <RadioButton
+              android:id="@+id/tab_first_category"
+              android:layout_width="56dp"
+              android:layout_height="wrap_content"
+              android:layout_marginStart="10dp"
+              android:layout_marginEnd="2dp"
+              android:background="@null"
+              android:button="@null"
+              android:drawableTop="@drawable/category_main_first_tab"
+              android:drawablePadding="8dp"
+              android:lineSpacingExtra="4dp"
+              android:text="@string/contents_category1_tab_title"
+              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"
+              android:layout_width="56dp"
+              android:layout_height="wrap_content"
+              android:layout_marginStart="2dp"
+              android:layout_marginEnd="2dp"
+              android:background="@null"
+              android:button="@null"
+              android:drawableTop="@drawable/category_main_second_tab"
+              android:drawablePadding="8dp"
+              android:lineSpacingExtra="4dp"
+              android:text="@string/contents_category2_tab_title"
+              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"
+              android:layout_width="56dp"
+              android:layout_height="wrap_content"
+              android:layout_marginStart="2dp"
+              android:layout_marginEnd="2dp"
+              android:background="@null"
+              android:button="@null"
+              android:drawableTop="@drawable/category_main_third_tab"
+              android:drawablePadding="8dp"
+              android:lineSpacingExtra="4dp"
+              android:text="@string/contents_category3_tab_title"
+              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"
+              android:layout_width="56dp"
+              android:layout_height="wrap_content"
+              android:layout_marginStart="2dp"
+              android:layout_marginEnd="2dp"
+              android:background="@null"
+              android:button="@null"
+              android:drawableTop="@drawable/category_main_fourth_tab"
+              android:drawablePadding="8dp"
+              android:lineSpacingExtra="4dp"
+              android:text="@string/contents_category4_tab_title"
+              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"
+              android:layout_width="56dp"
+              android:layout_height="wrap_content"
+              android:layout_marginStart="10dp"
+              android:layout_marginEnd="2dp"
+              android:background="@null"
+              android:button="@null"
+              android:drawableTop="@drawable/category_main_fifth_tab"
+              android:drawablePadding="8dp"
+              android:lineSpacingExtra="4sp"
+              android:text="@string/contents_category5_tab_title"
+              android:textAlignment="center"
+              android:textColor="@drawable/my_faq_radio_text_selector"
+              android:textSize="12sp"
+              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"
+            android:layout_height="1dp"
+            android:background="@color/CE5E5E5"
+            app:layout_constraintBottom_toBottomOf="parent"
+            />
         </android.support.constraint.ConstraintLayout>
-
-        <View
-          android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:background="@color/CE5E5E5"
-          app:layout_constraintBottom_toBottomOf="parent"
-          />
-      </android.support.constraint.ConstraintLayout>
-
+      </LinearLayout>
     </android.support.design.widget.AppBarLayout>
 
     <android.support.design.widget.FloatingActionButton
@@ -213,11 +221,11 @@
 
   </android.support.design.widget.CoordinatorLayout>
 
-<!--    <fragment
-      android:name="kr.co.zumo.app.lifeplus.view.screen.menu.AllMenuFragment"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      tools:visibility="gone"/>-->
+  <!--    <fragment
+        android:name="kr.co.zumo.app.lifeplus.view.screen.menu.AllMenuFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:visibility="gone"/>-->
 
   <include
     android:id="@+id/drawer_item"