From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'

---
 app/src/main/res/values/styles.xml |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3eab926..673f19f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,4 +4,52 @@
         <item name="android:background">@color/black_overlay</item>
         <item name="android:buttonBarStyle">?android:attr/buttonBarStyle</item>
     </style>
+
+    <style name="NoAnimationTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+    <!-- 鑷畾涔夊瓧浣撴牱寮� 椤甸潰涓�绾ф爣棰�-->
+    <style name="Text20Style">
+        <item name="android:textSize">@dimen/text_20</item>
+        <item name="android:textStyle">bold</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_FFACACAC</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_E6000000</item>
+
+    </style>
+    <!-- 鑷畾涔夊瓧浣撴牱寮� -->
+    <style name="Text14Style">
+        <item name="android:textSize">@dimen/text_14</item>
+        <item name="android:textColor">@color/text_FF5B5B5B</item>
+    </style>
+
+    <style name="Text12Style">
+        <item name="android:textSize">@dimen/text_12</item>
+        <item name="android:textColor">@color/text_FF5B5B5B</item>
+    </style>
+    <style name="Text13Style">
+        <item name="android:textSize">@dimen/text_13</item>
+        <item name="android:textColor">@color/text_FF5B5B5B</item>
+    </style>
+    <!-- 鑷畾涔夊瓧浣撴牱寮� -->
+    <style name="Text16Style">
+        <item name="android:textSize">@dimen/text_16</item>
+        <item name="android:textColor">@color/text_66000000</item>
+        <item name="android:textStyle">normal</item>
+    </style>
+
+
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0