copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions 1

color for icons in reader

Browse source 
close #107
This commit is contained in:
Cuong-Tran 2024-06-23 00:32:47 +07:00
parent 2bbda8c0bd
commit c8c4ad7be6
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
4 changed files with 51 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt
View file

@ -68,6 +68,10 @@ fun MangaCoverDialog(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
// KMK <-- // KMK <--
) { ) {
// KMK -->
val iconColor = contentColorFor(MaterialTheme.colorScheme.secondaryContainer)
val dropdownBgColor = MaterialTheme.colorScheme.surfaceVariant
// KMK <--
Dialog( Dialog(
onDismissRequest = onDismissRequest, onDismissRequest = onDismissRequest,
properties = DialogProperties( properties = DialogProperties(
@ -94,7 +98,7 @@ fun MangaCoverDialog(
imageVector = Icons.Outlined.Close, imageVector = Icons.Outlined.Close,
contentDescription = stringResource(MR.strings.action_close), contentDescription = stringResource(MR.strings.action_close),
// KMK --> // KMK -->
tint = contentColorFor(MaterialTheme.colorScheme.secondaryContainer), tint = iconColor,
// KMK <-- // KMK <--
) )
} }
@ -108,7 +112,7 @@ fun MangaCoverDialog(
icon = Icons.Outlined.Share, icon = Icons.Outlined.Share,
onClick = onShareClick, onClick = onShareClick,
// KMK --> // KMK -->
iconTint = contentColorFor(MaterialTheme.colorScheme.secondaryContainer), iconTint = iconColor,
// KMK <-- // KMK <--
), ),
AppBar.Action( AppBar.Action(
@ -116,7 +120,7 @@ fun MangaCoverDialog(
icon = Icons.Outlined.Save, icon = Icons.Outlined.Save,
onClick = onSaveClick, onClick = onSaveClick,
// KMK --> // KMK -->
iconTint = contentColorFor(MaterialTheme.colorScheme.secondaryContainer), iconTint = iconColor,
// KMK <-- // KMK <--
), ),
), ),
@ -137,7 +141,7 @@ fun MangaCoverDialog(
imageVector = Icons.Outlined.Edit, imageVector = Icons.Outlined.Edit,
contentDescription = stringResource(MR.strings.action_edit_cover), contentDescription = stringResource(MR.strings.action_edit_cover),
// KMK --> // KMK -->
tint = contentColorFor(MaterialTheme.colorScheme.secondaryContainer), tint = iconColor,
// KMK <-- // KMK <--
) )
} }
@ -146,7 +150,7 @@ fun MangaCoverDialog(
onDismissRequest = { expanded = false }, onDismissRequest = { expanded = false },
offset = DpOffset(8.dp, 0.dp), offset = DpOffset(8.dp, 0.dp),
// KMK --> // KMK -->
modifier = Modifier.background(MaterialTheme.colorScheme.surfaceVariant), modifier = Modifier.background(dropdownBgColor),
// KMK <-- // KMK <--
) { ) {
DropdownMenuItem( DropdownMenuItem(
@ -157,7 +161,7 @@ fun MangaCoverDialog(
}, },
// KMK --> // KMK -->
colors = MenuDefaults.itemColors().copy( colors = MenuDefaults.itemColors().copy(
textColor = contentColorFor(MaterialTheme.colorScheme.surfaceVariant), textColor = contentColorFor(dropdownBgColor),
), ),
// KMK <-- // KMK <--
) )
@ -169,7 +173,7 @@ fun MangaCoverDialog(
}, },
// KMK --> // KMK -->
colors = MenuDefaults.itemColors().copy( colors = MenuDefaults.itemColors().copy(
textColor = contentColorFor(MaterialTheme.colorScheme.surfaceVariant), textColor = contentColorFor(dropdownBgColor),
), ),
// KMK <-- // KMK <--
) )

31
app/src/main/java/eu/kanade/presentation/reader/appbars/BottomReaderBar.kt
View file

