From d9a01a8ab8f81e75db4a3bf390f1841d7be32a65 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 Jan 2022 13:36:49 +0600 Subject: [PATCH 1/3] start 0.0.29 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c00c92..f6bb4bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.0.29 + ## 0.0.28 * Fixes in `UIKitWidth` diff --git a/gradle.properties b/gradle.properties index 4d44381..4fad73d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ android.enableJetifier=true # Project data group=dev.inmo -version=0.0.28 +version=0.0.29 From a88562d3c4fae9875f3cd9e8c6c407b2e28873f4 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 Jan 2022 13:37:03 +0600 Subject: [PATCH 2/3] upfill UIKitText --- CHANGELOG.md | 2 + .../dev/inmo/jsuikit/modifiers/UIKitText.kt | 62 ++++++++++++++++--- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6bb4bf..1535fd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.0.29 +* Unfilling of `UIKitText` + ## 0.0.28 * Fixes in `UIKitWidth` diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitText.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitText.kt index 47a1875..a459807 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitText.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/modifiers/UIKitText.kt @@ -3,16 +3,34 @@ package dev.inmo.jsuikit.modifiers sealed class UIKitText(suffix: String) : UIKitModifier { override val classes: Array = arrayOf("uk-text-$suffix") - object Lead : UIKitText("lead") - object Meta : UIKitText("meta") - - sealed class Alignment(suffix: String) : UIKitText(suffix) { - object Left : Alignment("left") - object Right : Alignment("right") - object Center : Alignment("center") - object Justify : Alignment("justify") + sealed class Style(suffix: String) : UIKitText(suffix) { + object Lead : Style("lead") + object Meta : Style("meta") + object Italic : Style("italic") } + sealed class Size(suffix: String) : UIKitText(suffix) { + object Small : Size("small") + object Default : Size("default") + object Large : Size("large") + } + + sealed class Weight(suffix: String) : UIKitText(suffix) { + object Light : Weight("light") + object Normal : Weight("normal") + object Bold : Weight("bold") + object Lighter : Weight("lighter") + object Bolder : Weight("bolder") + } + + sealed class Transform(suffix: String) : UIKitText(suffix) { + object Capitalize : Transform("capitalize") + object Uppercase : Transform("uppercase") + object Lowercase : Transform("lowercase") + } + + object DecorationNone : UIKitText("decoration-none") + sealed class Color(suffix: String) : UIKitText(suffix) { object Muted : Color("muted") object Emphasis : Color("emphasis") @@ -22,4 +40,32 @@ sealed class UIKitText(suffix: String) : UIKitModifier { object Warning : Color("warning") object Danger : Color("danger") } + + object Background : UIKitText("background") + + sealed class Alignment(suffix: String) : UIKitText(suffix) { + + sealed class Horizontal(suffix: String) : Alignment(suffix) { + object Left : Horizontal("left") + object Right : Horizontal("right") + object Center : Horizontal("center") + object Justify : Horizontal("justify") + } + + sealed class Vertical(suffix: String) : Alignment(suffix) { + object Top : Vertical("top") + object Middle : Vertical("middle") + object Bottom : Vertical("bottom") + object Baseline : Vertical("baseline") + } + + } + + sealed class Wrapping(suffix: String) : UIKitText(suffix) { + + object Truncate : Wrapping("truncate") + object Break : Wrapping("break") + object NoWrap : Wrapping("nowrap") + + } } From a304dcf5df77b241e55f30001b6ebfc0267bb7d1 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 26 Jan 2022 13:37:59 +0600 Subject: [PATCH 3/3] fixes for build --- src/jsMain/kotlin/dev/inmo/jsuikit/elements/Spinner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Spinner.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Spinner.kt index c8f46b5..cb8dd69 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Spinner.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Spinner.kt @@ -23,4 +23,4 @@ fun Spinner( } @Composable -fun DefaultSpinner() = Spinner(UIKitAlign.Center, UIKitMargin.Small, UIKitText.Alignment.Center) +fun DefaultSpinner() = Spinner(UIKitAlign.Center, UIKitMargin.Small, UIKitText.Alignment.Horizontal.Center, UIKitText.Alignment.Vertical.Middle)