From fe04012057d024770e0180543483d393281a542f Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期四, 03 四月 2025 09:18:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/res/values/themes.xml | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b91897b..74c31b4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,10 +1,10 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<!-- <style name="Theme.FirstApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">-->
- <style name="Theme.FirstApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+ <style name="Theme.FirstApp" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
- <item name="colorPrimary">@color/purple_500</item>
- <item name="colorPrimaryVariant">@color/purple_700</item>
+ <item name="colorPrimary">@color/light_blue_new</item>
+ <item name="colorPrimaryVariant">@color/light_blue_new</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
@@ -12,17 +12,31 @@
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+ <!-- 确保没有ActionBar -->
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
<!-- Customize your theme here. -->
</style>
<style name="Theme.FirstApp.Fullscreen" parent="Theme.FirstApp">
- <item name="android:actionBarStyle">@style/Widget.Theme.FirstApp.ActionBar.Fullscreen</item>
- <item name="android:windowActionBarOverlay">true</item>
- <item name="android:windowBackground">@null</item>
+<!-- <item name="android:actionBarStyle">@style/Widget.Theme.FirstApp.ActionBar.Fullscreen</item>-->
+<!-- <item name="android:windowActionBarOverlay">true</item>-->
+<!-- <item name="android:windowBackground">@null</item>-->
</style>
<style name="ThemeOverlay.FirstApp.FullscreenContainer" parent="">
<item name="fullscreenBackgroundColor">@color/light_blue_600</item>
<item name="fullscreenTextColor">@color/light_blue_A200</item>
</style>
+
+ <style name="Theme.ContentDetail" parent="Theme.MaterialComponents.Light.NoActionBar">
+ <!-- 其他属性保持不变 -->
+ <item name="windowActionBar">false</item>
+ <item name="windowNoTitle">true</item>
+ </style>
+ <!-- Base application theme. -->
+ <style name="Base.Theme.FirstApp" parent="Theme.Material3.DayNight.NoActionBar">
+ <!-- Customize your light theme here. -->
+ <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+ </style>
</resources>
\ No newline at end of file
--
Gitblit v1.9.3