From a1c880c476327032fe174af8c80d6f78a590dae9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:35:22 +0800
Subject: [PATCH] Merge branch '1.5.1' into dev
---
app/src/main/res/values/themes.xml | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6690e19..2ca9755 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,7 +14,7 @@
<!-- Customize your theme here. app鍚姩鍥剧墖卢-->
<item name="android:windowBackground">@color/text_00000000</item>
<item name="android:windowTranslucentNavigation">false</item>
- <item name="android:navigationBarColor">@color/text_FF161616</item>
+ <item name="android:navigationBarColor">@color/text_FF000000</item>
<!-- <item name="android:windowNoTitle">true</item>-->
<!-- <item name="android:windowFullscreen">true</item>-->
</style>
@@ -36,6 +36,11 @@
<item name="fullscreenTextColor">@color/light_blue_A200</item>
</style>
+ <style name="DefaultFilteringDialog" parent="Custom_Dialog">
+ <!--鏄惁娴幇鍦╝ctivity涔嬩笂-->
+ <item name="android:windowIsFloating">true</item>
+ </style>
+
<style name="Custom_Dialog">
<!--鑳屾櫙棰滆壊鍙婂拰閫忔槑绋嬪害-->
<item name="android:windowBackground">#00000000</item>
@@ -51,7 +56,6 @@
<item name="android:windowIsFloating">false</item>
<!--鏄剧ず閫氱煡鏍�-->
<item name="android:windowActionBar">false</item>
- <!-- <item name="android:windowFullscreen">true</item>-->
<!-- <item name="android:windowIsTranslucent">false</item>:鏄惁鍗婇�忔槑-->
<!-- <item name="android:windowNoTitle">true</item>:鏄惁鏄剧ずtitle-->
@@ -59,8 +63,8 @@
</style>
<style name="Custom_List_Dialog" parent="Custom_Dialog">
- <!--鑳屾櫙閫忔槑搴� 鎸囩晫闈㈤�忔槑搴�-->
-
+ <!--鑳屾櫙閫忔槑搴� 鎸囩晫闈㈤�忔槑搴� 0.6-->
+ <item name="android:backgroundDimAmount">0</item>
</style>
<style name="DCloudMPHostActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
@@ -77,4 +81,21 @@
<item name="android:windowFullscreen">true</item>
</style>
+ <style name="video_dialog" parent="@android:style/Theme.Dialog">
+ <!-- 鑳屾櫙棰滆壊鍙婂拰閫忔槑绋嬪害 -->
+ <item name="android:windowBackground">@color/transparent</item>
+ <!-- 鏄惁鍘婚櫎鏍囬 -->
+ <item name="android:windowNoTitle">true</item>
+ <!-- 鏄惁鍘婚櫎杈规 -->
+ <item name="android:windowFrame">@null</item>
+ <!-- 鏄惁娴幇鍦╝ctivity涔嬩笂 -->
+ <item name="android:windowIsFloating">true</item>
+ <item name="android:windowIsTranslucent">true</item>
+ <!-- 鏄惁寮�鍚崐閫忔槑鐨勮儗鏅� -->
+ <item name="android:backgroundDimEnabled">true</item>
+ <!-- 鍗婇�忔槑鐨勮儗鏅殑閫忔槑搴� -->
+ <item name="android:backgroundDimAmount">0.6</item>
+ <item name="android:background">@color/transparent</item>
+ </style>
+
</resources>
\ No newline at end of file
--
Gitblit v1.8.0