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

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

@@ -9,7 +9,7 @@
   <ImageView
     android:id="@+id/image_view_main_first_category"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:scaleType="centerCrop"
     app:srcCompat="@drawable/img_bestbucket_1"/>
 

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

@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content">
+  android:layout_height="93dp">
 
   <TextView
     android:id="@+id/text_view_main_fourth_category_title1"
@@ -25,7 +25,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="5dp"
     android:lineSpacingExtra="6sp"
-    android:maxLines="2"
+    android:maxLines="1"
     android:textColor="@color/C000000"
     android:textSize="14sp"
     android:ellipsize="end"
@@ -53,7 +53,7 @@
   <ImageView
     android:id="@+id/image_view_main_fourth_category"
     android:layout_width="124dp"
-    android:layout_height="93dp"
+    android:layout_height="match_parent"
     android:scaleType="fitXY"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toEndOf="@+id/text_view_main_fourth_category_title2"