yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Restore chapter description alpha (#8345)

Browse Source 
Restore "Darken the description colors"

Restores #3858, with new values based on current standards (0.78f rather than 0.62f)

I wanted to accomplish this without having to call a const, but that felt like a logical solution as well

Of course, if you got cleaner methods do tell, thanks
This commit is contained in:
Soitora 2022-10-30 03:58:18 +01:00 committed by GitHub
parent 054bf8ec5d
commit 04d2a3399b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt
View File

@ -32,6 +32,7 @@ import androidx.compose.ui.unit.sp
import eu.kanade.presentation.components.ChapterDownloadAction import eu.kanade.presentation.components.ChapterDownloadAction
import eu.kanade.presentation.components.ChapterDownloadIndicator import eu.kanade.presentation.components.ChapterDownloadIndicator
import eu.kanade.presentation.util.ReadItemAlpha import eu.kanade.presentation.util.ReadItemAlpha
import eu.kanade.presentation.util.SecondaryItemAlpha
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.data.download.model.Download
@ -67,6 +68,7 @@ fun MangaChapterListItem(
MaterialTheme.colorScheme.onSurface MaterialTheme.colorScheme.onSurface
} }
val textAlpha = remember(read) { if (read) ReadItemAlpha else 1f } val textAlpha = remember(read) { if (read) ReadItemAlpha else 1f }
val textSubtitleAlpha = remember(read) { if (read) ReadItemAlpha else SecondaryItemAlpha }
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
var textHeight by remember { mutableStateOf(0) } var textHeight by remember { mutableStateOf(0) }
@ -91,7 +93,7 @@ fun MangaChapterListItem(
) )
} }
Spacer(modifier = Modifier.height(6.dp)) Spacer(modifier = Modifier.height(6.dp))
Row(modifier = Modifier.alpha(textAlpha)) { Row(modifier = Modifier.alpha(textSubtitleAlpha)) {
ProvideTextStyle( ProvideTextStyle(
value = MaterialTheme.typography.bodyMedium value = MaterialTheme.typography.bodyMedium
.copy(color = textColor, fontSize = 12.sp), .copy(color = textColor, fontSize = 12.sp),

1
app/src/main/java/eu/kanade/presentation/util/Constants.kt
View File

@ -12,3 +12,4 @@ val verticalPadding = vertical
val topPaddingValues = PaddingValues(top = vertical) val topPaddingValues = PaddingValues(top = vertical)
const val ReadItemAlpha = .38f const val ReadItemAlpha = .38f
const val SecondaryItemAlpha = .78f

2
app/src/main/java/eu/kanade/presentation/util/Modifier.kt
View File

@ -29,7 +29,7 @@ fun Modifier.selectedBackground(isSelected: Boolean): Modifier = composed {
} }
} }
fun Modifier.secondaryItemAlpha(): Modifier = this.alpha(.78f) fun Modifier.secondaryItemAlpha(): Modifier = this.alpha(SecondaryItemAlpha)
fun Modifier.clickableNoIndication( fun Modifier.clickableNoIndication(
onLongClick: (() -> Unit)? = null, onLongClick: (() -> Unit)? = null,