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

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

@@ -14,6 +14,7 @@
 
     <android.support.design.widget.CollapsingToolbarLayout
       android:id="@+id/collapsing_tool_bar"
+      tools:background="@color/C999999"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@color/CFFFFFF"
@@ -22,7 +23,7 @@
       <android.support.v7.widget.Toolbar
         android:id="@+id/tool_bar"
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="35dp"
         android:background="@null"
         android:visibility="invisible"
         app:elevation="0dp"
@@ -37,7 +38,8 @@
         android:layout_height="match_parent"
         android:layout_marginStart="24dp"
         android:layout_marginTop="23dp"
-        android:layout_marginBottom="7dp"
+        android:paddingBottom="2dp"
+        android:layout_marginBottom="9dp"
         android:lineSpacingExtra="6sp"
         android:textColor="@color/C000000"
         android:textSize="14sp"

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

@@ -50,7 +50,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="18dp"
-      android:layout_marginBottom="18dp"
+      android:layout_marginBottom="20dp"
       android:lineSpacingExtra="5dp"
       android:textColor="@color/CFFFFFF"
       android:textSize="19sp"

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

@@ -11,7 +11,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="2dp"
-    android:layout_marginBottom="60dp"
+    android:layout_marginBottom="40dp"
     android:lineSpacingExtra="5dp"
     android:textColor="@color/C000000"
     android:textSize="21sp"