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

# Conflicts:
#	app/src/main/res/layout/main_banner_view_item_is_dim.xml

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

@@ -22,32 +22,24 @@
     android:background="@drawable/rectangle_dim_black_50"
     />
 
-  <android.support.constraint.ConstraintLayout
-    android:id="@+id/layout_flag"
-    android:layout_width="40dp"
+  <TextView
+    android:id="@+id/text_flag"
+    android:layout_width="wrap_content"
     android:layout_height="16dp"
     android:layout_marginStart="6dp"
     android:layout_marginTop="6dp"
+    android:layout_marginEnd="6dp"
+    android:alpha="0"
     android:background="@color/CFF0053"
-    android:visibility="gone"
+    android:gravity="center"
+    android:minWidth="38dp"
+    android:textColor="@color/CFFFFFF"
+    android:textSize="9dp"
+    android:textStyle="bold"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
-    tools:visibility="visible">
-
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/benefit_en"
-      android:textColor="@color/CFFFFFF"
-      android:textSize="9sp"
-      android:textStyle="bold"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      />
-
-  </android.support.constraint.ConstraintLayout>
+    tools:alpha="1"
+    tools:text="Get"/>
 
   <TextView
     android:id="@+id/text_view_banner_item"

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

@@ -21,12 +21,12 @@
   <TextView
     android:id="@+id/text_flag"
     android:layout_width="wrap_content"
-    android:layout_height="38dp"
+    android:layout_height="35dp"
     android:layout_marginStart="12dp"
     android:alpha="0"
     android:background="@color/CFF0053"
     android:gravity="center"
-    android:minWidth="38dp"
+    android:minWidth="35dp"
     android:padding="5dp"
     android:textColor="@color/CFFFFFF"
     android:textSize="9dp"

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

@@ -19,12 +19,12 @@
   <TextView
     android:id="@+id/text_flag"
     android:layout_width="wrap_content"
-    android:layout_height="38dp"
+    android:layout_height="35dp"
     android:layout_marginStart="12dp"
     android:alpha="0"
     android:background="@color/CFF0053"
     android:gravity="center"
-    android:minWidth="38dp"
+    android:minWidth="35dp"
     android:padding="5dp"
     android:textColor="@color/CFFFFFF"
     android:textSize="9dp"

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

@@ -20,12 +20,12 @@
   <TextView
     android:id="@+id/text_flag"
     android:layout_width="wrap_content"
-    android:layout_height="38dp"
+    android:layout_height="35dp"
     android:layout_marginStart="12dp"
     android:alpha="0"
     android:background="@color/CFF0053"
     android:gravity="center"
-    android:minWidth="38dp"
+    android:minWidth="35dp"
     android:padding="5dp"
     android:textColor="@color/CFFFFFF"
     android:textSize="9dp"