From 2bc156ec08369884b44961cd446201d35a66fff0 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 10:50:40 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into feature/v1.4.1
---
app/src/main/res/values/themes.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f887031..0649322 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,13 +11,13 @@
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-
<!-- Customize your theme here. -->
</style>
<style name="Theme.PhotovoltaicDebug.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
+
</style>
@@ -58,7 +58,7 @@
</style>
- <style name="DCloudMPHostActivityTheme" parent="@style/Theme.AppCompat">
+ <style name="DCloudMPHostActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowAnimationStyle">@style/uniMPHostWindowAnimation</item>
</style>
--
Gitblit v1.8.0