From cb56bf9793950b6c7f49d861f23fa4e9308c3c70 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Wed, 5 Nov 2025 12:29:33 +0600 Subject: [PATCH] Revert "add getCurrentLocale and compose translation" This reverts commit fce47897d5e2056633aac7eb8ce117726b4b69e6. --- .../language_codes/CurrentIetfLang.kt | 3 --- .../src/jsMain/kotlin/CurrentIetfLang.js.kt | 6 ----- .../src/jvmMain/kotlin/CurrentIetfLang.jvm.kt | 6 ----- .../kotlin/CurrentIetfLang.mingwX64.kt | 27 ------------------- .../kotlin/CurrentIetfLang.native.kt | 12 --------- .../kotlin/CurrentIetfLang.wasmJs.kt | 10 ------- resources/compose/build.gradle | 20 -------------- .../kotlin/GetCurrentLocale.android.kt | 24 ----------------- .../src/commonMain/kotlin/GetCurrentLocale.kt | 7 ----- .../kotlin/StringComposeTranslation.kt | 10 ------- .../src/jsMain/kotlin/GetCurrentLocale.js.kt | 9 ------- .../jvmMain/kotlin/GetCurrentLocale.jvm.kt | 10 ------- .../kotlin/GetCurrentLocale.native.kt | 9 ------- .../kotlin/GetCurrentLocale.wasmJs.kt | 9 ------- settings.gradle | 1 - 15 files changed, 163 deletions(-) delete mode 100644 language_codes/src/commonMain/kotlin/dev/inmo/micro_utils/language_codes/CurrentIetfLang.kt delete mode 100644 language_codes/src/jsMain/kotlin/CurrentIetfLang.js.kt delete mode 100644 language_codes/src/jvmMain/kotlin/CurrentIetfLang.jvm.kt delete mode 100644 language_codes/src/mingwX64Main/kotlin/CurrentIetfLang.mingwX64.kt delete mode 100644 language_codes/src/nativeMain/kotlin/CurrentIetfLang.native.kt delete mode 100644 language_codes/src/wasmJsMain/kotlin/CurrentIetfLang.wasmJs.kt delete mode 100644 resources/compose/build.gradle delete mode 100644 resources/compose/src/androidMain/kotlin/GetCurrentLocale.android.kt delete mode 100644 resources/compose/src/commonMain/kotlin/GetCurrentLocale.kt delete mode 100644 resources/compose/src/commonMain/kotlin/StringComposeTranslation.kt delete mode 100644 resources/compose/src/jsMain/kotlin/GetCurrentLocale.js.kt delete mode 100644 resources/compose/src/jvmMain/kotlin/GetCurrentLocale.jvm.kt delete mode 100644 resources/compose/src/nativeMain/kotlin/GetCurrentLocale.native.kt delete mode 100644 resources/compose/src/wasmJsMain/kotlin/GetCurrentLocale.wasmJs.kt diff --git a/language_codes/src/commonMain/kotlin/dev/inmo/micro_utils/language_codes/CurrentIetfLang.kt b/language_codes/src/commonMain/kotlin/dev/inmo/micro_utils/language_codes/CurrentIetfLang.kt deleted file mode 100644 index 33aac6f6a69..00000000000 --- a/language_codes/src/commonMain/kotlin/dev/inmo/micro_utils/language_codes/CurrentIetfLang.kt +++ /dev/null @@ -1,3 +0,0 @@ -package dev.inmo.micro_utils.language_codes - -expect val currentIetfLang: IetfLang? diff --git a/language_codes/src/jsMain/kotlin/CurrentIetfLang.js.kt b/language_codes/src/jsMain/kotlin/CurrentIetfLang.js.kt deleted file mode 100644 index 3fe613c6caf..00000000000 --- a/language_codes/src/jsMain/kotlin/CurrentIetfLang.js.kt +++ /dev/null @@ -1,6 +0,0 @@ -package dev.inmo.micro_utils.language_codes - -import kotlinx.browser.window - -actual val currentIetfLang: IetfLang? - get() = window.navigator.language.unsafeCast() ?.let { IetfLang(it) } \ No newline at end of file diff --git a/language_codes/src/jvmMain/kotlin/CurrentIetfLang.jvm.kt b/language_codes/src/jvmMain/kotlin/CurrentIetfLang.jvm.kt deleted file mode 100644 index 442391c4343..00000000000 --- a/language_codes/src/jvmMain/kotlin/CurrentIetfLang.jvm.kt +++ /dev/null @@ -1,6 +0,0 @@ -package dev.inmo.micro_utils.language_codes - -import java.util.Locale - -actual val currentIetfLang: IetfLang? - get() = Locale.getDefault() ?.toIetfLang() \ No newline at end of file diff --git a/language_codes/src/mingwX64Main/kotlin/CurrentIetfLang.mingwX64.kt b/language_codes/src/mingwX64Main/kotlin/CurrentIetfLang.mingwX64.kt deleted file mode 100644 index a8da465e759..00000000000 --- a/language_codes/src/mingwX64Main/kotlin/CurrentIetfLang.mingwX64.kt +++ /dev/null @@ -1,27 +0,0 @@ -package dev.inmo.micro_utils.language_codes - -import dev.inmo.micro_utils.language_codes.IetfLang -import kotlinx.cinterop.ExperimentalForeignApi -import kotlinx.cinterop.allocArray -import kotlinx.cinterop.memScoped -import kotlinx.cinterop.toKString -import platform.posix.getenv -import platform.windows.GetUserDefaultLocaleName -import platform.windows.LOCALE_NAME_MAX_LENGTH -import platform.windows.WCHARVar - -@OptIn(ExperimentalForeignApi::class) -actual val currentIetfLang: IetfLang? - get() { - val rawLocale = memScoped { - val buffer = allocArray(LOCALE_NAME_MAX_LENGTH) - val result = GetUserDefaultLocaleName(buffer, LOCALE_NAME_MAX_LENGTH) - - if (result > 0) { - // Convert WCHAR* to String - buffer.toKString() - } - "en-US" // fallback - } - return IetfLang(rawLocale) - } \ No newline at end of file diff --git a/language_codes/src/nativeMain/kotlin/CurrentIetfLang.native.kt b/language_codes/src/nativeMain/kotlin/CurrentIetfLang.native.kt deleted file mode 100644 index 4a4bbd14553..00000000000 --- a/language_codes/src/nativeMain/kotlin/CurrentIetfLang.native.kt +++ /dev/null @@ -1,12 +0,0 @@ -package dev.inmo.micro_utils.language_codes - -import kotlinx.cinterop.ExperimentalForeignApi -import kotlinx.cinterop.toKString -import platform.posix.getenv - -@OptIn(ExperimentalForeignApi::class) -actual val currentIetfLang: IetfLang? - get() { - val localeStr = getenv("LANG") ?.toKString() ?.replace("_", "-") ?: "en-US" - return IetfLang(localeStr) - } \ No newline at end of file diff --git a/language_codes/src/wasmJsMain/kotlin/CurrentIetfLang.wasmJs.kt b/language_codes/src/wasmJsMain/kotlin/CurrentIetfLang.wasmJs.kt deleted file mode 100644 index 76eac9b9d2a..00000000000 --- a/language_codes/src/wasmJsMain/kotlin/CurrentIetfLang.wasmJs.kt +++ /dev/null @@ -1,10 +0,0 @@ -package dev.inmo.micro_utils.language_codes - -external interface Navigator { - val language: String -} - -external val navigator: Navigator - -actual val currentIetfLang: IetfLang? - get() = IetfLang(navigator.language) \ No newline at end of file diff --git a/resources/compose/build.gradle b/resources/compose/build.gradle deleted file mode 100644 index b0db99d9ade..00000000000 --- a/resources/compose/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -plugins { - id "org.jetbrains.kotlin.multiplatform" - id "org.jetbrains.kotlin.plugin.serialization" - id "com.android.library" - alias(libs.plugins.jb.compose) - alias(libs.plugins.kt.jb.compose) -} - -apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project" - -kotlin { - sourceSets { - commonMain { - dependencies { - api libs.kt.coroutines - api project(":micro_utils.resources") - } - } - } -} diff --git a/resources/compose/src/androidMain/kotlin/GetCurrentLocale.android.kt b/resources/compose/src/androidMain/kotlin/GetCurrentLocale.android.kt deleted file mode 100644 index 7de2304b005..00000000000 --- a/resources/compose/src/androidMain/kotlin/GetCurrentLocale.android.kt +++ /dev/null @@ -1,24 +0,0 @@ -package dev.inmo.micro_utils.resources.compose - -import android.os.Build -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalConfiguration -import dev.inmo.micro_utils.language_codes.IetfLang -import dev.inmo.micro_utils.language_codes.toIetfLang - -@Composable -actual fun getCurrentLocale(): IetfLang? { - val configuration = LocalConfiguration.current - - val locale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - if (configuration.locales.isEmpty) { - return null - } - configuration.locales.get(0) - } else { - @Suppress("DEPRECATION") - configuration.locale - } - - return locale.toIetfLang() -} \ No newline at end of file diff --git a/resources/compose/src/commonMain/kotlin/GetCurrentLocale.kt b/resources/compose/src/commonMain/kotlin/GetCurrentLocale.kt deleted file mode 100644 index 1c6d1109bb1..00000000000 --- a/resources/compose/src/commonMain/kotlin/GetCurrentLocale.kt +++ /dev/null @@ -1,7 +0,0 @@ -package dev.inmo.micro_utils.resources.compose - -import androidx.compose.runtime.Composable -import dev.inmo.micro_utils.language_codes.IetfLang - -@Composable -expect fun getCurrentLocale(): IetfLang? diff --git a/resources/compose/src/commonMain/kotlin/StringComposeTranslation.kt b/resources/compose/src/commonMain/kotlin/StringComposeTranslation.kt deleted file mode 100644 index c248767a8bd..00000000000 --- a/resources/compose/src/commonMain/kotlin/StringComposeTranslation.kt +++ /dev/null @@ -1,10 +0,0 @@ -package dev.inmo.micro_utils.resources.compose - -import androidx.compose.runtime.Composable -import dev.inmo.micro_utils.strings.StringResource - -@Suppress("unused") -@Composable -fun StringResource.composeTranslation(): String { - return translation(getCurrentLocale()) -} diff --git a/resources/compose/src/jsMain/kotlin/GetCurrentLocale.js.kt b/resources/compose/src/jsMain/kotlin/GetCurrentLocale.js.kt deleted file mode 100644 index 736ea39582b..00000000000 --- a/resources/compose/src/jsMain/kotlin/GetCurrentLocale.js.kt +++ /dev/null @@ -1,9 +0,0 @@ -package dev.inmo.micro_utils.resources.compose - -import dev.inmo.micro_utils.language_codes.IetfLang -import dev.inmo.micro_utils.language_codes.currentIetfLang - -@androidx.compose.runtime.Composable -actual fun getCurrentLocale(): IetfLang? { - return currentIetfLang -} \ No newline at end of file diff --git a/resources/compose/src/jvmMain/kotlin/GetCurrentLocale.jvm.kt b/resources/compose/src/jvmMain/kotlin/GetCurrentLocale.jvm.kt deleted file mode 100644 index f17a2468f5d..00000000000 --- a/resources/compose/src/jvmMain/kotlin/GetCurrentLocale.jvm.kt +++ /dev/null @@ -1,10 +0,0 @@ -package dev.inmo.micro_utils.resources.compose - -import androidx.compose.ui.text.intl.Locale -import dev.inmo.micro_utils.language_codes.IetfLang -import dev.inmo.micro_utils.language_codes.currentIetfLang - -@androidx.compose.runtime.Composable -actual fun getCurrentLocale(): IetfLang? { - return currentIetfLang -} \ No newline at end of file diff --git a/resources/compose/src/nativeMain/kotlin/GetCurrentLocale.native.kt b/resources/compose/src/nativeMain/kotlin/GetCurrentLocale.native.kt deleted file mode 100644 index 736ea39582b..00000000000 --- a/resources/compose/src/nativeMain/kotlin/GetCurrentLocale.native.kt +++ /dev/null @@ -1,9 +0,0 @@ -package dev.inmo.micro_utils.resources.compose - -import dev.inmo.micro_utils.language_codes.IetfLang -import dev.inmo.micro_utils.language_codes.currentIetfLang - -@androidx.compose.runtime.Composable -actual fun getCurrentLocale(): IetfLang? { - return currentIetfLang -} \ No newline at end of file diff --git a/resources/compose/src/wasmJsMain/kotlin/GetCurrentLocale.wasmJs.kt b/resources/compose/src/wasmJsMain/kotlin/GetCurrentLocale.wasmJs.kt deleted file mode 100644 index 736ea39582b..00000000000 --- a/resources/compose/src/wasmJsMain/kotlin/GetCurrentLocale.wasmJs.kt +++ /dev/null @@ -1,9 +0,0 @@ -package dev.inmo.micro_utils.resources.compose - -import dev.inmo.micro_utils.language_codes.IetfLang -import dev.inmo.micro_utils.language_codes.currentIetfLang - -@androidx.compose.runtime.Composable -actual fun getCurrentLocale(): IetfLang? { - return currentIetfLang -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index d1f109f6560..99d4168788a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -50,7 +50,6 @@ String[] includes = [ ":colors:common", ":resources", - ":resources:compose", ":fsm:common", ":fsm:repos:common",