From cf69813227bb25b398da457d0113b2bb52acb313 Mon Sep 17 00:00:00 2001
From: chenglifeng <clf_cheng@163.com>
Date: Fri, 11 Oct 2024 16:15:35 +0800
Subject: [PATCH] update color.xml

---
 app/src/main/res/layout/fragment_home.xml       | 8 ++++----
 app/src/main/res/layout/fragment_instrument.xml | 6 +++---
 app/src/main/res/layout/widget_section_item.xml | 4 ++--
 app/src/main/res/values/color.xml               | 6 +++---
 app/src/main/res/values/dimens.xml              | 8 --------
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index a164706..7d2426d 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/sw_20dp"
         android:layout_marginTop="@dimen/sw_20dp"
-        android:textColor="@color/text_color_fff"
+        android:textColor="@color/text_color_ff"
         android:textSize="@dimen/sw_20sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
@@ -43,7 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/beidou_application"
-            android:textColor="@color/text_color_main"
+            android:textColor="@color/text_color_33"
             android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
@@ -101,7 +101,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/process_approval"
-            android:textColor="@color/text_color_main"
+            android:textColor="@color/text_color_33"
             android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
@@ -161,7 +161,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/engineering_control_network"
-            android:textColor="@color/text_color_main"
+            android:textColor="@color/text_color_33"
             android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_instrument.xml b/app/src/main/res/layout/fragment_instrument.xml
index 83b02a1..b5ce24a 100644
--- a/app/src/main/res/layout/fragment_instrument.xml
+++ b/app/src/main/res/layout/fragment_instrument.xml
@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/sw_20dp"
         android:layout_marginTop="@dimen/sw_20dp"
-        android:textColor="@color/text_color_fff"
+        android:textColor="@color/text_color_ff"
         android:textSize="@dimen/sw_20sp"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
@@ -43,7 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/instrument_online"
-            android:textColor="@color/text_color_main"
+            android:textColor="@color/text_color_33"
             android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
@@ -102,7 +102,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/job_settings"
-            android:textColor="@color/text_color_main"
+            android:textColor="@color/text_color_33"
             android:textSize="@dimen/sw_14sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/widget_section_item.xml b/app/src/main/res/layout/widget_section_item.xml
index 77a7604..7aa7f9a 100644
--- a/app/src/main/res/layout/widget_section_item.xml
+++ b/app/src/main/res/layout/widget_section_item.xml
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/bg_badge"
         android:gravity="center"
-        android:textColor="@color/text_color_fff"
+        android:textColor="@color/text_color_ff"
         android:textSize="@dimen/sw_9sp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="@id/ivIcon"
@@ -34,7 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/sw_9dp"
-        android:textColor="@color/text_color_main"
+        android:textColor="@color/text_color_33"
         android:textSize="@dimen/sw_13sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index be563f0..b191eed 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -17,10 +17,10 @@
     <color name="c_10000000">#10000000</color>
     <color name="item_bg">#e5e5e5</color>
 
-    <color name="text_color_tab_selected">#396BD0</color>
+    <color name="text_color_tab_selected">@color/colorPrimary</color>
     <color name="text_color_tab_unselected">#5B5A5E</color>
-    <color name="text_color_main">#333333</color>
-    <color name="text_color_fff">#FFFFFF</color>
+    <color name="text_color_33">#333333</color>
+    <color name="text_color_ff">#FFFFFF</color>
     <color name="text_color_20">#202020</color>
     <color name="text_color_CC5155">#CC5155</color>
     <color name="text_color_396bd0">#396BD0</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 75595e3..2fce38a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <resources>
-    <dimen name="margin_side">20dp</dimen>
-    <dimen name="padding_side">20dp</dimen>
-
-    <dimen name="text_size_section_title">14sp</dimen>
-    <dimen name="text_size_section_item">13sp</dimen>
-
-
     <dimen name="_sw_1080dp">-1559.52dp</dimen>
     <dimen name="_sw_1079dp">-1558.08dp</dimen>
     <dimen name="_sw_1078dp">-1556.63dp</dimen>