add getCurrentLocale and compose translation

0.26.6

CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## 0.26.7
+
+## 0.26.6
+
+* `Versions`:
+    * `Ktor`: `3.3.0` -> `3.3.1`
+    * `Okio`: `3.16.0` -> `3.16.2`
+
+## 0.26.5
+
+* `Versions`:
+    * `Kotlin`: `2.2.10` -> `2.2.20`
+    * `KSLog`: `1.5.0` -> `1.5.1`
+    * `Ktor`: `3.2.3` -> `3.3.0`
+    * `KotlinX Browser`: `0.3` -> `0.5.0`
+    * `Koin`: `4.1.0` -> `4.1.1`
+
+## 0.26.4
+
+* `Common`:
+  * Add expect/actual `MPPFilePathSeparator`
+  * Fix `FileName` realization to take care about system file path separator
+
+## 0.26.3
+
+* `Versions`:
+  * `Kotlin`: `2.2.0` -> `2.2.10`
+  * `KSP`: `2.2.0-2.0.2` -> `2.2.10-2.0.2`
+  * `Android CoreKTX`: `1.16.0` -> `1.17.0`
+  * `Android Fragment`: `1.8.8` -> `1.8.9`
+
 ## 0.26.2
 
 * `Versions`:

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/MPPFile.kt

@@ -7,7 +7,7 @@ import kotlin.jvm.JvmInline
 @JvmInline
 value class FileName(val string: String) {
     val name: String
-        get() = withoutSlashAtTheEnd.takeLastWhile { it != '/' }
+        get() = withoutSlashAtTheEnd.takeLastWhile { it != MPPFilePathSeparator }
     val extension: String
         get() = name.takeLastWhile { it != '.' }
     val nameWithoutExtension: String
@@ -18,7 +18,7 @@ value class FileName(val string: String) {
             } ?: filename
         }
     val withoutSlashAtTheEnd: String
-        get() = string.dropLastWhile { it == '/' }
+        get() = string.dropLastWhile { it == MPPFilePathSeparator }
     override fun toString(): String = string
 }
 
