From 23357397349f15a0f40f48d92ed21d45b9bfb940 Mon Sep 17 00:00:00 2001 From: Trey Ethridge Date: Tue, 4 Jul 2023 09:54:54 -0400 Subject: [PATCH] Fix widget labels (#3220) MainView should use title so that if a custom title is available it will be used. Hide readableName to prevent this from happening again by mistake. --- .../kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt | 2 +- .../kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/widgets-gallery/shared/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt b/examples/widgets-gallery/shared/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt index 5049b3dbb4..a398a61b4c 100644 --- a/examples/widgets-gallery/shared/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt +++ b/examples/widgets-gallery/shared/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/MainView.kt @@ -145,7 +145,7 @@ private fun WidgetsListItemViewImpl( } Text( - text = widgetsType.readableName, + text = widgetsType.title, color = textColor, modifier = Modifier .align(Alignment.CenterVertically) diff --git a/examples/widgets-gallery/shared/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt b/examples/widgets-gallery/shared/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt index 58035dc9e5..80b03c7655 100644 --- a/examples/widgets-gallery/shared/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt +++ b/examples/widgets-gallery/shared/src/commonMain/kotlin/org/jetbrains/compose/demo/widgets/ui/WidgetsType.kt @@ -11,7 +11,7 @@ enum class WidgetsType(private val customTitle: String? = null) { TOGGLES, UI_CARDS("UI Cards"); - val readableName: String by lazy { + private val readableName: String by lazy { name.split("_") .map { it.lowercase() } .mapIndexed { i, it ->