Use CommonMain in data module, use multiplatform locale library

android/build.gradle.kts

@@ -84,6 +84,7 @@ dependencies {
     // Localization
     implementation(libs.moko.core)
     implementation(libs.moko.compose)
+    implementation(libs.locale)
 
     // Testing
     testImplementation(kotlin("test-junit"))

core/build.gradle.kts

@@ -47,6 +47,7 @@ kotlin {
                 api(libs.multiplatformSettings.core)
                 api(libs.multiplatformSettings.coroutines)
                 api(libs.multiplatformSettings.serialization)
+                api(libs.locale)
             }
         }
         val commonTest by getting {

core/src/commonMain/kotlin/ca/gosyer/core/lang/Locale.kt

@@ -0,0 +1,11 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ca.gosyer.core.lang
+
+import io.fluidsonic.locale.Locale
+
+expect fun Locale.Companion.getDefault(): Locale

core/src/jvmMain/kotlin/ca/gosyer/core/lang/JvmLocale.kt

@@ -0,0 +1,13 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ca.gosyer.core.lang
+
+import io.fluidsonic.locale.Locale
+import io.fluidsonic.locale.toCommon
+import java.util.Locale as PlatformLocale
+
+actual fun Locale.Companion.getDefault(): Locale = PlatformLocale.getDefault().toCommon()

data/build.gradle.kts

@@ -45,6 +45,7 @@ kotlin {
                 api(libs.okio)
                 api(projects.core)
                 api(projects.i18n)
+                api(libs.locale)
             }
         }
         val commonTest by getting {

data/src/commonMain/kotlin/ca/gosyer/data/base/WebsocketService.kt

@@ -51,7 +51,7 @@ abstract class WebsocketService(
                 while (true) {
                     if (errorConnectionCount > 3) {
                         _status.value = Status.STOPPED
-                        throw CancellationException()
+                        throw CancellationException("Finish")
                     }
                     runCatching {
                         client.ws(

data/src/commonMain/kotlin/ca/gosyer/data/catalog/CatalogPreferences.kt

@@ -6,14 +6,15 @@
 
 package ca.gosyer.data.catalog
 
+import ca.gosyer.core.lang.getDefault
 import ca.gosyer.core.prefs.Preference
 import ca.gosyer.core.prefs.PreferenceStore
 import ca.gosyer.data.library.model.DisplayMode
-import java.util.Locale
+import io.fluidsonic.locale.Locale
 
 class CatalogPreferences(private val preferenceStore: PreferenceStore) {
     fun languages(): Preference<Set<String>> {
-        return preferenceStore.getStringSet("enabled_langs", setOf("en", Locale.getDefault().language))
+        return preferenceStore.getStringSet("enabled_langs", setOfNotNull("en", Locale.getDefault().language))
     }
 
     fun displayMode(): Preference<DisplayMode> {

data/src/commonMain/kotlin/ca/gosyer/data/extension/ExtensionPreferences.kt

@@ -6,12 +6,13 @@
 
 package ca.gosyer.data.extension
 
+import ca.gosyer.core.lang.getDefault
 import ca.gosyer.core.prefs.Preference
 import ca.gosyer.core.prefs.PreferenceStore
-import java.util.Locale
+import io.fluidsonic.locale.Locale
 
 class ExtensionPreferences(private val preferenceStore: PreferenceStore) {
     fun languages(): Preference<Set<String>> {
-        return preferenceStore.getStringSet("enabled_langs", setOf("all", "en", Locale.getDefault().language))
+        return preferenceStore.getStringSet("enabled_langs", setOfNotNull("all", "en", Locale.getDefault().language))
     }
 }

data/src/commonMain/kotlin/ca/gosyer/data/server/HttpClient.kt

@@ -11,8 +11,6 @@ import ca.gosyer.data.server.model.Auth
 import ca.gosyer.data.server.model.Proxy
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.ProxyBuilder
-import io.ktor.client.engine.ProxyConfig
-import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.features.auth.providers.BasicAuthCredentials
 import io.ktor.client.features.auth.providers.DigestAuthCredentials
 import io.ktor.client.features.auth.providers.basic
@@ -31,10 +29,10 @@ typealias Http = HttpClient
 
 class HttpProvider @Inject constructor() {
     fun get(serverPreferences: ServerPreferences): Http {
-        return HttpClient(OkHttp) {
+        return HttpClient {
             engine {
                 proxy = when (serverPreferences.proxy().get()) {
-                    Proxy.NO_PROXY -> ProxyConfig.NO_PROXY
+                    Proxy.NO_PROXY -> null
                     Proxy.HTTP_PROXY -> ProxyBuilder.http(
                         URLBuilder(
                             host = serverPreferences.proxyHttpHost().get(),

data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/BackupInteractionHandler.kt

@@ -6,6 +6,8 @@
 
 package ca.gosyer.data.server.interactions
 
+import ca.gosyer.core.io.SYSTEM
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.models.BackupValidationResult
 import ca.gosyer.data.server.Http
 import ca.gosyer.data.server.ServerPreferences

data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/CategoryInteractionHandler.kt

@@ -6,6 +6,7 @@
 
 package ca.gosyer.data.server.interactions
 
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.models.Category
 import ca.gosyer.data.models.Manga
 import ca.gosyer.data.server.Http

data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/ChapterInteractionHandler.kt

@@ -6,6 +6,7 @@
 
 package ca.gosyer.data.server.interactions
 
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.models.Chapter
 import ca.gosyer.data.models.Manga
 import ca.gosyer.data.server.Http

data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/DownloadInteractionHandler.kt

@@ -6,6 +6,7 @@
 
 package ca.gosyer.data.server.interactions
 
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.server.Http
 import ca.gosyer.data.server.ServerPreferences
 import ca.gosyer.data.server.requests.downloadsClearRequest

data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/ExtensionInteractionHandler.kt

@@ -6,6 +6,7 @@
 
 package ca.gosyer.data.server.interactions
 
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.models.Extension
 import ca.gosyer.data.server.Http
 import ca.gosyer.data.server.ServerPreferences

data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/LibraryInteractionHandler.kt

@@ -6,6 +6,7 @@
 
 package ca.gosyer.data.server.interactions
 
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.models.Manga
 import ca.gosyer.data.server.Http
 import ca.gosyer.data.server.ServerPreferences

data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/MangaInteractionHandler.kt

@@ -6,6 +6,7 @@
 
 package ca.gosyer.data.server.interactions
 
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.models.Manga
 import ca.gosyer.data.server.Http
 import ca.gosyer.data.server.ServerPreferences

data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/SourceInteractionHandler.kt

@@ -6,6 +6,7 @@
 
 package ca.gosyer.data.server.interactions
 
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.models.MangaPage
 import ca.gosyer.data.models.Source
 import ca.gosyer.data.models.sourcefilters.SourceFilter

data/src/commonMain/kotlin/ca/gosyer/data/server/interactions/UpdatesInteractionHandler.kt

@@ -6,6 +6,7 @@
 
 package ca.gosyer.data.server.interactions
 
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.models.Category
 import ca.gosyer.data.models.Updates
 import ca.gosyer.data.server.Http

data/src/commonMain/kotlin/ca/gosyer/data/update/UpdateChecker.kt

@@ -6,6 +6,7 @@
 
 package ca.gosyer.data.update
 
+import ca.gosyer.core.lang.IO
 import ca.gosyer.data.build.BuildKonfig
 import ca.gosyer.data.server.Http
 import ca.gosyer.data.update.model.GithubRelease

desktop/build.gradle.kts

@@ -85,6 +85,7 @@ dependencies {
     // Localization
     implementation(libs.moko.core)
     implementation(libs.moko.compose)
+    implementation(libs.locale)
 
     // Testing
     testImplementation(kotlin("test-junit"))

gradle/libs.versions.toml

@@ -52,6 +52,7 @@ kroki = "1.22"
 desugarJdkLibs = "1.1.5"
 
 # Localization
+locale = "0.11.0"
 moko = "0.18.0"
 
 # BuildConfigs
@@ -140,6 +141,7 @@ desugarJdkLibs = { module = "com.android.tools:desugar_jdk_libs", version.ref =
 # Localization
 moko-core = { module = "dev.icerock.moko:resources", version.ref = "moko" }
 moko-compose = { module = "dev.icerock.moko:resources-compose", version.ref = "moko" }
+locale = { module = "io.fluidsonic.locale:fluid-locale", version.ref = "locale" }
 
 # Optimizer
 proguard = { module = "com.guardsquare:proguard-gradle", version.ref = "proguard" }

presentation/build.gradle.kts

@@ -50,6 +50,7 @@ kotlin {
                 api(libs.accompanist.pagerIndicators)
                 api(libs.accompanist.flowLayout)
                 api(libs.krokiCoroutines)
+                api(libs.locale)
                 api(projects.core)
                 api(projects.i18n)
                 api(projects.data)

ui-core/build.gradle.kts

@@ -39,6 +39,7 @@ kotlin {
                 api(libs.coroutines.core)
                 api(libs.kamel)
                 api(libs.voyager.core)
+                api(libs.locale)
                 api(projects.core)
                 api(projects.i18n)
                 api(compose.desktop.currentOs)