diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6dafaafb7..3f0f53259 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -171,8 +171,8 @@ dependencies { implementation("androidx.core:core-ktx:1.10.0-rc01") implementation("androidx.constraintlayout:constraintlayout:2.2.0-alpha08") + implementation("androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha08") implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0") - implementation("androidx.coordinatorlayout:coordinatorlayout-compose:1.1.0-alpha08") // https://developer.android.com/jetpack/androidx/releases/lifecycle implementation("androidx.lifecycle:lifecycle-process:2.6.0") diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt index 5bc8068d5..a826f2ac5 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.kt @@ -644,7 +644,7 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl lub.category = category navigate(R.id.galleryListScene, lub.toStartArgs(), true) }, label = { - Text(text = categoryText) + Text(text = categoryText, maxLines = 1) }, modifier = Modifier.padding( horizontal = dimensionResource(id = R.dimen.keyline_margin) ), @@ -663,7 +663,7 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl lub.keyword = uploader navigate(R.id.galleryListScene, lub.toStartArgs(), true) }, - label = { Text(text = uploaderText) }, + label = { Text(text = uploaderText, maxLines = 1) }, modifier = Modifier.padding( horizontal = dimensionResource(id = R.dimen.keyline_margin) ), @@ -731,7 +731,7 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl binding.content.header.run { thumbUrl = gi.thumb!! setTitle(EhUtils.getSuitableTitle(gi)) - uploaderText = gi.uploader.orEmpty() + uploaderText = gi.uploader.orEmpty().toUpperCase(Locale.current) categoryText = EhUtils.getCategory(gi.category).toUpperCase(Locale.current) updateDownloadText() } @@ -784,7 +784,7 @@ class GalleryDetailScene : CollapsingToolbarScene(), View.OnClickListener, Downl val resources = resources thumbUrl = gd.thumb!! setTitle(EhUtils.getSuitableTitle(gd)) - uploaderText = gd.uploader.orEmpty() + uploaderText = gd.uploader.orEmpty().toUpperCase(Locale.current) categoryText = EhUtils.getCategory(gd.category).toUpperCase(Locale.current) updateDownloadText() /*