javara999/mihon-bookoasis
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases 2 Wiki Activity

Address compose and xmlutil deprecations (#3507)

Browse Source
This commit is contained in:
AntsyLich
2026-07-03 01:15:42 +06:00
committed by GitHub
parent f6632940fa
commit dfed97edc8
5 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt
+4 -4
View File
@@ -169,8 +169,6 @@ internal class PermissionStep : OnboardingStep {
) {
ListItem(
modifier = modifier,
headlineContent = { Text(text = title) },
supportingContent = { Text(text = subtitle) },
trailingContent = {
OutlinedButton(
enabled = !granted,
@@ -187,7 +185,9 @@ internal class PermissionStep : OnboardingStep {
}
}
},
supportingContent = { Text(text = subtitle) },
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
content = { Text(text = title) },
)
}
@@ -201,15 +201,15 @@ internal class PermissionStep : OnboardingStep {
) {
ListItem(
modifier = modifier,
headlineContent = { Text(text = title) },
supportingContent = { Text(text = subtitle) },
trailingContent = {
Switch(
checked = granted,
onCheckedChange = onToggleChange,
)
},
supportingContent = { Text(text = subtitle) },
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
content = { Text(text = title) },
)
}
}
app/src/main/java/eu/kanade/presentation/more/settings/screen/appearance/AppLanguageScreen.kt
+7 -6
View File
@@ -10,6 +10,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Check
import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem
import androidx.compose.material3.ListItemDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -71,12 +72,6 @@ class AppLanguageScreen : Screen() {
modifier = Modifier.clickable {
currentLanguage = it.langTag
},
headlineContent = { Text(it.displayName) },
supportingContent = {
it.localizedDisplayName?.let {
Text(it)
}
},
trailingContent = {
if (currentLanguage == it.langTag) {
Icon(
@@ -86,6 +81,12 @@ class AppLanguageScreen : Screen() {
)
}
},
supportingContent = {
it.localizedDisplayName?.let {
Text(it)
}
},
content = { Text(it.displayName) },
)
}
}
app/src/main/java/eu/kanade/tachiyomi/di/AppModule.kt
+7 -5
View File
@@ -24,7 +24,9 @@ import kotlinx.serialization.json.Json
import kotlinx.serialization.protobuf.ProtoBuf
import nl.adaptivity.xmlutil.XmlDeclMode
import nl.adaptivity.xmlutil.core.XmlVersion
import nl.adaptivity.xmlutil.serialization.DefaultXmlSerializationPolicy
import nl.adaptivity.xmlutil.serialization.XML
import nl.adaptivity.xmlutil.serialization.XmlConfig
import tachiyomi.core.common.storage.AndroidStorageFolderProvider
import tachiyomi.data.Chapters
import tachiyomi.data.Database
@@ -92,15 +94,15 @@ class AppModule(val app: Application) : InjektModule {
explicitNulls = false
}
}
addSingletonFactory {
XML {
defaultPolicy {
addSingletonFactory<XML> {
XML.v1 {
policy {
ignoreUnknownChildren()
autoPolymorphic = true
}
autoPolymorphic = true
xmlDeclMode = XmlDeclMode.Charset
indent = 2
xmlVersion = XmlVersion.XML10
setIndent(2)
}
}
addSingletonFactory<ProtoBuf> {
app/src/main/java/mihon/feature/migration/config/MigrationConfigScreen.kt
+23 -26
View File
@@ -268,27 +268,7 @@ class MigrationConfigScreen(private val mangaIds: Collection<Long>) : Screen() {
onClick: () -> Unit,
) {
ListItem(
headlineContent = {
Row(
horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
verticalAlignment = Alignment.CenterVertically,
) {
SourceIcon(source = source.source)
Text(
text = source.name,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.weight(1f),
)
if (showLanguage) {
Pill(
text = LocaleHelper.getShortDisplayName(source.shortLanguage, uppercase = true),
style = MaterialTheme.typography.bodySmall,
)
}
}
},
modifier = Modifier.clickable(onClick = onClick),
trailingContent = if (dragEnabled) {
{
Icon(
@@ -302,11 +282,28 @@ class MigrationConfigScreen(private val mangaIds: Collection<Long>) : Screen() {
} else {
null
},
colors = ListItemDefaults.colors(
containerColor = Color.Transparent,
),
modifier = Modifier.clickable(onClick = onClick),
)
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
) {
Row(
horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small),
verticalAlignment = Alignment.CenterVertically,
) {
SourceIcon(source = source.source)
Text(
text = source.name,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.weight(1f),
)
if (showLanguage) {
Pill(
text = LocaleHelper.getShortDisplayName(source.shortLanguage, uppercase = true),
style = MaterialTheme.typography.bodySmall,
)
}
}
}
}
private class ScreenModel(
app/src/main/java/mihon/feature/migration/config/MigrationConfigScreenSheet.kt
+10 -11
View File
@@ -201,16 +201,16 @@ private fun MigrationSheetSwitchItem(
onClick: () -> Unit,
) {
ListItem(
headlineContent = { Text(text = title) },
supportingContent = subtitle?.let { { Text(text = subtitle) } },
modifier = Modifier.clickable(onClick = onClick),
trailingContent = {
Switch(
checked = checked,
onCheckedChange = null,
)
},
supportingContent = subtitle?.let { { Text(text = subtitle) } },
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
modifier = Modifier.clickable(onClick = onClick),
content = { Text(text = title) },
)
}
@@ -231,13 +231,12 @@ private fun MigrationSheetWarningItem(
tint = MaterialTheme.colorScheme.active,
)
},
headlineContent = {
Text(
text = text,
color = MaterialTheme.colorScheme.error,
modifier = Modifier,
)
},
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
)
) {
Text(
text = text,
color = MaterialTheme.colorScheme.error,
modifier = Modifier,
)
}
}