From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/values/styles.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ee589d7..3c8c847 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,7 +12,14 @@
<style name="Text20Style">
<item name="android:textSize">@dimen/text_20</item>
<item name="android:textStyle">bold</item>
- <item name="android:textColor">@color/text_E6000000</item>
+ <item name="android:textColor">@color/text_FFFFFFFF</item>
+ <!-- <item name="android:fontFamily"></item>-->
+ </style>
+
+ <!-- 鑷畾涔夊瓧浣撴牱寮� 椤甸潰涓�绾ф爣棰�-->
+ <style name="Text18Style">
+ <item name="android:textSize">@dimen/text_18</item>
+ <item name="android:textColor">@color/text_E6FFFFFF</item>
<!-- <item name="android:fontFamily"></item>-->
</style>
@@ -26,7 +33,16 @@
<!-- 鑷畾涔夊瓧浣撴牱寮� -->
<style name="Text14Style">
<item name="android:textSize">@dimen/text_14</item>
- <item name="android:textColor">@color/text_66000000</item>
+ <item name="android:textColor">@color/text_66FFFFFF</item>
+ </style>
+
+ <style name="Text12Style">
+ <item name="android:textSize">@dimen/text_12</item>
+ <item name="android:textColor">@color/text_66FFFFFF</item>
+ </style>
+ <style name="Text13Style">
+ <item name="android:textSize">@dimen/text_13</item>
+ <item name="android:textColor">@color/text_66FFFFFF</item>
</style>
<!-- 鑷畾涔夊瓧浣撴牱寮� -->
<style name="Text16Style">
--
Gitblit v1.8.0