- add device language detection for both platforms and usage on app …

…init (#139) - remove bisqapps folder with its dead code
bisq-network · Dec 24, 2024 · 64ebdc2 · 64ebdc2
1 parent 896d1c9
commit 64ebdc2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 178 deletions.
diff --git a/...n/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/TakeOfferReviewTradeScreen.kt b/...n/kotlin/network/bisq/mobile/presentation/ui/uicases/offers/TakeOfferReviewTradeScreen.kt
diff --git a/...n/src/androidMain/kotlin/network/bisq/mobile/domain/PlatformDomainAbstractions.android.kt b/...n/src/androidMain/kotlin/network/bisq/mobile/domain/PlatformDomainAbstractions.android.kt
@@ -11,6 +11,11 @@ import androidx.compose.ui.graphics.asImageBitmap
 import com.russhwolf.settings.Settings
 import kotlinx.serialization.Serializable
 import java.io.ByteArrayOutputStream
+import java.util.Locale
+
+actual fun getDeviceLanguageCode(): String {
+    return Locale.getDefault().language
+}
 
 actual fun getPlatformSettings(): Settings {
     return Settings()

diff --git a/shared/domain/src/commonMain/kotlin/network/bisq/mobile/domain/PlatformDomainAbstractions.kt b/shared/domain/src/commonMain/kotlin/network/bisq/mobile/domain/PlatformDomainAbstractions.kt
@@ -17,6 +17,8 @@ interface PlatformInfo {
     val name: String
 }
 
+expect fun getDeviceLanguageCode(): String
+
 expect fun getPlatformInfo(): PlatformInfo
 
 @Serializable(with = PlatformImageSerializer::class)

diff --git a/...ed/domain/src/iosMain/kotlin/network/bisq/mobile/domain/PlatformDomainAbstractions.ios.kt b/...ed/domain/src/iosMain/kotlin/network/bisq/mobile/domain/PlatformDomainAbstractions.ios.kt
@@ -8,11 +8,12 @@ import com.russhwolf.settings.Settings
 import kotlinx.cinterop.*
 import kotlinx.serialization.Serializable
 import platform.Foundation.NSData
+import platform.Foundation.*
+import platform.UIKit.UIDevice
 import platform.UIKit.UIImage
 import platform.Foundation.create
 import platform.UIKit.UIImagePNGRepresentation
 
-import platform.UIKit.UIDevice
 import platform.posix.memcpy
 
 @OptIn(ExperimentalSettingsImplementation::class)
@@ -22,7 +23,11 @@ actual fun getPlatformSettings(): Settings {
     return KeychainSettings("Settings")
 }
 
-class IOSPlatformInfo: PlatformInfo {
+actual fun getDeviceLanguageCode(): String {
+    return NSLocale.currentLocale.languageCode ?: "en"
+}
+
+class IOSPlatformInfo : PlatformInfo {
     override val name: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion
 }
 

diff --git a/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/MainPresenter.kt b/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/MainPresenter.kt
@@ -2,14 +2,13 @@ package network.bisq.mobile.presentation
 
 import androidx.annotation.CallSuper
 import androidx.navigation.NavHostController
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import network.bisq.mobile.android.node.BuildNodeConfig
 import network.bisq.mobile.client.shared.BuildConfig
-import network.bisq.mobile.domain.data.BackgroundDispatcher
+import network.bisq.mobile.domain.getDeviceLanguageCode
 import network.bisq.mobile.domain.getPlatformInfo
 import network.bisq.mobile.domain.service.controller.NotificationServiceController
 import network.bisq.mobile.presentation.ui.AppPresenter
@@ -45,10 +44,12 @@ open class MainPresenter(private val notificationServiceController: Notification
     //    override val greetingText: StateFlow<String> = _greetingText
 
     init {
+        val localeCode = getDeviceLanguageCode()
         log.i { "Shared Version: ${BuildConfig.SHARED_LIBS_VERSION}" }
         log.i { "iOS Client Version: ${BuildConfig.IOS_APP_VERSION}" }
         log.i { "Android Client Version: ${BuildConfig.IOS_APP_VERSION}" }
         log.i { "Android Node Version: ${BuildNodeConfig.APP_VERSION}" }
+        log.i { "Device language code: $localeCode"}
     }
 
     @CallSuper