From a77dcb0250488ca6567490ed9fb5ce969bf41db7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 29 五月 2024 14:55:03 +0800
Subject: [PATCH] Merge branch 'wjc_new' into feature/hxb
---
app/src/main/res/values/styles.xml | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4fac929..cfda390 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,8 +4,37 @@
<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_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_E6000000</item>
+
+ </style>
+ <!-- 鑷畾涔夊瓧浣撴牱寮� -->
+ <style name="Text14Style">
+ <item name="android:textSize">@dimen/text_14</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