From 23bfa1f18f615ba39be42f62cd7b337a6c51bc8e Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 9 Oct 2022 15:49:32 -0400 Subject: [PATCH] Minor UI fixes - Remove M3 styling from search toolbar - Use secondary alpha for subtitles for Sources and Migrate items - Update some content descriptions --- app/build.gradle.kts | 3 +-- .../eu/kanade/presentation/browse/MigrateSourceScreen.kt | 3 +++ .../java/eu/kanade/presentation/browse/SourcesScreen.kt | 3 ++- .../kanade/presentation/browse/components/BaseSourceItem.kt | 2 ++ .../eu/kanade/presentation/browse/components/BrowseIcons.kt | 6 +++--- .../main/java/eu/kanade/presentation/components/AppBar.kt | 4 +++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3d73410be8..a0cfb94316 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -315,6 +315,7 @@ tasks { kotlinOptions.freeCompilerArgs += listOf( "-opt-in=coil.annotation.ExperimentalCoilApi", "-opt-in=com.google.accompanist.pager.ExperimentalPagerApi", + "-opt-in=androidx.compose.material.ExperimentalMaterialApi", "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api", "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi", "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi", @@ -327,8 +328,6 @@ tasks { ) } - - preBuild { val ktlintTask = if (System.getenv("GITHUB_BASE_REF") == null) formatKotlin else lintKotlin dependsOn(ktlintTask) diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt index f99f4b8de2..b204784af4 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt @@ -37,6 +37,7 @@ import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.theme.header import eu.kanade.presentation.util.horizontalPadding import eu.kanade.presentation.util.plus +import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.presentation.util.topPaddingValues import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.migration.sources.MigrationSourcesPresenter @@ -162,6 +163,7 @@ private fun MigrateSourceItem( ) { if (sourceLangString != null) { Text( + modifier = Modifier.secondaryItemAlpha(), text = sourceLangString, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -170,6 +172,7 @@ private fun MigrateSourceItem( } if (source.isStub) { Text( + modifier = Modifier.secondaryItemAlpha(), text = stringResource(R.string.not_installed), maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt index 98481eabc8..7d24b6bcf3 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt @@ -187,11 +187,12 @@ private fun SourcePinButton( ) { val icon = if (isPinned) Icons.Filled.PushPin else Icons.Outlined.PushPin val tint = if (isPinned) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onBackground + val description = if (isPinned) R.string.action_unpin else R.string.action_pin IconButton(onClick = onClick) { Icon( imageVector = icon, - contentDescription = "", tint = tint, + contentDescription = stringResource(description), ) } } diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt index 7f2e7f8e2c..a517ab1088 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt @@ -11,6 +11,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextOverflow import eu.kanade.domain.source.model.Source import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.util.system.LocaleHelper @Composable @@ -53,6 +54,7 @@ private val defaultContent: @Composable RowScope.(Source, String?) -> Unit = { s ) if (sourceLangString != null) { Text( + modifier = Modifier.secondaryItemAlpha(), text = sourceLangString, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt index ccc2884fce..684bedfe1f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt @@ -49,7 +49,7 @@ fun SourceIcon( source.isStub && icon == null -> { Image( imageVector = Icons.Default.Warning, - contentDescription = "", + contentDescription = null, colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.error), modifier = modifier.then(defaultModifier), ) @@ -57,14 +57,14 @@ fun SourceIcon( icon != null -> { Image( bitmap = icon, - contentDescription = "", + contentDescription = null, modifier = modifier.then(defaultModifier), ) } else -> { Image( painter = painterResource(id = R.mipmap.ic_local_source), - contentDescription = "", + contentDescription = null, modifier = modifier.then(defaultModifier), ) } diff --git a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt index f1c104f340..2b9bbad5ae 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt +++ b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.statusBars import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.TextFieldDefaults import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.Close @@ -21,7 +22,6 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.material3.TextFieldDefaults import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarScrollBehavior @@ -44,6 +44,7 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R @Composable @@ -266,6 +267,7 @@ fun SearchToolbar( placeholder = { if (!placeholderText.isNullOrEmpty()) { Text( + modifier = Modifier.secondaryItemAlpha(), text = placeholderText, maxLines = 1, overflow = TextOverflow.Ellipsis,