From 442a6cd74f248a8ac5615dabb1f33a8b2d679a0c Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:54:17 +0800 Subject: [PATCH] =?UTF-8?q?pref:=20=E8=BF=87=E5=BA=A6=E7=BB=98=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/huanchengfly/tieba/post/MainActivityV2.kt | 4 ++++ .../com/huanchengfly/tieba/post/ui/page/forum/ForumPage.kt | 2 +- .../huanchengfly/tieba/post/ui/page/history/HistoryPage.kt | 4 +++- .../tieba/post/ui/page/main/explore/ExplorePage.kt | 2 +- .../post/ui/page/main/notifications/NotificationsPage.kt | 2 +- .../tieba/post/ui/page/settings/block/BlockSettingsPage.kt | 2 +- .../tieba/post/ui/page/threadstore/ThreadStorePage.kt | 2 ++ 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/MainActivityV2.kt b/app/src/main/java/com/huanchengfly/tieba/post/MainActivityV2.kt index 6b64cf85..9ced2b78 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/MainActivityV2.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/MainActivityV2.kt @@ -7,6 +7,8 @@ import android.content.BroadcastReceiver import android.content.ComponentName import android.content.Context import android.content.Intent +import android.graphics.Color +import android.graphics.drawable.ColorDrawable import android.os.Build import android.os.Bundle import android.os.Handler @@ -163,6 +165,8 @@ class MainActivityV2 : BaseComposeActivity() { override fun onCreate(savedInstanceState: Bundle?) { installSplashScreen() super.onCreate(savedInstanceState) + window.decorView.setBackgroundColor(Color.TRANSPARENT) + window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) } override fun onCreateContent(systemUiController: SystemUiController) { diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/forum/ForumPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/forum/ForumPage.kt index 356df62e..a0ed75f5 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/forum/ForumPage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/forum/ForumPage.kt @@ -648,7 +648,7 @@ fun ForumPage( ) }, divider = {}, - backgroundColor = ExtendedTheme.colors.topBar, + backgroundColor = Color.Transparent, contentColor = ExtendedTheme.colors.accent, modifier = Modifier .width(tabWidth.dp) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/history/HistoryPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/history/HistoryPage.kt index 2580f895..91cc2d95 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/history/HistoryPage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/history/HistoryPage.kt @@ -15,6 +15,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -57,6 +58,7 @@ fun HistoryPage( val eventFlow = remember { MutableSharedFlow() } MyScaffold( + backgroundColor = Color.Transparent, scaffoldState = scaffoldState, topBar = { TitleCentredToolbar( @@ -95,7 +97,7 @@ fun HistoryPage( ) }, divider = {}, - backgroundColor = ExtendedTheme.colors.topBar, + backgroundColor = Color.Transparent, contentColor = ExtendedTheme.colors.accent, modifier = Modifier .width(100.dp * 2) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/ExplorePage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/ExplorePage.kt index 3d2d2474..4b1060f9 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/ExplorePage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/ExplorePage.kt @@ -74,7 +74,7 @@ fun ExplorePage() { ) }, divider = {}, - backgroundColor = ExtendedTheme.colors.topBar, + backgroundColor = Color.Transparent, contentColor = ExtendedTheme.colors.onTopBar, modifier = Modifier .align(Alignment.CenterHorizontally) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/NotificationsPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/NotificationsPage.kt index b040346e..aab9ccfa 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/NotificationsPage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/notifications/NotificationsPage.kt @@ -67,7 +67,7 @@ fun NotificationsPage() { ) }, divider = {}, - backgroundColor = ExtendedTheme.colors.topBar, + backgroundColor = Color.Transparent, contentColor = ExtendedTheme.colors.onTopBar, ) { pages.forEachIndexed { index, pair -> diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/block/BlockSettingsPage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/block/BlockSettingsPage.kt index bfd0c508..c35b3512 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/block/BlockSettingsPage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/block/BlockSettingsPage.kt @@ -125,7 +125,7 @@ fun BlockSettingsPage( ) }, divider = {}, - backgroundColor = ExtendedTheme.colors.topBar, + backgroundColor = Color.Transparent, contentColor = ExtendedTheme.colors.onTopBar, modifier = Modifier .align(Alignment.CenterHorizontally) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/threadstore/ThreadStorePage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/threadstore/ThreadStorePage.kt index 2603ec54..7ebd4ebb 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/threadstore/ThreadStorePage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/threadstore/ThreadStorePage.kt @@ -23,6 +23,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString @@ -119,6 +120,7 @@ fun ThreadStorePage( } } MyScaffold( + backgroundColor = Color.Transparent, scaffoldState = scaffoldState, topBar = { TitleCentredToolbar(