From 401134fa8ed0e0134e166e2c5f78de09d744a553 Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 28 Oct 2022 16:18:05 -0400 Subject: [PATCH] Use MaterialTheme.shapes in more places --- .../eu/kanade/presentation/browse/components/BrowseIcons.kt | 3 +-- .../main/java/eu/kanade/presentation/components/Badges.kt | 3 +-- .../eu/kanade/presentation/components/CommonMangaItem.kt | 2 +- .../java/eu/kanade/presentation/components/MangaCover.kt | 5 ++--- app/src/main/java/eu/kanade/presentation/components/Pill.kt | 3 +-- .../more/settings/widget/AppThemePreferenceWidget.kt | 6 +++--- .../more/settings/widget/ListPreferenceWidget.kt | 3 +-- .../more/settings/widget/MultiSelectListPreferenceWidget.kt | 3 +-- .../more/settings/widget/TrackingPreferenceWidget.kt | 3 +-- .../presentation/more/settings/widget/TriStateListDialog.kt | 3 +-- 10 files changed, 13 insertions(+), 21 deletions(-) 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 684bedfe1f..902551d542 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 @@ -6,7 +6,6 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.height -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Dangerous import androidx.compose.material.icons.filled.Warning @@ -85,7 +84,7 @@ fun ExtensionIcon( placeholder = ColorPainter(Color(0x1F888888)), error = rememberResourceBitmapPainter(id = R.drawable.cover_error), modifier = modifier - .clip(RoundedCornerShape(4.dp)), + .clip(MaterialTheme.shapes.extraSmall), ) } is Extension.Installed -> { diff --git a/app/src/main/java/eu/kanade/presentation/components/Badges.kt b/app/src/main/java/eu/kanade/presentation/components/Badges.kt index 7bc79e0cb6..b118b2baed 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Badges.kt +++ b/app/src/main/java/eu/kanade/presentation/components/Badges.kt @@ -4,7 +4,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -19,7 +18,7 @@ import androidx.compose.ui.unit.dp @Composable fun BadgeGroup( modifier: Modifier = Modifier, - shape: Shape = RoundedCornerShape(4.dp), + shape: Shape = MaterialTheme.shapes.extraSmall, content: @Composable RowScope.() -> Unit, ) { Row(modifier = modifier.clip(shape)) { diff --git a/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt b/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt index 552bcb5589..27f2480fd0 100644 --- a/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt +++ b/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt @@ -225,7 +225,7 @@ private fun GridItemSelectable( ) { Box( modifier = modifier - .clip(RoundedCornerShape(8.dp)) + .clip(MaterialTheme.shapes.small) .combinedClickable( onClick = onClick, onLongClick = onLongClick, diff --git a/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt b/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt index ab97e48e53..d585215e81 100644 --- a/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt +++ b/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt @@ -2,7 +2,7 @@ package eu.kanade.presentation.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.aspectRatio -import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -11,7 +11,6 @@ import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.painter.ColorPainter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.semantics.Role -import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import eu.kanade.presentation.util.rememberResourceBitmapPainter import eu.kanade.tachiyomi.R @@ -26,7 +25,7 @@ enum class MangaCover(val ratio: Float) { modifier: Modifier = Modifier, data: Any?, contentDescription: String = "", - shape: Shape = RoundedCornerShape(4.dp), + shape: Shape = MaterialTheme.shapes.extraSmall, onClick: (() -> Unit)? = null, ) { AsyncImage( diff --git a/app/src/main/java/eu/kanade/presentation/components/Pill.kt b/app/src/main/java/eu/kanade/presentation/components/Pill.kt index 7527a09419..830e14e22d 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Pill.kt +++ b/app/src/main/java/eu/kanade/presentation/components/Pill.kt @@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.requiredWidth -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -28,7 +27,7 @@ fun Pill( androidx.compose.material3.Surface( modifier = modifier .padding(start = 4.dp), - shape = RoundedCornerShape(100), + shape = MaterialTheme.shapes.extraLarge, color = color, contentColor = contentColor, tonalElevation = elevation, diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt index 85a9e7122c..d1520c7e41 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt @@ -158,7 +158,7 @@ fun AppThemePreviewItem( .padding(end = 4.dp) .background( color = MaterialTheme.colorScheme.onSurface, - shape = RoundedCornerShape(9.dp), + shape = MaterialTheme.shapes.small, ), ) @@ -182,7 +182,7 @@ fun AppThemePreviewItem( .padding(start = 8.dp, top = 2.dp) .background( color = dividerColor, - shape = RoundedCornerShape(9.dp), + shape = MaterialTheme.shapes.small, ) .fillMaxWidth(0.5f) .aspectRatio(MangaCover.Book.ratio), @@ -242,7 +242,7 @@ fun AppThemePreviewItem( .weight(1f) .background( color = MaterialTheme.colorScheme.onSurface, - shape = RoundedCornerShape(9.dp), + shape = MaterialTheme.shapes.small, ), ) } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt index 261de06f3b..0ff1755b5c 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.selection.selectable -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.RadioButton @@ -89,7 +88,7 @@ private fun DialogRow( Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier - .clip(RoundedCornerShape(8.dp)) + .clip(MaterialTheme.shapes.small) .selectable( selected = isSelected, onClick = { if (!isSelected) onSelected() }, diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt index 12074093f3..83a91468d8 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.selection.selectable -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.AlertDialog import androidx.compose.material3.Checkbox import androidx.compose.material3.MaterialTheme @@ -62,7 +61,7 @@ fun MultiSelectListPreferenceWidget( Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier - .clip(RoundedCornerShape(8.dp)) + .clip(MaterialTheme.shapes.small) .selectable( selected = isSelected, onClick = { onSelectionChanged() }, diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt index 69f7e4c5a7..33c873c77e 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Check import androidx.compose.material3.Icon @@ -45,7 +44,7 @@ fun TrackingPreferenceWidget( Box( modifier = Modifier .size(48.dp) - .background(color = Color(logoColor), shape = RoundedCornerShape(8.dp)) + .background(color = Color(logoColor), shape = MaterialTheme.shapes.small) .padding(4.dp), contentAlignment = Alignment.Center, ) { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt index e9158cbfab..852efb3757 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.CheckBox import androidx.compose.material.icons.rounded.CheckBoxOutlineBlank @@ -79,7 +78,7 @@ fun TriStateListDialog( val state = selected[index] Row( modifier = Modifier - .clip(RoundedCornerShape(8.dp)) + .clip(MaterialTheme.shapes.small) .clickable { selected[index] = when (state) { State.UNCHECKED -> State.CHECKED