UI优化

app/src/main/java/com/itant/shibei/common/ConstantString.java

@@ -11,5 +11,5 @@ public interface ConstantString {
     String MONEY_RMB = "¥%s";
     String SALES_PER_MONTH = "月销 %s";
     String GOOD_COMMENT = "%s%%";
-    String MONEY_GAME = "%sG";
+    String MONEY_GAME = "%s币";
 }

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

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:fitsSystemWindows="true"
-    android:background="@color/white_slight"
+    android:background="@color/white"
     android:paddingBottom="@dimen/margin_default">
     <!--启用深色模式之后，需要使用fitsSystemWindows来不让布局上滑-->
 

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white_slight"
+    android:background="@color/white"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:focusable="true"

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white_slight"
+    android:background="@color/white"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:focusable="true"

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

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

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white_slight"
+    android:background="@color/white"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:focusable="true"

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

@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:background="@color/colorPrimary">
+        android:background="@color/white">
 
         <RelativeLayout
             android:layout_width="@dimen/height_edit_text"
@@ -72,6 +72,6 @@
         android:overScrollMode="never"
         android:id="@+id/vp_home"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
 </LinearLayout>

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

@@ -4,7 +4,8 @@
     android:layout_height="match_parent"
     android:fillViewport="true"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@color/white">
 
 
     <LinearLayout
@@ -236,7 +237,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"/>
 
-    <include layout="@layout/view_divider_common" />
+    <include layout="@layout/view_divider" />
 
     <!--TODO 隐私政策、用户协议-->
     <TextView

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

@@ -8,9 +8,9 @@
         android:id="@+id/cv_goods"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_ss"
+        android:layout_marginStart="@dimen/margin_s"
         android:layout_marginTop="@dimen/margin_ss"
-        android:layout_marginEnd="@dimen/margin_ss"
+        android:layout_marginEnd="@dimen/margin_s"
         android:clickable="true"
         android:focusable="true"
         android:foreground="?android:attr/selectableItemBackground"
@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal"
-            android:padding="@dimen/margin_ss">
+            android:padding="@dimen/margin_s">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/aciv_goods"
@@ -37,7 +37,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/margin_ss"
+                android:layout_marginStart="@dimen/margin_s"
                 android:minHeight="@dimen/size_image_list"
                 android:orientation="vertical">
                 <!--标题-->

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

@@ -3,4 +3,4 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="1px"
-    android:background="@color/gray_divider_2" />
+    android:background="@color/gray_status_bar" />

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

@@ -11,7 +11,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="@dimen/height_tool_bar"
-            android:background="@color/colorPrimary"
+            android:background="@color/white"
             app:titleTextAppearance="@style/Toolbar.TitleText"/>
         <include layout="@layout/view_divider_common" />
 

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

@@ -13,6 +13,7 @@
     <color name="gray_divider_2">#adadad</color>
     <color name="gray_disabled">#4DFFFFFF</color>
     <color name="gray_text">#222222</color>
+    <color name="gray_bg_default">#F3F3F3</color>
     <!-- 内容文字,正文 -->
     <color name="gray_text_s">#777777</color>
     <!-- 辅助文字,提示 -->