|
|
@@ -1,45 +1,42 @@
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
<!--搜索栏-->
|
|
|
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
- xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
|
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:background="@color/colorPrimary"
|
|
|
- android:paddingStart="@dimen/margin_s"
|
|
|
- android:paddingTop="@dimen/margin_ss"
|
|
|
- android:paddingEnd="@dimen/margin_s"
|
|
|
- android:paddingBottom="@dimen/margin_ss">
|
|
|
+ android:orientation="vertical">
|
|
|
|
|
|
- <androidx.cardview.widget.CardView
|
|
|
- app:cardCornerRadius="@dimen/height_indicator"
|
|
|
- app:cardElevation="@dimen/margin_sss"
|
|
|
- app:cardUseCompatPadding="true"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:clickable="true"
|
|
|
- android:focusable="true"
|
|
|
- android:foreground="?android:attr/selectableItemBackground">
|
|
|
+ <include layout="@layout/view_toolbar"/>
|
|
|
|
|
|
- <LinearLayout
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="@dimen/height_edit_text"
|
|
|
- android:gravity="center_vertical"
|
|
|
- android:paddingStart="@dimen/margin_s"
|
|
|
- android:paddingEnd="@dimen/margin_s">
|
|
|
|
|
|
- <TextView
|
|
|
- android:layout_width="0dp"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_weight="1"
|
|
|
- android:text="搜索商品"
|
|
|
- android:textColor="@color/gray_hint"
|
|
|
- android:textSize="@dimen/text_normal_p" />
|
|
|
+ <EditText
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:minHeight="@dimen/height_tab_bar"
|
|
|
+ android:background="@null"
|
|
|
+ android:maxLines="1"
|
|
|
+ android:paddingStart="@dimen/margin_s"
|
|
|
+ android:paddingEnd="@dimen/margin_s"
|
|
|
+ android:paddingTop="@dimen/margin_ss"
|
|
|
+ android:paddingBottom="@dimen/margin_ss"
|
|
|
+ android:textSize="@dimen/text_normal_p"
|
|
|
+ android:hint="请输入关键字或链接"
|
|
|
+ android:textColor="@color/black_text_comfortable"
|
|
|
+ android:textColorHint="@color/gray_text_hint"/>
|
|
|
+ <include layout="@layout/view_divider_common"/>
|
|
|
|
|
|
- <ImageView
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:src="@drawable/ic_search"
|
|
|
- android:tint="@color/gray_text_2" />
|
|
|
- </LinearLayout>
|
|
|
- </androidx.cardview.widget.CardView>
|
|
|
-</FrameLayout>
|
|
|
+ <android.widget.Button
|
|
|
+ android:id="@+id/btn_search"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:minHeight="0dp"
|
|
|
+ android:layout_marginTop="@dimen/margin_default"
|
|
|
+ android:layout_marginStart="@dimen/margin_default"
|
|
|
+ android:layout_marginEnd="@dimen/margin_default"
|
|
|
+ android:paddingTop="@dimen/padding_full_width"
|
|
|
+ android:paddingBottom="@dimen/padding_full_width"
|
|
|
+ android:text="立即搜索"
|
|
|
+ android:textColor="@color/white"
|
|
|
+ android:textStyle="bold"
|
|
|
+ android:background="@drawable/selector_btn"
|
|
|
+ style="?android:attr/borderlessButtonStyle"/>
|
|
|
+</LinearLayout>
|