Merge remote-tracking branch 'origin/master'

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

@@ -51,7 +51,7 @@
                 <TextView
                     android:id="@+id/tv_keyword"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/all_seach_height"
                     android:layout_marginEnd="@dimen/all_spacing"
                     android:layout_weight="1"
                     android:background="@drawable/shape_gray_r1"
@@ -64,7 +64,7 @@
                     android:maxLength="20"
                     android:maxLines="1"
                     android:onClick="@{OnClickListener}"
-                    android:padding="@dimen/all_spacing"
+                    android:paddingLeft="@dimen/all_padding"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
                     android:textSize="@dimen/all_text_size"/>

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

@@ -58,7 +58,7 @@
                 <TextView
                     android:id="@+id/tv_keyword"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/all_seach_height"
                     android:layout_marginEnd="@dimen/all_spacing"
                     android:layout_weight="1"
                     android:background="@drawable/shape_gray_r1"
@@ -71,7 +71,7 @@
                     android:maxLength="20"
                     android:maxLines="1"
                     android:onClick="@{OnClickListener}"
-                    android:padding="@dimen/all_spacing"
+                    android:paddingLeft="@dimen/all_padding"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
                     android:textSize="@dimen/all_text_size"/>

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

@@ -50,7 +50,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/all_margin"
-                android:gravity="center"
+                android:gravity="center|left"
                 app:layout_constraintBottom_toTopOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_back"
                 app:layout_constraintRight_toRightOf="parent"
@@ -58,16 +58,21 @@
 
                 <EditText
                     android:id="@+id/et_keyword"
-                    style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/all_seach_height"
                     android:layout_marginEnd="@dimen/all_spacing"
                     android:layout_weight="1"
+                    android:background="@drawable/shape_gray_r1"
+                    android:clickable="true"
+                    android:drawableLeft="@mipmap/ic_search"
+                    android:drawablePadding="@dimen/all_spacing"
+                    android:enabled="true"
+                    android:gravity="center|left"
                     android:hint="@string/store_search_hint"
-                    android:imeOptions="actionSearch"
-                    android:inputType="text"
-                    android:labelFor="@+id/et_search"
-                    android:saveEnabled="false"
+                    android:maxLength="20"
+                    android:maxLines="1"
+                    android:onClick="@{OnClickListener}"
+                    android:paddingLeft="@dimen/all_padding"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
                     android:textSize="@dimen/all_text_size"/>

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

@@ -58,7 +58,7 @@
                     android:id="@+id/et_keyword"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/all_seach_height"
                     android:layout_marginEnd="@dimen/all_spacing"
                     android:layout_weight="1"
                     android:focusable="true"

app/src/main/res/values/dimens.xml

@@ -23,6 +23,7 @@
     <dimen name="all_tiny_size">9sp</dimen>
     <dimen name="all_title_size">26sp</dimen>
     <dimen name="all_padding">10dp</dimen>
+    <dimen name="all_seach_height">36dp</dimen>
     <dimen name="all_padding_left_right">16dp</dimen>
     <dimen name="Minus_padding_left_right">-17dp</dimen>
     <dimen name="all_text_size_big">22sp</dimen>