From 18ffabf76d9f674655f1e290a0eacf3ccc378074 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 3 Apr 2022 23:57:39 +0600 Subject: [PATCH 1/3] start 0.0.50 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ee0f2..f1b37f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.0.50 + ## 0.0.49 * Now it is possible to use optional title in navs builders diff --git a/gradle.properties b/gradle.properties index 8d0ae16..4f89d07 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ android.enableJetifier=true # Project data group=dev.inmo -version=0.0.49 +version=0.0.50 From 2ece25ef4e3ae62de6a2d134a3ee0570696b5b08 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sun, 3 Apr 2022 23:58:08 +0600 Subject: [PATCH 2/3] add opportunity to customize default header content of nav --- CHANGELOG.md | 2 ++ src/jsMain/kotlin/dev/inmo/jsuikit/elements/Nav.kt | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1b37f4..b2ad81a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.0.50 +* Add opportunity to customize content in title of `Nav` after text + ## 0.0.49 * Now it is possible to use optional title in navs builders diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Nav.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Nav.kt index 5ab17c7..e78f317 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Nav.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Nav.kt @@ -1,7 +1,6 @@ package dev.inmo.jsuikit.elements import androidx.compose.runtime.Composable -import androidx.compose.runtime.snapshots.SnapshotStateList import dev.inmo.jsuikit.buildAndAddAttribute import dev.inmo.jsuikit.modifiers.* import dev.inmo.jsuikit.utils.Milliseconds @@ -104,6 +103,7 @@ fun Nav( duration: Milliseconds? = null, besidesTitleAndList: ContentBuilder? = null, titleCustomizer: AttrBuilderContext = {}, + afterTitleBuilder: ContentBuilder = {}, ulCustomizer: AttrBuilderContext = {}, elementAllocator: @Composable ElementScope.(T) -> Unit ) { @@ -123,7 +123,8 @@ fun Nav( NavHeader( title, *titleModifiers, - attributesCustomizer = titleCustomizer + attributesCustomizer = titleCustomizer, + afterTitleContentBuilder = afterTitleBuilder ) } besidesTitleAndList ?.let { it() } @@ -145,6 +146,7 @@ fun DefaultNav( duration: Milliseconds? = null, besidesTitleAndList: ContentBuilder? = null, titleCustomizer: AttrBuilderContext = {}, + afterTitleBuilder: ContentBuilder = {}, ulCustomizer: AttrBuilderContext = {}, elementAllocator: @Composable ElementScope.(T) -> Unit ) = Nav( @@ -158,6 +160,7 @@ fun DefaultNav( duration, besidesTitleAndList, titleCustomizer, + afterTitleBuilder, ulCustomizer, elementAllocator ) @@ -174,6 +177,7 @@ fun PrimaryNav( duration: Milliseconds? = null, besidesTitleAndList: ContentBuilder? = null, titleCustomizer: AttrBuilderContext = {}, + afterTitleBuilder: ContentBuilder = {}, ulCustomizer: AttrBuilderContext = {}, elementAllocator: @Composable ElementScope.(T) -> Unit ) = Nav( @@ -187,6 +191,7 @@ fun PrimaryNav( duration, besidesTitleAndList, titleCustomizer, + afterTitleBuilder, ulCustomizer, elementAllocator ) @@ -203,6 +208,7 @@ fun SubNav( duration: Milliseconds? = null, besidesTitleAndList: ContentBuilder? = null, titleCustomizer: AttrBuilderContext = {}, + afterTitleBuilder: ContentBuilder = {}, ulCustomizer: AttrBuilderContext = {}, elementAllocator: @Composable ElementScope.(T) -> Unit ) = Nav( @@ -216,6 +222,7 @@ fun SubNav( duration, besidesTitleAndList, titleCustomizer, + afterTitleBuilder, ulCustomizer, elementAllocator ) @@ -225,6 +232,7 @@ fun NavHeader( text: String, vararg modifiers: UIKitModifier, attributesCustomizer: AttrBuilderContext = {}, + afterTitleContentBuilder: ContentBuilder = {} ) { Li( { @@ -233,6 +241,7 @@ fun NavHeader( } ) { Text(text) + afterTitleContentBuilder() } } From 3746b614cf61eff89a89bfea6f5c29c52520ee83 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 4 Apr 2022 00:07:33 +0600 Subject: [PATCH 3/3] rename new property --- .../kotlin/dev/inmo/jsuikit/elements/Nav.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Nav.kt b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Nav.kt index e78f317..0f083b7 100644 --- a/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Nav.kt +++ b/src/jsMain/kotlin/dev/inmo/jsuikit/elements/Nav.kt @@ -103,7 +103,7 @@ fun Nav( duration: Milliseconds? = null, besidesTitleAndList: ContentBuilder? = null, titleCustomizer: AttrBuilderContext = {}, - afterTitleBuilder: ContentBuilder = {}, + afterTitleContentBuilder: ContentBuilder = {}, ulCustomizer: AttrBuilderContext = {}, elementAllocator: @Composable ElementScope.(T) -> Unit ) { @@ -124,7 +124,7 @@ fun Nav( title, *titleModifiers, attributesCustomizer = titleCustomizer, - afterTitleContentBuilder = afterTitleBuilder + afterTitleContentBuilder = afterTitleContentBuilder ) } besidesTitleAndList ?.let { it() } @@ -146,7 +146,7 @@ fun DefaultNav( duration: Milliseconds? = null, besidesTitleAndList: ContentBuilder? = null, titleCustomizer: AttrBuilderContext = {}, - afterTitleBuilder: ContentBuilder = {}, + afterTitleContentBuilder: ContentBuilder = {}, ulCustomizer: AttrBuilderContext = {}, elementAllocator: @Composable ElementScope.(T) -> Unit ) = Nav( @@ -160,7 +160,7 @@ fun DefaultNav( duration, besidesTitleAndList, titleCustomizer, - afterTitleBuilder, + afterTitleContentBuilder, ulCustomizer, elementAllocator ) @@ -177,7 +177,7 @@ fun PrimaryNav( duration: Milliseconds? = null, besidesTitleAndList: ContentBuilder? = null, titleCustomizer: AttrBuilderContext = {}, - afterTitleBuilder: ContentBuilder = {}, + afterTitleContentBuilder: ContentBuilder = {}, ulCustomizer: AttrBuilderContext = {}, elementAllocator: @Composable ElementScope.(T) -> Unit ) = Nav( @@ -191,7 +191,7 @@ fun PrimaryNav( duration, besidesTitleAndList, titleCustomizer, - afterTitleBuilder, + afterTitleContentBuilder, ulCustomizer, elementAllocator ) @@ -208,7 +208,7 @@ fun SubNav( duration: Milliseconds? = null, besidesTitleAndList: ContentBuilder? = null, titleCustomizer: AttrBuilderContext = {}, - afterTitleBuilder: ContentBuilder = {}, + afterTitleContentBuilder: ContentBuilder = {}, ulCustomizer: AttrBuilderContext = {}, elementAllocator: @Composable ElementScope.(T) -> Unit ) = Nav( @@ -222,7 +222,7 @@ fun SubNav( duration, besidesTitleAndList, titleCustomizer, - afterTitleBuilder, + afterTitleContentBuilder, ulCustomizer, elementAllocator )