|
|
@@ -3,13 +3,13 @@
|
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
- android:background="@color/colorPrimary"
|
|
|
android:fitsSystemWindows="true">
|
|
|
|
|
|
<com.google.android.material.appbar.AppBarLayout
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:id="@+id/abl_main">
|
|
|
+ android:id="@+id/abl_main"
|
|
|
+ android:background="@color/white">
|
|
|
<!--android:theme="@style/AppTheme.AppBarOverlay"-->
|
|
|
|
|
|
<!--android:minHeight="?actionBarSize"水波纹居中和gravity属性有关-->
|
|
|
@@ -19,8 +19,8 @@
|
|
|
android:paddingStart="@dimen/margin_default"
|
|
|
android:orientation="horizontal"
|
|
|
app:layout_scrollFlags="scroll|enterAlways|snap"
|
|
|
- android:gravity="center_vertical"
|
|
|
- android:paddingTop="@dimen/margin_default">
|
|
|
+ android:paddingTop="@dimen/margin_default"
|
|
|
+ android:gravity="center_vertical">
|
|
|
<ImageView
|
|
|
android:layout_width="@dimen/size_icon_big"
|
|
|
android:layout_height="@dimen/size_icon_big"
|
|
|
@@ -33,19 +33,17 @@
|
|
|
android:id="@+id/title"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:gravity="center"
|
|
|
- android:text="拾贝 · 让您购物少花费"
|
|
|
+ android:text="拾贝 · 安心购物少花费"
|
|
|
android:textStyle="bold"
|
|
|
- android:layout_gravity="center_vertical"
|
|
|
android:textColor="@color/black_theme"
|
|
|
- android:textSize="@dimen/size_title" />
|
|
|
+ android:textSize="@dimen/size_hello" />
|
|
|
|
|
|
<Space
|
|
|
android:layout_width="0dp"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_weight="1"/>
|
|
|
|
|
|
-
|
|
|
+ <!--上方搜索-->
|
|
|
<FrameLayout
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content">
|
|
|
@@ -86,10 +84,10 @@
|
|
|
</RelativeLayout>
|
|
|
</FrameLayout>
|
|
|
|
|
|
+ <!--更多-->
|
|
|
<RelativeLayout
|
|
|
android:layout_width="@dimen/height_edit_text"
|
|
|
android:layout_height="@dimen/height_sliding_tab">
|
|
|
- <!--无边界波纹-->
|
|
|
<FrameLayout
|
|
|
android:id="@+id/fl_more"
|
|
|
android:layout_width="wrap_content"
|
|
|
@@ -111,7 +109,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:orientation="horizontal"
|
|
|
android:gravity="center_vertical"
|
|
|
- android:background="@color/colorPrimary">
|
|
|
+ android:background="@color/white">
|
|
|
|
|
|
<com.flyco.tablayout.SlidingTabLayout
|
|
|
android:id="@+id/stl_home"
|
|
|
@@ -121,8 +119,8 @@
|
|
|
android:layout_gravity="center_horizontal"
|
|
|
app:tl_iconVisible="false"
|
|
|
app:tl_indicator_bounce_enable="false"
|
|
|
- app:tl_indicator_color="@color/black"
|
|
|
- app:tl_indicator_height="3dp"
|
|
|
+ app:tl_indicator_color="@color/black_theme"
|
|
|
+ app:tl_indicator_height="2.5dp"
|
|
|
app:tl_indicator_width="10dp"
|
|
|
app:tl_tab_width="44dp"
|
|
|
app:tl_textBold="NONE"
|
|
|
@@ -133,6 +131,7 @@
|
|
|
android:layout_marginStart="@dimen/margin_s"
|
|
|
android:layout_marginEnd="@dimen/margin_default"/>
|
|
|
|
|
|
+ <!--搜索-->
|
|
|
<RelativeLayout
|
|
|
android:id="@+id/rl_search"
|
|
|
android:layout_width="@dimen/height_edit_text"
|