詹子聪 5 лет назад
Родитель
Сommit
12e11bc139

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

@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@color/white_bg">
 
     <include layout="@layout/view_toolbar" />
 

+ 1 - 1
app/src/main/res/layout/activity_json.xml

@@ -3,7 +3,7 @@
     android:id="@+id/ll_search"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white_default"
+    android:background="@color/white_navigation"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:fitsSystemWindows="true"

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

@@ -6,7 +6,8 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:focusable="true"
-    android:focusableInTouchMode="true">
+    android:focusableInTouchMode="true"
+    android:background="@color/white_bg">
     <!--启用深色模式之后,需要使用fitsSystemWindows来不让布局上滑-->
 
     <include layout="@layout/view_toolbar" />

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

@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:background="@color/white_bg">
     <include layout="@layout/view_toolbar"/>
 
     <ScrollView

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

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

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

@@ -7,7 +7,8 @@
     android:id="@+id/ll_search"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:background="@color/white_bg">
 
     <include layout="@layout/view_toolbar"/>
 
@@ -22,7 +23,7 @@
             android:layout_weight="1"
             android:layout_height="wrap_content"
             android:minHeight="@dimen/height_tab_bar"
-            android:background="@color/white_default"
+            android:background="@color/white_bg"
             android:singleLine="true"
             android:paddingStart="@dimen/margin_default"
             android:paddingEnd="@dimen/margin_default"

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

@@ -12,7 +12,8 @@
 
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/white_bg">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@color/white_bg">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/srl_template"

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

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@color/white_bg">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -4,7 +4,8 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:focusable="true"
-    android:focusableInTouchMode="true">
+    android:focusableInTouchMode="true"
+    android:background="@color/white_bg">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/srl_goods"

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

@@ -3,7 +3,8 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/white_bg">
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">

+ 4 - 4
app/src/main/res/values-v28/styles.xml

@@ -10,7 +10,7 @@
         <item name="colorAccent">@color/colorAccent</item>
 
         <!--导航栏颜色-->
-        <item name="android:navigationBarColor">@color/white_default</item>
+        <item name="android:navigationBarColor">@color/white_navigation</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
@@ -34,7 +34,7 @@
 
         <!--不需要动画-->
         <!--<item name="android:windowAnimationStyle">@null</item>-->
-        <item name="android:navigationBarColor">@color/white_default</item>
+        <item name="android:navigationBarColor">@color/white_navigation</item>
     </style>
 
 
@@ -77,7 +77,7 @@
         <!--<item name="android:windowLightStatusBar" tools:targetApi="23">true</item>-->
 
         <!--导航栏颜色-->
-        <item name="android:navigationBarColor">@color/white_default</item>
+        <item name="android:navigationBarColor">@color/white_navigation</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
@@ -97,7 +97,7 @@
 
         <!--<item name="android:windowAnimationStyle">@null</item>-->
         <!--导航栏颜色-->
-        <item name="android:navigationBarColor">@color/white_default</item>
+        <item name="android:navigationBarColor">@color/white_navigation</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>

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

@@ -27,7 +27,8 @@
     <color name="gray_divider_light">#d9d9d9</color>
     <color name="gray_divider_light_transparent">#80D9D9D9</color>
     <color name="gray_divider_light_s">#ebebeb</color>
-    <color name="white_default">#eeeeee</color>
+    <color name="white_navigation">#eeeeee</color>
+    <color name="white_bg">#fafafa</color>
     <!--<color name="gray_divider_light_ss">#f0f0f0</color>-->
     <color name="gray_loading">#26E0E0E0</color>
     <color name="gray_tab_unchecked">#717171</color>

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

@@ -9,7 +9,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
 
-        <item name="android:navigationBarColor">@color/white_default</item>
+        <item name="android:navigationBarColor">@color/white_navigation</item>
     </style>
 
     <style name="SplashTheme" parent="AppTheme">
@@ -31,7 +31,7 @@
 
         <!--不需要动画-->
         <!--<item name="android:windowAnimationStyle">@null</item>-->
-        <item name="android:navigationBarColor">@color/white_default</item>
+        <item name="android:navigationBarColor">@color/white_navigation</item>
     </style>
 
 
@@ -73,7 +73,7 @@
         <!--加了下面这句会导致状态栏文字颜色变黑色-->
         <!--<item name="android:windowLightStatusBar" tools:targetApi="23">true</item>-->
 
-        <item name="android:navigationBarColor">@color/white_default</item>
+        <item name="android:navigationBarColor">@color/white_navigation</item>
     </style>
 
 
@@ -91,7 +91,7 @@
 
         <!--<item name="android:windowAnimationStyle">@null</item>-->
 
-        <item name="android:navigationBarColor">@color/white_default</item>
+        <item name="android:navigationBarColor">@color/white_navigation</item>
     </style>
 
     <style name="AppTheme.MeizhiDetail" parent="Theme.AppCompat.Light.NoActionBar">