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

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

@@ -80,7 +80,7 @@
           android:id="@+id/tab_first_category"
           android:layout_width="56dp"
           android:layout_height="wrap_content"
-          android:layout_marginStart="2dp"
+          android:layout_marginStart="10dp"
           android:layout_marginEnd="2dp"
           android:background="@null"
           android:button="@null"
@@ -160,7 +160,7 @@
           android:id="@+id/tab_fifth_category"
           android:layout_width="56dp"
           android:layout_height="wrap_content"
-          android:layout_marginStart="2dp"
+          android:layout_marginStart="10dp"
           android:layout_marginEnd="2dp"
           android:background="@null"
           android:button="@null"

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

@@ -1,209 +1,198 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="55dp"
-    android:layout_marginBottom="16dp"
-    android:gravity="center"
-    android:orientation="vertical">
 
-    <LinearLayout
+  <android.support.constraint.ConstraintLayout
+    android:layout_width="wrap_content"
+    android:layout_height="291dp"
+    android:orientation="vertical"
+    app:layout_constraintBottom_toBottomOf="@id/view4"
+    android:layout_marginBottom="80dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+
+    <TextView
+      android:id="@+id/text_view_first_category"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="6dp"
-      android:orientation="vertical">
-
-      <TextView
-        android:id="@+id/text_view_first_category"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:padding="10dp"
-        android:text="@string/contents_category1"
-        android:textColor="@color/C000000"
-        android:textSize="21sp"
-        />
-    </LinearLayout>
-
-    <LinearLayout
+      android:layout_marginBottom="16dp"
+      android:gravity="center_horizontal"
+      android:padding="10dp"
+      android:text="@string/contents_category1"
+      android:textColor="@color/C000000"
+      android:textSize="21sp"
+      app:layout_constraintBottom_toTopOf="@+id/text_view_second_category"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"/>
+
+
+    <TextView
+      android:id="@+id/text_view_second_category"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="6dp"
-      android:orientation="vertical">
-
-      <TextView
-        android:id="@+id/text_view_second_category"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:padding="10dp"
-        android:text="@string/contents_category2"
-        android:textColor="@color/C000000"
-        android:textSize="21sp"
-        />
-    </LinearLayout>
-
-    <LinearLayout
+      android:layout_marginBottom="16dp"
+      android:gravity="center_horizontal"
+      android:padding="10dp"
+      android:text="@string/contents_category2"
+      android:textColor="@color/C000000"
+      android:textSize="21sp"
+      app:layout_constraintBottom_toTopOf="@+id/text_view_third_category"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_first_category"/>
+
+
+    <TextView
+      android:id="@+id/text_view_third_category"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="6dp"
-      android:orientation="vertical">
-
-      <TextView
-        android:id="@+id/text_view_third_category"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:padding="10dp"
-        android:text="@string/contents_category3"
-        android:textColor="@color/C000000"
-        android:textSize="21sp"
-        />
-    </LinearLayout>
-
-    <LinearLayout
+      android:layout_marginBottom="16dp"
+      android:gravity="center_horizontal"
+      android:padding="10dp"
+      android:text="@string/contents_category3"
+      android:textColor="@color/C000000"
+      android:textSize="21sp"
+      app:layout_constraintBottom_toTopOf="@+id/text_view_fourth_category"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_second_category"/>
+
+
+    <TextView
+      android:id="@+id/text_view_fourth_category"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="6dp"
-      android:orientation="vertical">
-
-      <TextView
-        android:id="@+id/text_view_fourth_category"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:padding="10dp"
-        android:text="@string/contents_category4"
-        android:textColor="@color/C000000"
-        android:textSize="21sp"
-        />
-    </LinearLayout>
-
-    <LinearLayout
+      android:layout_marginBottom="16dp"
+      android:gravity="center_horizontal"
+      android:padding="10dp"
+      android:text="@string/contents_category4"
+      android:textColor="@color/C000000"
+      android:textSize="21sp"
+      app:layout_constraintBottom_toTopOf="@+id/text_view_fifth_category"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_third_category"/>
+
+
+    <TextView
+      android:id="@+id/text_view_fifth_category"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="6dp"
-      android:orientation="vertical">
-
-      <TextView
-        android:id="@+id/text_view_fifth_category"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:padding="10dp"
-        android:text="@string/contents_category5"
-        android:textColor="@color/C000000"
-        android:textSize="21sp"
-        />
-    </LinearLayout>
-
-    <Space
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="1"/>
-
-    <LinearLayout
+      android:gravity="center_horizontal"
+      android:padding="10dp"
+      android:text="@string/contents_category5"
+      android:textColor="@color/C000000"
+      android:textSize="21sp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_fourth_category"/>
+
+  </android.support.constraint.ConstraintLayout>
+
+  <View
+    android:id="@+id/view4"
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:layout_marginBottom="16dp"
+    android:background="@color/CEBEBEB"
+    app:layout_constraintBottom_toTopOf="@+id/layout_menu"/>
+
+  <LinearLayout
+    android:id="@+id/layout_menu"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_marginTop="16dp"
+    android:gravity="center"
+    android:orientation="horizontal"
+    app:layout_constraintBottom_toTopOf="@+id/layout_last">
+
+    <TextView
+      android:id="@+id/text_my"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:orientation="vertical">
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/CEBEBEB"/>
+      android:layout_marginEnd="16dp"
+      android:gravity="center"
+      android:lineSpacingExtra="5.5sp"
+      android:padding="10dp"
+      android:text="@string/menu_category1"
+      android:textColor="@color/C000000"
+      android:textSize="15sp"/>
+
+    <TextView
+      android:id="@+id/text_event"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="16dp"
+      android:gravity="center"
+      android:lineSpacingExtra="5.5sp"
+      android:padding="10dp"
+      android:text="@string/menu_category2"
+      android:textColor="@color/C999999"
+      android:textSize="15sp"/>
+
+    <TextView
+      android:id="@+id/text_coupon"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="center"
+      android:lineSpacingExtra="5.5sp"
+      android:padding="10dp"
+      android:text="@string/menu_category3"
+      android:textColor="@color/C999999"
+      android:textSize="15sp"/>
+  </LinearLayout>
 
