From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/res/values/themes.xml | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6ab59aa..a0574bc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,4 +13,31 @@
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
</style>
+
+ <style name="Theme.app" parent="Theme.AppCompat.DayNight.NoActionBar">
+ <!-- 绐楀彛鑳屾櫙棰滆壊 -->
+ <item name="android:windowBackground">@color/windowBackground</item>
+ <!-- 搴旂敤鐨勪富瑕佽壊璋冿紝ActionBar Toolbar 榛樿浣跨敤璇ラ鑹� -->
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <!-- 搴旂敤鐨勪富瑕佹殫鑹茶皟锛岀姸鎬佹爮榛樿浣跨敤璇ラ鑹� -->
+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+ <!-- 搴旂敤鐨勫己璋冭壊锛孋heckBox RadioButton Switch 绛変竴鑸帶浠剁殑閫変腑鏁堟灉榛樿閲囩敤璇ラ鑹� -->
+ <item name="colorAccent">@color/colorAccent</item>
+ <!-- 榛樿鏂囨湰棰滆壊锛孊utton銆乀extView 鐨勬枃瀛楅鑹�-->
+<!-- <item name="android:textColor">@color/textColor</item>-->
+ <!-- 榛樿鎻愮ず棰滆壊锛孊utton銆乀extView 鐨勬彁绀烘枃瀛楅鑹� -->
+<!-- <item name="android:textColorHint">@color/textColorHint</item>-->
+ <!-- ActionMode 瑕嗙洊 Actionbar 涓嶈椤朵笅鏉� -->
+ <item name="windowActionModeOverlay">true</item>
+ <item name="android:windowContentOverlay">@null</item>
+ <!-- ActionMode 鐨勯鑹� -->
+ <item name="actionModeBackground">@color/colorPrimary</item>
+ <!-- 瑙ｅ喅 Android 5.1 鍙婁互涓婄増鏈� Button 鑻辨枃瀛楃涓茶嚜鍔ㄥ彉澶у啓鐨勯棶棰� -->
+ <item name="android:textAllCaps">false</item>
+ <!-- 榛樿闅愯棌杈撳叆娉曪紝寮�鍚繖涓�夐」鍚庝細瀵艰嚧杈撳叆瀵硅瘽妗嗗湪鍏抽棴涔嬪悗涓嶈兘鍏抽棴杞敭鐩� -->
+ <!--<item name="android:windowSoftInputMode">stateHidden</item>-->
+ <!-- 鍏抽棴 RecyclerView ScrollView ViewPager 姘存尝绾规晥鏋� -->
+ <item name="android:overScrollMode">never</item>
+
+ </style>
</resources>
\ No newline at end of file
--
Gitblit v1.9.1