mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-30 13:07:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Compose

Browse Source 
Fixes #7004
This commit is contained in:
arkon
2022-05-11 22:29:28 -04:00
parent c7707dc50e
commit 393fc14630
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/kanade/presentation/components/Preferences.kt
View File

@ -62,7 +62,7 @@ fun PreferenceRow(
Icon(
painter = painter,
modifier = Modifier
.padding(horizontal = horizontalPadding)
.padding(start = horizontalPadding, end = 16.dp)
.size(24.dp),
tint = MaterialTheme.colorScheme.primary,
contentDescription = null,
@ -70,7 +70,7 @@ fun PreferenceRow(
}
Column(
Modifier
.padding(horizontal = horizontalPadding)
.padding(horizontal = 16.dp)
.weight(1f),
) {
Text(
@ -86,7 +86,11 @@ fun PreferenceRow(
}
}
if (action != null) {
Box(Modifier.widthIn(min = 56.dp)) {
Box(
Modifier
.widthIn(min = 56.dp)
.padding(end = horizontalPadding),
) {
action()
}
}
@ -106,11 +110,7 @@ fun SwitchPreference(
title = title,
subtitle = subtitle,
painter = painter,
action = {
Switch(checked = preference.value, onCheckedChange = null)
// TODO: remove this once switch checked state is fixed: https://issuetracker.google.com/issues/228336571
Text(preference.value.toString())
},
action = { Switch(checked = preference.value, onCheckedChange = null) },
onClick = { preference.value = !preference.value },
)
}

6
app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ComposeController.kt
View File

@ -30,7 +30,7 @@ abstract class ComposeController<P : Presenter<*>>(bundle: Bundle? = null) :
consumeWindowInsets = false
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
setContent {
val nestedScrollInterop = rememberNestedScrollInteropConnection(binding.root)
val nestedScrollInterop = rememberNestedScrollInteropConnection()
TachiyomiTheme {
ComposeContent(nestedScrollInterop)
}
@ -56,7 +56,7 @@ abstract class BasicComposeController :
consumeWindowInsets = false
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
setContent {
val nestedScrollInterop = rememberNestedScrollInteropConnection(binding.root)
val nestedScrollInterop = rememberNestedScrollInteropConnection()
TachiyomiTheme {
ComposeContent(nestedScrollInterop)
}
@ -79,7 +79,7 @@ abstract class SearchableComposeController<P : BasePresenter<*>>(bundle: Bundle?
consumeWindowInsets = false
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
setContent {
val nestedScrollInterop = rememberNestedScrollInteropConnection(binding.root)
val nestedScrollInterop = rememberNestedScrollInteropConnection()
TachiyomiTheme {
ComposeContent(nestedScrollInterop)
}