From 2369def5c0af51ded87ed521c18833fa60b6ad8a Mon Sep 17 00:00:00 2001 From: PanMobile Date: Thu, 5 Feb 2026 15:02:01 +0300 Subject: [PATCH 1/3] =?UTF-8?q?ANDR-83:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20kotlinx.collections.immutable=20?= =?UTF-8?q?=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 776d5c21..00f8973c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,6 +30,7 @@ jsoup = "1.17.2" shimmer = "1.3.3" uiToolingPreviewAndroid = "1.8.3" runtime = "1.9.0" +immutableCollections = "0.4.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -66,6 +67,9 @@ koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = #COIL coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } +#Immutable Collections +immutable-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "immutableCollections" } + #Jsoup jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" } From de6eb11d4a973aaa99caf731e40780729733dae3 Mon Sep 17 00:00:00 2001 From: PanMobile Date: Thu, 5 Feb 2026 15:03:21 +0300 Subject: [PATCH 2/3] =?UTF-8?q?ANDR-83:=20TextOrResource.kt=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20=D0=BF=D0=BE=D0=BC=D0=B5=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BA=D0=B0=D0=BA=20@Immutable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/ru/yeahub/core_utils/common/TextOrResource.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/utils/src/main/java/ru/yeahub/core_utils/common/TextOrResource.kt b/core/utils/src/main/java/ru/yeahub/core_utils/common/TextOrResource.kt index be109914..23b55a3f 100644 --- a/core/utils/src/main/java/ru/yeahub/core_utils/common/TextOrResource.kt +++ b/core/utils/src/main/java/ru/yeahub/core_utils/common/TextOrResource.kt @@ -1,7 +1,9 @@ package ru.yeahub.core_utils.common import android.content.Context +import androidx.compose.runtime.Immutable +@Immutable sealed class TextOrResource { data class Text(val text: String) : TextOrResource() data class Resource(val resource: Int) : TextOrResource() From 6c487ef5733c02a72c4a09cc9a0394dfc6f9ebba Mon Sep 17 00:00:00 2001 From: PanMobile Date: Thu, 5 Feb 2026 15:07:29 +0300 Subject: [PATCH 3/3] =?UTF-8?q?ANDR-83:=20SkillButton.kt=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD.=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=B0=D1=8F=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BB=D0=B8=D0=B2=D0=BA=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8/=D0=BD=D0=B0=D0=B6=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20=D0=BD=D0=B5=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/yeahub/core_ui/component/SkillButton.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/SkillButton.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/SkillButton.kt index 8294368a..83cb838b 100644 --- a/core/ui/src/main/java/ru/yeahub/core_ui/component/SkillButton.kt +++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/SkillButton.kt @@ -138,12 +138,9 @@ fun DefaultButton( val onSurfaceClick: () -> Unit = { if (fillButton) { - newContainerColor = if (newContainerColor == defaultColor) { - purple - } else { - defaultColor - } - newContentColor = if (newContentColor == black) { + showBorder = !showBorder + + newContentColor = if (showBorder) { defaultColor } else { black @@ -163,6 +160,7 @@ fun DefaultButton( } val border = when { showBorder && !fillButton && !buttonWithoutBackground -> activeBorder() + fillButton && enabled && activeButton -> activeBorder() fillButton && enabled -> null buttonWithoutBackground -> null else -> defaultsBorder() @@ -171,7 +169,7 @@ fun DefaultButton( if (newContentColor == black && buttonWithoutBackground && activeButton) { purple } else if (newContentColor == black && fillButton && activeButton) { - defaultColor + black } else { newContentColor } @@ -182,7 +180,7 @@ fun DefaultButton( enabled = enabled, shape = shape, color = if (activeButton && fillButton) { - purple + defaultColor } else { if (buttonWithoutBackground) Color.Transparent else newContainerColor },