@@ -26,6 +26,7 @@ value class FileName(val string: String) {
 expect class MPPFile
 
 expect val MPPFile.filename: FileName
+expect val MPPFilePathSeparator: Char
 expect val MPPFile.filesize: Long
 expect val MPPFile.bytesAllocatorSync: ByteArrayAllocator
 expect val MPPFile.bytesAllocator: SuspendByteArrayAllocator

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/JSMPPFile.kt

@@ -35,6 +35,10 @@ private suspend fun MPPFile.dirtyReadBytes(): ByteArray = readBytesPromise().awa
  */
 actual val MPPFile.filename: FileName
     get() = FileName(name)
+
+actual val MPPFilePathSeparator: Char
+    get() = '/'
+
 /**
  * @suppress
  */

common/src/jvmMain/kotlin/dev/inmo/micro_utils/common/JVMMPPFile.kt

@@ -14,6 +14,10 @@ actual typealias MPPFile = File
  */
 actual val MPPFile.filename: FileName
     get() = FileName(name)
+
+actual val MPPFilePathSeparator: Char
+    get() = File.separatorChar
+
 /**
  * @suppress
  */

common/src/nativeMain/kotlin/ActualMPPFile.kt

@@ -11,6 +11,10 @@ actual typealias MPPFile = Path
  */
 actual val MPPFile.filename: FileName
     get() = FileName(toString())
+
+
+actual val MPPFilePathSeparator: Char = Path.DIRECTORY_SEPARATOR.first()
+
 /**
  * @suppress
  */

common/src/wasmJsMain/kotlin/dev/inmo/micro_utils/common/JSMPPFile.kt

@@ -37,6 +37,10 @@ private suspend fun MPPFile.dirtyReadBytes(): ByteArray = readBytesPromise().awa
  */
 actual val MPPFile.filename: FileName
     get() = FileName(name)
+
+actual val MPPFilePathSeparator: Char
+    get() = '/'
+
 /**
  * @suppress
  */

gradle.properties

@@ -18,5 +18,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.26.2
+version=0.26.7
-android_code_version=301
+android_code_version=306

gradle/libs.versions.toml

@@ -1,43 +1,44 @@
 [versions]
 
-kt = "2.2.0"
+kt = "2.2.20"
 kt-serialization = "1.9.0"
 kt-coroutines = "1.10.2"
 
-kotlinx-browser = "0.3"
+kotlinx-browser = "0.5.0"
 
-kslog = "1.5.0"
+kslog = "1.5.1"
 
 jb-compose = "1.8.2"
 jb-exposed = "0.61.0"
-jb-dokka = "2.0.0"
+jb-dokka = "2.1.0"
 
+# 3.50.3.0 contains bug https://github.com/InsanusMokrassar/MicroUtils/actions/runs/18138301958/job/51629588088
 sqlite = "3.50.1.0"
 
 korlibs = "5.4.0"
 uuid = "0.8.4"
 
-ktor = "3.2.3"
+ktor = "3.3.1"
 
 gh-release = "2.5.2"
 
-koin = "4.1.0"
+koin = "4.1.1"
 
-okio = "3.16.0"
+okio = "3.16.2"
 
-ksp = "2.2.0-2.0.2"
+ksp = "2.2.20-2.0.3"
 kotlin-poet = "2.2.0"
 
 versions = "0.52.0"
-nmcp = "1.0.2"
+nmcp = "1.1.0"
 
-android-gradle = "8.9.+"
+android-gradle = "8.10.+"
 dexcount = "4.0.0"
 
-android-coreKtx = "1.16.0"
+android-coreKtx = "1.17.0"
 android-recyclerView = "1.4.0"
 android-appCompat = "1.7.1"
-android-fragment = "1.8.8"
+android-fragment = "1.8.9"
 android-espresso = "3.7.0"
 android-test = "1.3.0"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

language_codes/src/commonMain/kotlin/dev/inmo/micro_utils/language_codes/CurrentIetfLang.kt

@@ -0,0 +1,3 @@
+package dev.inmo.micro_utils.language_codes
+
+expect val currentIetfLang: IetfLang?

language_codes/src/jsMain/kotlin/CurrentIetfLang.js.kt

@@ -0,0 +1,6 @@
+package dev.inmo.micro_utils.language_codes
+
+import kotlinx.browser.window
+
+actual val currentIetfLang: IetfLang?
+    get() = window.navigator.language.unsafeCast<String?>() ?.let { IetfLang(it) }

language_codes/src/jvmMain/kotlin/CurrentIetfLang.jvm.kt

@@ -0,0 +1,6 @@
+package dev.inmo.micro_utils.language_codes
+
+import java.util.Locale
+
+actual val currentIetfLang: IetfLang?
+    get() = Locale.getDefault() ?.toIetfLang()

language_codes/src/mingwX64Main/kotlin/CurrentIetfLang.mingwX64.kt

@@ -0,0 +1,27 @@
+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<WCHARVar>(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)
+    }

language_codes/src/nativeMain/kotlin/CurrentIetfLang.native.kt

@@ -0,0 +1,12 @@
+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)
+    }

language_codes/src/wasmJsMain/kotlin/CurrentIetfLang.wasmJs.kt

@@ -0,0 +1,10 @@
+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)

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedTableInitialization.kt

@@ -1,10 +1,81 @@
 package dev.inmo.micro_utils.repos.exposed
 
 import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.SchemaUtils.addMissingColumnsStatements
+import org.jetbrains.exposed.sql.SchemaUtils.checkMappingConsistence
+import org.jetbrains.exposed.sql.SchemaUtils.createStatements
+import org.jetbrains.exposed.sql.transactions.TransactionManager
 import org.jetbrains.exposed.sql.transactions.transaction
 
