詹子聪 6 лет назад
Родитель
Сommit
551e9b6b1f

+ 0 - 1
app/src/main/res/layout/activity_coupon_add.xml

@@ -3,7 +3,6 @@
     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"
     android:focusable="true"
     android:focusableInTouchMode="true"

+ 0 - 1
app/src/main/res/layout/activity_fill_data.xml

@@ -3,7 +3,6 @@
     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"
     android:focusable="true"
     android:focusableInTouchMode="true"

+ 0 - 1
app/src/main/res/layout/activity_forget.xml

@@ -3,7 +3,6 @@
     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"
     android:focusable="true"
     android:focusableInTouchMode="true"

+ 0 - 1
app/src/main/res/layout/activity_goods_add.xml

@@ -3,7 +3,6 @@
     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"
     android:focusable="true"
     android:focusableInTouchMode="true"

+ 0 - 1
app/src/main/res/layout/activity_login.xml

@@ -3,7 +3,6 @@
     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"
     android:orientation="vertical"
     android:focusable="true"

+ 0 - 2
app/src/main/res/layout/activity_main.xml

@@ -4,7 +4,6 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
     <!--移除以下属性以防止与顶部存在间隙
@@ -34,7 +33,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="0dp"
         android:layout_marginEnd="0dp"
-        android:background="@color/colorPrimary"
         app:itemRippleColor="?attr/selectableItemBackground"
         app:itemTextColor="@color/selector_nav_item_color"
         app:itemIconTint="@color/selector_nav_item_color"

+ 1 - 2
app/src/main/res/layout/activity_mine.xml

@@ -136,8 +136,7 @@
     <View
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@color/colorPrimary"/>
+        android:layout_weight="1"/>
 
     <android.widget.Button
         android:id="@+id/btn_exit_login"

+ 0 - 1
app/src/main/res/layout/activity_register.xml

@@ -3,7 +3,6 @@
     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"
     android:focusable="true"
     android:focusableInTouchMode="true"

+ 1 - 2
app/src/main/res/layout/activity_search.xml

@@ -7,8 +7,7 @@
     android:id="@+id/ll_search"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:fitsSystemWindows="true"
-    android:background="@color/colorPrimary">
+    android:fitsSystemWindows="true">
 
     <include layout="@layout/view_toolbar"/>
 

+ 12 - 11
app/src/main/res/layout/activity_tab.xml

@@ -9,8 +9,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/abl_main"
-        android:background="@color/white">
+        android:background="@color/colorPrimary"
+        app:elevation="0dp">
         <!--android:theme="@style/AppTheme.AppBarOverlay"-->
+        <!--app:elevation="0dp"去除底边阴影,注意不能用android:elevation-->
 
         <!--android:minHeight="?actionBarSize"水波纹居中和gravity属性有关-->
         <LinearLayout
@@ -35,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:text="拾贝 · 精选"
                 android:textStyle="bold"
-                android:textColor="@color/black_theme"
+                android:textColor="@color/white"
                 android:textSize="@dimen/size_hello" />
 
             <Space
@@ -58,7 +60,7 @@
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
                         android:src="@drawable/ic_search"
-                        android:tint="@color/black_theme" />
+                        android:tint="@color/white" />
                 </RelativeLayout>
 
                 <!--由于作为ViewOverlay的View不再触发点击事件,就用一个影子View来代替-->
@@ -78,7 +80,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:src="@drawable/ic_search"
-                            android:tint="@color/black_theme"/>
+                            android:tint="@color/white"/>
                     </FrameLayout>
 
                 </RelativeLayout>
@@ -99,7 +101,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:src="@drawable/ic_more_vert"
-                        android:tint="@color/black_theme"/>
+                        android:tint="@color/white"/>
                 </FrameLayout>
             </RelativeLayout>
         </LinearLayout>
@@ -108,8 +110,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:gravity="center_vertical"
-            android:background="@color/white">
+            android:gravity="center_vertical">
 
             <com.flyco.tablayout.SlidingTabLayout
                 android:id="@+id/stl_home"
@@ -119,13 +120,13 @@
                 android:layout_gravity="center_horizontal"
                 app:tl_iconVisible="false"
                 app:tl_indicator_bounce_enable="false"
-                app:tl_indicator_color="@color/black_theme"
+                app:tl_indicator_color="@color/white"
                 app:tl_indicator_height="2.5dp"
                 app:tl_indicator_width="10dp"
                 app:tl_tab_width="44dp"
                 app:tl_textBold="NONE"
-                app:tl_textSelectColor="@color/black"
-                app:tl_textUnselectColor="@color/colorTextSecondary"
+                app:tl_textSelectColor="@color/white"
+                app:tl_textUnselectColor="@color/white_status_bar"
                 app:tl_textsize="@dimen/size_title_s"
                 app:tl_indicator_margin_bottom="@dimen/margin_s"
                 android:layout_marginStart="@dimen/margin_s"
@@ -149,7 +150,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:src="@drawable/ic_search"
-                        android:tint="@color/black_theme"/>
+                        android:tint="@color/white"/>
                 </FrameLayout>
                 <!--无边界波纹-->
 

+ 0 - 1
app/src/main/res/layout/backup_activity_register.xml

@@ -3,7 +3,6 @@
     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"
     android:orientation="vertical"
     android:focusable="true"

+ 0 - 1
app/src/main/res/layout/fragment_function.xml

@@ -3,7 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/colorPrimary"
     android:orientation="vertical">
 
     <com.flyco.tablayout.SlidingTabLayout

+ 1 - 2
app/src/main/res/layout/fragment_home.xml

@@ -8,8 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:background="@color/colorPrimary">
+        android:gravity="center_vertical">
 
         <RelativeLayout
             android:layout_width="@dimen/height_edit_text"

+ 0 - 1
app/src/main/res/layout/view_search.xml

@@ -4,7 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     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"

+ 3 - 2
app/src/main/res/values/colors.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#fafafa</color>
-    <color name="colorPrimaryDark">#fafafa</color>
+    <color name="colorPrimary">@color/green_logo</color>
+    <color name="colorPrimaryDark">@color/green_logo</color>
+    <color name="white_status_bar">#fafafa</color>
     <color name="colorAccent">@color/green_logo</color>
 
     <color name="gray">#ededed</color>

+ 2 - 2
app/src/main/res/values/styles.xml

@@ -12,8 +12,8 @@
         <item name="windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
 
-        <item name="android:statusBarColor">@color/gray_status_bar</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
+        <!--<item name="android:statusBarColor">@color/gray_status_bar</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>-->