-    </LinearLayout>
+  <LinearLayout
+    android:id="@+id/layout_last"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:padding="5dp"
+    android:layout_marginBottom="25dp"
+    app:layout_constraintBottom_toBottomOf="parent">
 
-    <LinearLayout
-      android:layout_width="match_parent"
+    <TextView
+      android:id="@+id/text_view_life_plus_guide"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:layout_marginTop="16dp"
-      android:gravity="center"
-      android:orientation="horizontal">
-
-      <TextView
-        android:id="@+id/text_my"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:lineSpacingExtra="5.5sp"
-        android:padding="10dp"
-        android:text="@string/menu_category1"
-        android:textColor="@color/C000000"
-        android:textSize="15sp"/>
-
-      <TextView
-        android:id="@+id/text_event"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:lineSpacingExtra="5.5sp"
-        android:padding="10dp"
-        android:text="@string/menu_category2"
-        android:textColor="@color/C999999"
-        android:textSize="15sp"/>
-
-      <TextView
-        android:id="@+id/text_coupon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:lineSpacingExtra="5.5sp"
-        android:padding="10dp"
-        android:text="@string/menu_category3"
-        android:textColor="@color/C999999"
-        android:textSize="15sp"/>
-    </LinearLayout>
-
-    <LinearLayout
-      android:layout_width="match_parent"
+      android:lineSpacingExtra="3sp"
+      android:padding="10dp"
+      android:text="@string/introduce_life_plus"
+      android:textColor="@color/C999999"
+      android:textSize="12sp"
+      />
+
+    <TextView
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:gravity="center"
-      android:orientation="horizontal"
-      android:padding="5dp">
-
-      <TextView
-        android:id="@+id/text_view_life_plus_guide"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:lineSpacingExtra="3sp"
-        android:padding="10dp"
-        android:text="@string/introduce_life_plus"
-        android:textColor="@color/C999999"
-        android:textSize="12sp"
-        />
-
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="11dp"
-        android:layout_marginEnd="11dp"
-        android:gravity="center"
-        android:lineSpacingExtra="3sp"
-        android:text="|"
-        android:textColor="@color/CEBEBEB"
-        android:textSize="12sp"/>
-
-      <TextView
-        android:id="@+id/text_view_faq"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:lineSpacingExtra="3sp"
-        android:padding="10dp"
-        android:text="@string/faq"
-        android:textColor="@color/C999999"
-        android:textSize="12sp"/>
-
-    </LinearLayout>
+      android:lineSpacingExtra="3sp"
+      android:text="|"
+      android:textColor="@color/CEBEBEB"
+      android:textSize="12sp"/>
+
+    <TextView
+      android:id="@+id/text_view_faq"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="3sp"
+      android:padding="10dp"
+      android:text="@string/faq"
+      android:textColor="@color/C999999"
+      android:textSize="12sp"/>
 
   </LinearLayout>
-</LinearLayout>
+
+</android.support.constraint.ConstraintLayout>

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

@@ -11,7 +11,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="24dp"
-    android:layout_marginTop="23dp"
+    android:layout_marginTop="22dp"
     android:layout_marginBottom="9dp"
     android:lineSpacingExtra="6sp"
     android:textColor="@color/C000000"