diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt index 2d7936548..5a6d636ee 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt @@ -489,7 +489,7 @@ fun DownloadsScreen(navigator: DestinationsNavigator) = composing(navigator) { onClick = ::onItemClick.partially1(info), onLongClick = { navigator.navigate(info.galleryInfo.asDst()) }, info = info, - modifier = Modifier.thenIf(animateItems) { animateItemPlacement() }, + modifier = Modifier.thenIf(animateItems) { animateItem() }, badgeText = info.pages.takeIf { it > 0 }?.toString(), ) } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt index 26a2e353d..ded43a63e 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt @@ -270,7 +270,7 @@ fun FavouritesScreen(navigator: DestinationsNavigator) = composing(navigator) { val checked = info.gid in checkedInfoMap CheckableItem( checked = checked, - modifier = Modifier.thenIf(animateItems) { animateItemPlacement() }, + modifier = Modifier.thenIf(animateItems) { animateItem() }, ) { interactionSource -> GalleryInfoListItem( onClick = { @@ -299,7 +299,7 @@ fun FavouritesScreen(navigator: DestinationsNavigator) = composing(navigator) { val checked = info.gid in checkedInfoMap CheckableItem( checked = checked, - modifier = Modifier.thenIf(animateItems) { animateItemPlacement() }, + modifier = Modifier.thenIf(animateItems) { animateItem() }, ) { interactionSource -> GalleryInfoGridItem( onClick = { diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt index e0f5f2144..ca1c33241 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt @@ -64,8 +64,9 @@ import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalTextToolbar import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.fromHtml import androidx.compose.ui.text.input.TextFieldValue -import androidx.compose.ui.text.parseAsHtml import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.max @@ -337,7 +338,7 @@ fun GalleryCommentsScreen(gid: Long, navigator: DestinationsNavigator) = composi } if (comment.editable) { onSelect(editComment) { - userComment = TextFieldValue(comment.comment.parseAsHtml()) + userComment = TextFieldValue(AnnotatedString.fromHtml(comment.comment)) commentId = comment.id commenting = true } diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt index 24ffedf66..c1d389c7d 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt @@ -26,7 +26,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.parseAsHtml +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.fromHtml import androidx.compose.ui.unit.dp import com.hippo.ehviewer.BuildConfig import com.hippo.ehviewer.R @@ -58,7 +59,7 @@ private fun versionCode() = "${BuildConfig.VERSION_NAME} (${BuildConfig.COMMIT_S @Composable @Stable -private fun author() = stringResource(R.string.settings_about_author_summary).replace('$', '@').parseAsHtml() +private fun author() = AnnotatedString.fromHtml(stringResource(R.string.settings_about_author_summary).replace('$', '@')) @Destination @Composable diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt index fe0a5f6e5..c21ce7e47 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt @@ -37,7 +37,8 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.stringArrayResource import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.parseAsHtml +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.fromHtml import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings import com.hippo.ehviewer.asMutableState @@ -116,7 +117,7 @@ fun EhScreen(navigator: DestinationsNavigator) { Column { val warning = stringResource(id = R.string.settings_eh_identity_cookies_signed) val str = cookies.joinToString("\n") { (k, v) -> "$k: $v" } - Text(text = warning.parseAsHtml()) + Text(text = AnnotatedString.fromHtml(warning)) Spacer(modifier = Modifier.size(dimensionResource(id = R.dimen.keyline_margin))) OutlinedTextField( value = str, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/FilterScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/FilterScreen.kt index 6ca83a22d..9a9d9dada 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/FilterScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/FilterScreen.kt @@ -28,6 +28,7 @@ import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.Text @@ -126,7 +127,7 @@ fun FilterScreen(navigator: DestinationsNavigator) { onExpandedChange = { expanded = !expanded }, ) { OutlinedTextField( - modifier = Modifier.menuAnchor(), + modifier = Modifier.menuAnchor(MenuAnchorType.PrimaryNotEditable), readOnly = true, value = type, onValueChange = {}, diff --git a/settings.gradle.kts b/settings.gradle.kts index 1d7633da9..d43f73b49 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,7 +24,7 @@ dependencyResolutionManagement { maven("https://jitpack.io") maven("https://androidx.dev/storage/compose-compiler/repository/") // TODO: Remove on Compose 1.7.0-alpha07 release - maven("https://androidx.dev/snapshots/builds/11644901/artifacts/repository") + maven("https://androidx.dev/snapshots/builds/11689537/artifacts/repository") } }