@ -12,6 +12,7 @@ import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material.icons.outlined.Share import androidx.compose.material.icons.outlined.Share
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@ -51,6 +52,9 @@ fun BottomReaderBar(
onClickShiftPage: () -> Unit, onClickShiftPage: () -> Unit,
// SY <-- // SY <--
) { ) {
// KMK -->
val iconColor = MaterialTheme.colorScheme.primary
// KMK <--
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
@ -65,6 +69,9 @@ fun BottomReaderBar(
Icon( Icon(
imageVector = Icons.Outlined.FormatListNumbered, imageVector = Icons.Outlined.FormatListNumbered,
contentDescription = stringResource(MR.strings.chapters), contentDescription = stringResource(MR.strings.chapters),
// KMK -->
tint = iconColor,
// KMK <--
) )
} }
} }
@ -74,6 +81,9 @@ fun BottomReaderBar(
Icon( Icon(
imageVector = Icons.Outlined.Public, imageVector = Icons.Outlined.Public,
contentDescription = stringResource(MR.strings.action_open_in_web_view), contentDescription = stringResource(MR.strings.action_open_in_web_view),
// KMK -->
tint = iconColor,
// KMK <--
) )
} }
} }
@ -83,6 +93,9 @@ fun BottomReaderBar(
Icon( Icon(
imageVector = Icons.Outlined.Share, imageVector = Icons.Outlined.Share,
contentDescription = stringResource(MR.strings.action_share), contentDescription = stringResource(MR.strings.action_share),
// KMK -->
tint = iconColor,
// KMK <--
) )
} }
} }
@ -92,6 +105,9 @@ fun BottomReaderBar(
Icon( Icon(
painter = painterResource(readingMode.iconRes), painter = painterResource(readingMode.iconRes),
contentDescription = stringResource(MR.strings.viewer), contentDescription = stringResource(MR.strings.viewer),
// KMK -->
tint = iconColor,
// KMK <--
) )
} }
} }
@ -101,6 +117,9 @@ fun BottomReaderBar(
Icon( Icon(
imageVector = orientation.icon, imageVector = orientation.icon,
contentDescription = stringResource(MR.strings.pref_rotation_type), contentDescription = stringResource(MR.strings.pref_rotation_type),
// KMK -->
tint = iconColor,
// KMK <--
) )
} }
} }
@ -117,6 +136,9 @@ fun BottomReaderBar(
if (cropEnabled) R.drawable.ic_crop_24dp else R.drawable.ic_crop_off_24dp, if (cropEnabled) R.drawable.ic_crop_24dp else R.drawable.ic_crop_off_24dp,
), ),
contentDescription = stringResource(MR.strings.pref_crop_borders), contentDescription = stringResource(MR.strings.pref_crop_borders),
// KMK -->
tint = iconColor,
// KMK <--
) )
} }
} }
@ -130,6 +152,9 @@ fun BottomReaderBar(
Icon( Icon(
painter = painterResource(R.drawable.ic_book_open_variant_24dp), painter = painterResource(R.drawable.ic_book_open_variant_24dp),
contentDescription = stringResource(SYMR.strings.page_layout), contentDescription = stringResource(SYMR.strings.page_layout),
// KMK -->
tint = iconColor,
// KMK <--
) )
} }
} }
@ -139,6 +164,9 @@ fun BottomReaderBar(
Icon( Icon(
painter = painterResource(R.drawable.ic_page_next_outline_24dp), painter = painterResource(R.drawable.ic_page_next_outline_24dp),
contentDescription = stringResource(SYMR.strings.shift_double_pages), contentDescription = stringResource(SYMR.strings.shift_double_pages),
// KMK -->
tint = iconColor,
// KMK <--
) )
} }
} }
@ -147,6 +175,9 @@ fun BottomReaderBar(
Icon( Icon(
imageVector = Icons.Outlined.Settings, imageVector = Icons.Outlined.Settings,
contentDescription = stringResource(MR.strings.action_settings), contentDescription = stringResource(MR.strings.action_settings),
// KMK -->
tint = iconColor,
// KMK <--
) )
} }
// SY <-- // SY <--

3
app/src/main/java/eu/kanade/presentation/reader/appbars/ExhUtils.kt
View file

@ -234,6 +234,9 @@ fun ExhUtils(
Icons.Outlined.KeyboardArrowDown Icons.Outlined.KeyboardArrowDown
}, },
contentDescription = null, contentDescription = null,
// KMK -->
tint = MaterialTheme.colorScheme.primary,
// KMK <--
) )
} }
} }

6
app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt
View file

@ -86,6 +86,9 @@ fun ChapterNavigator(
val buttonColor = IconButtonDefaults.filledIconButtonColors( val buttonColor = IconButtonDefaults.filledIconButtonColors(
containerColor = backgroundColor, containerColor = backgroundColor,
disabledContainerColor = backgroundColor, disabledContainerColor = backgroundColor,
// KMK -->
contentColor = MaterialTheme.colorScheme.primary,
// KMK <--
) )
// We explicitly handle direction based on the reader viewer rather than the system direction // We explicitly handle direction based on the reader viewer rather than the system direction
@ -198,6 +201,9 @@ fun ChapterNavigatorVert(
val buttonColor = IconButtonDefaults.filledIconButtonColors( val buttonColor = IconButtonDefaults.filledIconButtonColors(
containerColor = backgroundColor, containerColor = backgroundColor,
disabledContainerColor = backgroundColor, disabledContainerColor = backgroundColor,
// KMK -->
contentColor = MaterialTheme.colorScheme.primary,
// KMK <--
) )
FilledIconButton( FilledIconButton(
enabled = enabledPrevious, enabled = enabledPrevious,