Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pref: 底栏样式统一

This commit is contained in:
HuanCheng65 2023-09-30 23:53:13 +08:00
parent b0d67a1b98
commit 717e2c70ba
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
2 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/huanchengfly/tieba/post/ui/common/theme/compose/Theme.kt
View File

@ -291,7 +291,7 @@ private fun getBlackDarkDynamicColor(tonalPalette: TonalPalette): ExtendedColors
onTopBarActive = tonalPalette.neutralVariant100, onTopBarActive = tonalPalette.neutralVariant100,
topBarSurface = tonalPalette.neutralVariant10, topBarSurface = tonalPalette.neutralVariant10,
onTopBarSurface = tonalPalette.neutralVariant70, onTopBarSurface = tonalPalette.neutralVariant70,
bottomBar = tonalPalette.neutralVariant10, bottomBar = tonalPalette.neutralVariant0,
bottomBarSurface = tonalPalette.neutralVariant10, bottomBarSurface = tonalPalette.neutralVariant10,
onBottomBarSurface = tonalPalette.neutralVariant70, onBottomBarSurface = tonalPalette.neutralVariant70,
text = tonalPalette.neutralVariant90, text = tonalPalette.neutralVariant90,

11
app/src/main/java/com/huanchengfly/tieba/post/ui/page/subposts/SubPostsPage.kt
View File

@ -22,7 +22,6 @@ import androidx.compose.material.DropdownMenuItem
import androidx.compose.material.Icon import androidx.compose.material.Icon
import androidx.compose.material.IconButton import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.ArrowBack import androidx.compose.material.icons.rounded.ArrowBack
@ -52,6 +51,7 @@ import com.huanchengfly.tieba.post.arch.onEvent
import com.huanchengfly.tieba.post.arch.pageViewModel import com.huanchengfly.tieba.post.arch.pageViewModel
import com.huanchengfly.tieba.post.arch.wrapImmutable import com.huanchengfly.tieba.post.arch.wrapImmutable
import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme
import com.huanchengfly.tieba.post.ui.common.theme.compose.threadBottomBar
import com.huanchengfly.tieba.post.ui.page.LocalNavigator import com.huanchengfly.tieba.post.ui.page.LocalNavigator
import com.huanchengfly.tieba.post.ui.page.ProvideNavigator import com.huanchengfly.tieba.post.ui.page.ProvideNavigator
import com.huanchengfly.tieba.post.ui.page.destinations.CopyTextDialogPageDestination import com.huanchengfly.tieba.post.ui.page.destinations.CopyTextDialogPageDestination
@ -307,13 +307,9 @@ internal fun SubPostsContent(
}, },
bottomBar = { bottomBar = {
if (account != null && !LocalContext.current.appPreferences.hideReply) { if (account != null && !LocalContext.current.appPreferences.hideReply) {
Surface( Column(
elevation = 16.dp, modifier = Modifier.background(ExtendedTheme.colors.threadBottomBar)
color = ExtendedTheme.colors.bottomBar,
contentColor = ExtendedTheme.colors.text,
modifier = Modifier.fillMaxWidth()
) { ) {
Column {
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
@ -368,7 +364,6 @@ internal fun SubPostsContent(
} }
} }
} }
}
) { paddingValues -> ) { paddingValues ->
LoadMoreLayout( LoadMoreLayout(
isLoading = isLoading, isLoading = isLoading,