From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/res/values/styles.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7fe8ad5..cfda390 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,21 +12,29 @@
<style name="Text20Style">
<item name="android:textSize">@dimen/text_20</item>
<item name="android:textStyle">bold</item>
- <item name="android:textColor">@color/text_90000000</item>
+ <item name="android:textColor">@color/text_E6000000</item>
+ <!-- <item name="android:fontFamily"></item>-->
</style>
<!-- 鑷畾涔夊瓧浣撴牱寮� 鍐呭涓�绾ф爣棰�-->
<style name="Text21Style">
<item name="android:textSize">@dimen/text_21</item>
<item name="android:textStyle">bold</item>
- <item name="android:textColor">@color/text_90000000</item>
+ <item name="android:textColor">@color/text_E6000000</item>
</style>
<!-- 鑷畾涔夊瓧浣撴牱寮� -->
<style name="Text14Style">
<item name="android:textSize">@dimen/text_14</item>
- <item name="android:textColor">@color/text_40000000</item>
+ <item name="android:textColor">@color/text_66000000</item>
</style>
+ <!-- 鑷畾涔夊瓧浣撴牱寮� -->
+ <style name="Text16Style">
+ <item name="android:textSize">@dimen/text_16</item>
+ <item name="android:textColor">@color/text_66000000</item>
+ </style>
+
+
</resources>
\ No newline at end of file
--
Gitblit v1.8.0