admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use non-stable Compose BOM (#9120)

Browse Source 
(cherry picked from commit 60a3ba5a5c1d09e3c3cb56f808a95b239cb0624e)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt
This commit is contained in:
Ivan Iskandar
2023-02-21 22:41:56 +07:00
committed by Jobobby04
parent eceff666ec
commit c787ccb84d
8 changed files with 16 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt
+2 -2
View File
@@ -10,6 +10,7 @@ import androidx.compose.material3.Checkbox
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.minimumInteractiveComponentSize
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.runtime.toMutableStateList
@@ -20,7 +21,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.DialogProperties
import eu.kanade.tachiyomi.R
import tachiyomi.presentation.core.util.minimumTouchTargetSize
@Composable
fun DeleteChaptersDialog(
@@ -86,7 +86,7 @@ fun SelectScanlatorsDialog(
selected = isSelected,
onClick = { onSelectionChanged() },
)
.minimumTouchTargetSize()
.minimumInteractiveComponentSize()
.fillMaxWidth(),
) {
Checkbox(
app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt
+2 -2
View File
@@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.LocalMinimumTouchTargetEnforcement
import androidx.compose.material3.LocalMinimumInteractiveComponentEnforcement
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SuggestionChip
import androidx.compose.material3.Surface
@@ -137,7 +137,7 @@ fun TagsChip(
border: ChipBorder? = null,
borderM3: ChipBorderM3? = null,
) {
CompositionLocalProvider(LocalMinimumTouchTargetEnforcement provides false) {
CompositionLocalProvider(LocalMinimumInteractiveComponentEnforcement provides false) {
if (onClick != null) {
if (onLongClick != null) {
SuggestionChip(
app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt
+2 -2
View File
@@ -11,6 +11,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.minimumInteractiveComponentSize
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -27,7 +28,6 @@ import tachiyomi.presentation.core.components.ScrollbarLazyColumn
import tachiyomi.presentation.core.components.material.Divider
import tachiyomi.presentation.core.util.isScrolledToEnd
import tachiyomi.presentation.core.util.isScrolledToStart
import tachiyomi.presentation.core.util.minimumTouchTargetSize
@Composable
fun <T> ListPreferenceWidget(
@@ -97,7 +97,7 @@ private fun DialogRow(
onClick = { if (!isSelected) onSelected() },
)
.fillMaxWidth()
.minimumTouchTargetSize(),
.minimumInteractiveComponentSize(),
) {
RadioButton(
selected = isSelected,
app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt
+2 -2
View File
@@ -10,6 +10,7 @@ import androidx.compose.material3.Checkbox
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.minimumInteractiveComponentSize
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -24,7 +25,6 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.DialogProperties
import eu.kanade.presentation.more.settings.Preference
import eu.kanade.tachiyomi.R
import tachiyomi.presentation.core.util.minimumTouchTargetSize
@Composable
fun MultiSelectListPreferenceWidget(
@@ -69,7 +69,7 @@ fun MultiSelectListPreferenceWidget(
selected = isSelected,
onClick = { onSelectionChanged() },
)
.minimumTouchTargetSize()
.minimumInteractiveComponentSize()
.fillMaxWidth(),
) {
Checkbox(
app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt
+2 -2
View File
@@ -18,6 +18,7 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.minimumInteractiveComponentSize
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -38,7 +39,6 @@ import tachiyomi.presentation.core.components.material.Divider
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.util.isScrolledToEnd
import tachiyomi.presentation.core.util.isScrolledToStart
import tachiyomi.presentation.core.util.minimumTouchTargetSize
import java.time.LocalDate
import java.time.format.TextStyle
import java.util.Locale
@@ -68,7 +68,7 @@ fun TrackStatusSelector(
onClick = { onSelectionChange(key) },
)
.fillMaxWidth()
.minimumTouchTargetSize(),
.minimumInteractiveComponentSize(),
) {
RadioButton(
selected = isSelected,