Merge pull request #1637 from DimensionDev/feature/localized_formatter

update formatter

Author: Tlaster

compose-ui/build.gradle.kts

@@ -81,7 +81,6 @@ kotlin {
                 implementation(libs.fluent.ui)
                 implementation(libs.koin.compose)
                 implementation(libs.androidx.collection)
-                implementation(libs.prettytime)
             }
         }
         val iosMain by getting {

compose-ui/src/androidMain/kotlin/dev/dimension/flare/ui/component/DateTimeText.android.kt

@@ -2,7 +2,6 @@ package dev.dimension.flare.ui.component
 
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.saveable.SaverScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextLayoutResult
@@ -17,14 +16,6 @@ import androidx.compose.ui.unit.TextUnit
 import dev.dimension.flare.ui.component.platform.PlatformText
 import dev.dimension.flare.ui.component.platform.PlatformTextStyle
 import dev.dimension.flare.ui.render.UiDateTime
-import dev.dimension.flare.ui.render.toUi
-import kotlin.time.Instant
-
-@Composable
-internal expect fun rememberFormattedDateTime(
-    data: UiDateTime,
-    fullTime: Boolean = false,
-): String
 
 @Composable
 public fun DateTimeText(
@@ -48,10 +39,13 @@ public fun DateTimeText(
     style: TextStyle = PlatformTextStyle.current,
     fullTime: Boolean = false,
 ) {
-    val text = rememberFormattedDateTime(data, fullTime)
-
     PlatformText(
-        text = text,
+        text =
+            if (fullTime) {
+                data.full
+            } else {
+                data.relative
+            },
         modifier = modifier,
         color = color,
         fontSize = fontSize,
@@ -71,9 +65,3 @@ public fun DateTimeText(
         style = style,
     )
 }
-
-internal data object UiDateTimeSaver : androidx.compose.runtime.saveable.Saver<UiDateTime, Long> {
-    override fun restore(value: Long): UiDateTime? = Instant.fromEpochMilliseconds(value).toUi()
-
-    override fun SaverScope.save(value: UiDateTime): Long = value.value.toEpochMilliseconds()
-}

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/DateTimeText.kt

@@ -124,7 +124,6 @@ import dev.dimension.flare.ui.component.platform.PlatformText
 import dev.dimension.flare.ui.component.platform.PlatformTextButton
 import dev.dimension.flare.ui.component.platform.PlatformTextStyle
 import dev.dimension.flare.ui.component.platform.placeholder
-import dev.dimension.flare.ui.component.rememberFormattedDateTime
 import dev.dimension.flare.ui.model.ClickContext
 import dev.dimension.flare.ui.model.Digit
 import dev.dimension.flare.ui.model.UiCard
@@ -1138,13 +1137,11 @@ private fun StatusPollComponent(
             )
         } else {
             poll.expiredAt?.let { expiredAt ->
-                val localizedExpiredTimeline =
-                    rememberFormattedDateTime(expiredAt, fullTime = true)
                 PlatformText(
                     text =
                         stringResource(
                             resource = Res.string.poll_expired_at,
-                            localizedExpiredTimeline,
+                            expiredAt.full,
                         ),
                     modifier =
                         Modifier

compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt

@@ -8,23 +8,30 @@ import dev.dimension.flare.common.InAppNotification
 import dev.dimension.flare.common.Message
 import dev.dimension.flare.data.network.ktorClient
 import dev.dimension.flare.di.KoinHelper
+import dev.dimension.flare.ui.humanizer.SwiftFormatter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.core.context.startKoin
-import org.koin.dsl.binds
+import org.koin.dsl.bind
 import org.koin.dsl.module
 
 public object ComposeUIHelper {
-    public fun initialize(inAppNotification: InAppNotification) {
+    public fun initialize(
+        inAppNotification: InAppNotification,
+        swiftFormatter: SwiftFormatter,
+    ) {
         startKoin {
             modules(KoinHelper.modules())
             modules(
                 module {
                     single {
                         ProxyInAppNotification(inAppNotification, get())
-                    } binds arrayOf(InAppNotification::class)
+                    } bind InAppNotification::class
+                    single {
+                        swiftFormatter
+                    } bind SwiftFormatter::class
                 },
             )
             modules(dev.dimension.flare.di.composeUiModule)

compose-ui/src/iosMain/kotlin/dev/dimension/flare/ui/controllers/ComposeUIHelper.kt

@@ -36,7 +36,7 @@ import dev.dimension.flare.data.model.Theme
 import dev.dimension.flare.data.repository.SettingsRepository
 import dev.dimension.flare.ui.component.ComponentAppearance
 import dev.dimension.flare.ui.component.LocalComponentAppearance
-import dev.dimension.flare.ui.component.updateTimeFormatterLocale
+import dev.dimension.flare.ui.humanizer.updateTimeFormatterLocale
 import dev.dimension.flare.ui.model.collectAsUiState
 import dev.dimension.flare.ui.model.onSuccess
 import io.github.composefluent.ExperimentalFluentApi

compose-ui/src/jvmMain/kotlin/dev/dimension/flare/ui/component/DateTimeText.jvm.kt

@@ -0,0 +1,17 @@
+import Foundation
+import KotlinSharedUI
+
+class Formatter: SwiftFormatter {
+    private init() {}
+    
+    static let shared = Formatter()
+    nonisolated func formatNumber(number: Int64) -> String {
+        return Int(number)
+            .formatted(
+                .number
+                    .notation(.compactName)
+                    .grouping(.never)
+                    .precision(.fractionLength(0...2))
+            )
+    }
+}

desktopApp/src/main/kotlin/dev/dimension/flare/ui/theme/FlareTheme.kt

@@ -8,6 +8,7 @@ struct FlareApp: App {
         configureAudioSessionForMixing()
         ComposeUIHelper.shared.initialize(
             inAppNotification: SwiftInAppNotification.shared,
+            swiftFormatter: Formatter.shared
         )
     }
     var body: some Scene {

iosApp/flare/Common/Formatter.swift

@@ -7,19 +7,11 @@ struct DateTimeText: View {
 
     var body: some View {
         if fullTime {
-            HStack {
-                Text(data.platformValue, style: .date)
-                Text(data.platformValue, style: .time)
-            }
+            Text(data.platformValue, style: .date) + Text(data.platformValue, style: .time)
+        } else if data.shouldShowFull {
+            Text(data.platformValue, style: .date)
         } else {
-            switch data.diff {
-            case .days: Text(data.platformValue, style: .relative)
-            case .hours: Text(data.platformValue, style: .relative)
-            case .minutes: Text(data.platformValue, style: .relative)
-            case .seconds: Text(data.platformValue, style: .relative)
-            case .monthDay: Text(data.platformValue, style: .date)
-            case .yearMonthDay: Text(data.platformValue, style: .date)
-            }
+            Text(data.platformValue, style: .relative)
         }
     }
 }