+/**
+ * Code in this function mostly duplicates Exposed [SchemaUtils.createMissingTablesAndColumns]. It made due to deprecation
+ * status of the last one and potential lost of it in future updates.
+ *
+ * Code doing:
+ *
+ * * Creating missed tables
+ * * Altering missed tables (where possible)
+ * * Calculate problems with [checkMappingConsistence] and add them in execution too
+ *
+ * All changes made in [transaction] with [database] as its `db` argument
+ */
+fun initTablesInTransaction(vararg tables: Table, database: Database, inBatch: Boolean = false, withLogs: Boolean = true) {
+    transaction(database) {
+        fun <R> logTimeSpent(message: String, withLogs: Boolean, block: () -> R): R {
+            return if (withLogs) {
+                val start = System.currentTimeMillis()
+                val answer = block()
+                exposedLogger.info(message + " took " + (System.currentTimeMillis() - start) + "ms")
+                answer
+            } else {
+                block()
+            }
+        }
+        fun Transaction.execStatements(inBatch: Boolean, statements: List<String>) {
+            if (inBatch) {
+                execInBatch(statements)
+            } else {
+                for (statement in statements) {
+                    exec(statement)
+                }
+            }
+        }
+        with(TransactionManager.current()) {
+            db.dialect.resetCaches()
+            val createStatements = logTimeSpent("Preparing create tables statements", withLogs) {
+                createStatements(*tables)
+            }
+            logTimeSpent("Executing create tables statements", withLogs) {
+                execStatements(inBatch, createStatements)
+                commit()
+            }
+
+            val alterStatements = logTimeSpent("Preparing alter table statements", withLogs) {
+                addMissingColumnsStatements(tables = tables, withLogs)
+            }
+            logTimeSpent("Executing alter table statements", withLogs) {
+                execStatements(inBatch, alterStatements)
+                commit()
+            }
+            val executedStatements = createStatements + alterStatements
+            logTimeSpent("Checking mapping consistence", withLogs) {
+                val modifyTablesStatements = checkMappingConsistence(
+                    tables = tables,
+                    withLogs
+                ).filter { it !in executedStatements }
+                execStatements(inBatch, modifyTablesStatements)
+                commit()
+            }
+            db.dialect.resetCaches()
+        }
+    }
+}
+
+fun Table.initTable(database: Database, inBatch: Boolean, withLogs: Boolean) {
+    initTablesInTransaction(this, database = database, inBatch = inBatch, withLogs = withLogs)
+}
 fun Table.initTable(database: Database) {
-    transaction(database) { SchemaUtils.createMissingTablesAndColumns(this@initTable) }
+    initTable(database = database, inBatch = false, withLogs = true)
 }
 
 fun <T> T.initTable() where T: ExposedRepo, T: Table = initTable(database)

resources/compose/build.gradle

@@ -0,0 +1,20 @@
+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")
+            }
+        }
+    }
+}

resources/compose/src/androidMain/kotlin/GetCurrentLocale.android.kt

@@ -0,0 +1,24 @@
+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()
+}

resources/compose/src/commonMain/kotlin/GetCurrentLocale.kt

@@ -0,0 +1,7 @@
+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?

resources/compose/src/commonMain/kotlin/StringComposeTranslation.kt

@@ -0,0 +1,10 @@
+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())
+}

resources/compose/src/jsMain/kotlin/GetCurrentLocale.js.kt

@@ -0,0 +1,9 @@
+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
+}

resources/compose/src/jvmMain/kotlin/GetCurrentLocale.jvm.kt

@@ -0,0 +1,10 @@
+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
+}

resources/compose/src/nativeMain/kotlin/GetCurrentLocale.native.kt

@@ -0,0 +1,9 @@
+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
+}

resources/compose/src/wasmJsMain/kotlin/GetCurrentLocale.wasmJs.kt

@@ -0,0 +1,9 @@
+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
+}

settings.gradle

@@ -50,6 +50,7 @@ String[] includes = [
     ":colors:common",
 
     ":resources",
+    ":resources:compose",
 
     ":fsm:common",
     ":fsm:repos:common",