From 1c61efd8e90600c86127be1f60b496d383317484 Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Sat, 22 Jun 2024 20:53:59 +0700 Subject: [PATCH] change color for full-cover icon & reading button also remove the divider of related-titles in tablet view --- .../kanade/presentation/manga/MangaScreen.kt | 7 ++++- .../manga/components/MangaCoverDialog.kt | 31 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt index 12abb62f8..8142e007f 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt @@ -498,6 +498,9 @@ private fun MangaScreenSmallImpl( icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) }, onClick = onContinueReading, expanded = chapterListState.isScrollingUp() || chapterListState.isScrolledToEnd(), + // KMK --> + containerColor = MaterialTheme.colorScheme.primary, + // KMK <-- ) } }, @@ -897,6 +900,9 @@ private fun MangaScreenLargeImpl( icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) }, onClick = onContinueReading, expanded = chapterListState.isScrollingUp() || chapterListState.isScrolledToEnd(), + // KMK --> + containerColor = MaterialTheme.colorScheme.primary, + // KMK <-- ) } }, @@ -1022,7 +1028,6 @@ private fun MangaScreenLargeImpl( if (state.source !is StubSource && relatedMangasEnabled) { if (expandRelatedMangas) { if (state.relatedMangasSorted?.isNotEmpty() != false) { - item { HorizontalDivider() } item( key = MangaScreenItem.RELATED_TITLES, contentType = MangaScreenItem.RELATED_TITLES, diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt index 742c23411..aed4afa63 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt @@ -19,9 +19,11 @@ import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.MenuDefaults import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text +import androidx.compose.material3.contentColorFor import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -91,6 +93,9 @@ fun MangaCoverDialog( Icon( imageVector = Icons.Outlined.Close, contentDescription = stringResource(MR.strings.action_close), + // KMK --> + tint = contentColorFor(MaterialTheme.colorScheme.secondaryContainer), + // KMK <-- ) } } @@ -102,11 +107,17 @@ fun MangaCoverDialog( title = stringResource(MR.strings.action_share), icon = Icons.Outlined.Share, onClick = onShareClick, + // KMK --> + iconTint = contentColorFor(MaterialTheme.colorScheme.secondaryContainer), + // KMK <-- ), AppBar.Action( title = stringResource(MR.strings.action_save), icon = Icons.Outlined.Save, onClick = onSaveClick, + // KMK --> + iconTint = contentColorFor(MaterialTheme.colorScheme.secondaryContainer), + // KMK <-- ), ), ) @@ -125,12 +136,18 @@ fun MangaCoverDialog( Icon( imageVector = Icons.Outlined.Edit, contentDescription = stringResource(MR.strings.action_edit_cover), + // KMK --> + tint = contentColorFor(MaterialTheme.colorScheme.secondaryContainer), + // KMK <-- ) } DropdownMenu( expanded = expanded, onDismissRequest = { expanded = false }, offset = DpOffset(8.dp, 0.dp), + // KMK --> + modifier = Modifier.background(MaterialTheme.colorScheme.surfaceVariant), + // KMK <-- ) { DropdownMenuItem( text = { Text(text = stringResource(MR.strings.action_edit)) }, @@ -138,6 +155,11 @@ fun MangaCoverDialog( onEditClick(EditCoverAction.EDIT) expanded = false }, + // KMK --> + colors = MenuDefaults.itemColors().copy( + textColor = contentColorFor(MaterialTheme.colorScheme.surfaceVariant), + ), + // KMK <-- ) DropdownMenuItem( text = { Text(text = stringResource(MR.strings.action_delete)) }, @@ -145,6 +167,11 @@ fun MangaCoverDialog( onEditClick(EditCoverAction.DELETE) expanded = false }, + // KMK --> + colors = MenuDefaults.itemColors().copy( + textColor = contentColorFor(MaterialTheme.colorScheme.surfaceVariant), + ), + // KMK <-- ) } } @@ -204,7 +231,9 @@ private fun ActionsPill(content: @Composable () -> Unit) { Row( modifier = Modifier .clip(MaterialTheme.shapes.extraLarge) - .background(MaterialTheme.colorScheme.background.copy(alpha = 0.95f)), + // KMK --> + .background(MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.95f)), + // KMK <-- ) { content() }