Merge pull request #1296 from DimensionDev/feature/ios_compose_ux

Tlaster · web-flow · commit 91cc96f8791e · 2025-09-26T18:50:39.000+09:00
complete compose for ios
diff --git a/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt b/compose-ui/src/commonMain/kotlin/dev/dimension/flare/ui/component/status/CommonStatusComponent.kt
@@ -1060,20 +1060,22 @@ private fun StatusPollComponent(
                 style = PlatformTheme.typography.caption,
             )
         } else {
-            val localizedExpiredTimeline =
-                rememberFormattedDateTime(poll.expiredAt, fullTime = true)
-            PlatformText(
-                text =
-                    stringResource(
-                        resource = Res.string.poll_expired_at,
-                        localizedExpiredTimeline,
-                    ),
-                modifier =
-                    Modifier
-                        .align(Alignment.End)
-                        .alpha(MediumAlpha),
-                style = PlatformTheme.typography.caption,
-            )
+            poll.expiredAt?.let { expiredAt ->
+                val localizedExpiredTimeline =
+                    rememberFormattedDateTime(expiredAt, fullTime = true)
+                PlatformText(
+                    text =
+                        stringResource(
+                            resource = Res.string.poll_expired_at,
+                            localizedExpiredTimeline,
+                        ),
+                    modifier =
+                        Modifier
+                            .align(Alignment.End)
+                            .alpha(MediumAlpha),
+                    style = PlatformTheme.typography.caption,
+                )
+            }
         }
         if (poll.canVote) {
             PlatformFilledTonalButton(
diff --git a/iosApp/Flare.xcodeproj/project.pbxproj b/iosApp/Flare.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		0646B2622E7151A700535A3E /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 0646B2612E7151A700535A3E /* Kingfisher */; };
+		0672EE122E8689C70092AD1F /* Drops in Frameworks */ = {isa = PBXBuildFile; productRef = 0672EE112E8689C70092AD1F /* Drops */; };
 		068923482E82A80700981D8E /* Flow in Frameworks */ = {isa = PBXBuildFile; productRef = 068923472E82A80700981D8E /* Flow */; };
 		068F7CD12E75405A00B5FB40 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 068F7CD02E75405A00B5FB40 /* MarkdownUI */; };
 		06C6B5482E853AAF00CCD388 /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 06C6B5472E853AAF00CCD388 /* SwiftUIIntrospect */; };
@@ -47,6 +48,7 @@
 				068923482E82A80700981D8E /* Flow in Frameworks */,
 				06C7FC172E7D474900A0D01A /* LazyPager in Frameworks */,
 				068F7CD12E75405A00B5FB40 /* MarkdownUI in Frameworks */,
+				0672EE122E8689C70092AD1F /* Drops in Frameworks */,
 				06C6B5482E853AAF00CCD388 /* SwiftUIIntrospect in Frameworks */,
 				0646B2622E7151A700535A3E /* Kingfisher in Frameworks */,
 			);
@@ -97,6 +99,7 @@
 				06C7FC162E7D474900A0D01A /* LazyPager */,
 				068923472E82A80700981D8E /* Flow */,
 				06C6B5472E853AAF00CCD388 /* SwiftUIIntrospect */,
+				0672EE112E8689C70092AD1F /* Drops */,
 			);
 			productName = flare;
 			productReference = 06E433FE2E6A9A2600CD0826 /* Flare.app */;
@@ -133,6 +136,7 @@
 				06C7FC152E7D474900A0D01A /* XCRemoteSwiftPackageReference "LazyPager" */,
 				068923462E82A80700981D8E /* XCRemoteSwiftPackageReference "SwiftUI-Flow" */,
 				06C6B5462E853AAF00CCD388 /* XCRemoteSwiftPackageReference "swiftui-introspect" */,
+				0672EE102E8689C70092AD1F /* XCRemoteSwiftPackageReference "Drops" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 06E433FF2E6A9A2600CD0826 /* Products */;
@@ -421,6 +425,14 @@
 				version = 8.5.0;
 			};
 		};
+		0672EE102E8689C70092AD1F /* XCRemoteSwiftPackageReference "Drops" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/omaralbeik/Drops.git";
+			requirement = {
+				kind = exactVersion;
+				version = 1.7.0;
+			};
+		};
 		06791BD42E7AA40000FF2050 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/SimplyDanny/SwiftLintPlugins";
@@ -469,6 +481,11 @@
 			package = 0646B2602E7151A700535A3E /* XCRemoteSwiftPackageReference "Kingfisher" */;
 			productName = Kingfisher;
 		};
+		0672EE112E8689C70092AD1F /* Drops */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 0672EE102E8689C70092AD1F /* XCRemoteSwiftPackageReference "Drops" */;
+			productName = Drops;
+		};
 		068923472E82A80700981D8E /* Flow */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 068923462E82A80700981D8E /* XCRemoteSwiftPackageReference "SwiftUI-Flow" */;
diff --git a/iosApp/flare/Common/KotlinByteArray+Data.swift b/iosApp/flare/Common/KotlinByteArray+Data.swift
@@ -0,0 +1,14 @@
+import Foundation
+import KotlinSharedUI
+
+extension KotlinByteArray {
+    static func from(data: Data) -> KotlinByteArray {
+        let swiftByteArray = [UInt8](data)
+        return swiftByteArray
+            .map(Int8.init(bitPattern:))
+            .enumerated()
+            .reduce(into: KotlinByteArray(size: Int32(swiftByteArray.count))) { result, row in
+                result.set(index: Int32(row.offset), value: row.element)
+        }
+    }
+}
diff --git a/iosApp/flare/FlareApp.swift b/iosApp/flare/FlareApp.swift
@@ -4,25 +4,11 @@ import KotlinSharedUI
 @main
 struct FlareApp: App {
     init() {
-        ComposeUIHelper.shared.initialize(inAppNotification: SwiftInAppNotification())
+        ComposeUIHelper.shared.initialize(inAppNotification: SwiftInAppNotification.shared)
     }
     var body: some Scene {
         WindowGroup {
             FlareRoot()
         }
     }
 }
-
-class SwiftInAppNotification: InAppNotification {
-    func onError(message: Message, throwable: KotlinThrowable) {
-
-    }
-
-    func onProgress(message: Message, progress: Int32, total: Int32) {
-
-    }
-
-    func onSuccess(message: Message) {
-
-    }
-}
diff --git a/iosApp/flare/Localizable.xcstrings b/iosApp/flare/Localizable.xcstrings
@@ -876,9 +876,27 @@
     },
     "Not done yet for %@" : {
 
+    },
+    "notification_compose_error" : {
+
+    },
+    "notification_compose_success" : {
+
+    },
+    "notification_login_expired" : {
+
     },
     "notification_type_title" : {
 
+    },
+    "poll_expired" : {
+
+    },
+    "poll_expires_at" : {
+
+    },
+    "poll_vote" : {
+
     },
     "profile_tab_likes" : {
 
diff --git a/iosApp/flare/UI/Component/Status/StatusPollView.swift b/iosApp/flare/UI/Component/Status/StatusPollView.swift
@@ -0,0 +1,93 @@
+import SwiftUI
+import KotlinSharedUI
+
+struct StatusPollView: View {
+    let data: UiPoll
+    @State private var selectedOption: [Int] = []
+    var body: some View {
+        VStack(
+            alignment: .trailing
+        ) {
+            ForEach(0..<data.options.count, id: \.self) { index in
+                let option = data.options[index]
+                if data.canVote {
+                    Button {
+                        if data.multiple {
+                            if selectedOption.contains(index) {
+                                selectedOption.removeAll(where: { $0 == index })
+                            } else {
+                                selectedOption.append(index)
+                            }
+                        } else {
+                            selectedOption = [index]
+                        }
+                    } label: {
+                        HStack {
+                            Text(option.title)
+                                .font(.caption)
+                            Spacer()
+                            if selectedOption.contains(index) {
+                                Image(systemName: "checkmark.circle")
+                                    .font(.caption)
+                                    .foregroundStyle(.secondary)
+                            } else {
+                                EmptyView()
+                            }
+                        }
+                        .padding(8)
+                        .frame(maxWidth: .infinity)
+                        .background(
+                            RoundedRectangle(cornerRadius: 8, style: .continuous)
+                                .fill(selectedOption.contains(index) ? Color.accentColor.opacity(0.2) : Color(.systemGroupedBackground))
+                        )
+                    }
+                    .buttonStyle(.plain)
+                } else {
+                    VStack {
+                        HStack {
+                            Text(option.title)
+                                .font(.caption)
+                            Spacer()
+                            if data.ownVotes.contains(KotlinInt(value: Int32(index))) {
+                                Image(systemName: "checkmark.circle")
+                                    .font(.caption)
+                            } else {
+                                EmptyView()
+                            }
+                            Text(option.humanizedPercentage)
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                        }
+                        ProgressView(value: option.percentage)
+                            .progressViewStyle(.linear)
+                            .tint(.accentColor)
+                    }
+                    .frame(maxWidth: .infinity)
+                }
+            }
+            
+            if data.expired {
+                Text("poll_expired")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            } else if let expiredAt = data.expiredAt {
+                Text("poll_expires_at")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+                DateTimeText(data: expiredAt, fullTime: true)
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            }
+            
+            if data.canVote {
+                Button {
+                    data.onVote(selectedOption.map { KotlinInt(value: Int32($0)) } )
+                } label: {
+                    Text("poll_vote")
+                }
+                .buttonStyle(.glassProminent)
+            }
+        }
+    }
+}
+
diff --git a/iosApp/flare/UI/Component/Status/StatusView.swift b/iosApp/flare/UI/Component/Status/StatusView.swift
@@ -120,6 +120,10 @@ struct StatusView: View {
 
                         }
                     }
+                    if let poll = data.poll, showMedia {
+                        StatusPollView(data: poll)
+                    }
+                    
                     if !data.images.isEmpty, showMedia {
                         StatusMediaView(data: data.images, sensitive: data.sensitive)
                     }
diff --git a/iosApp/flare/UI/Component/SwiftInAppNotification.swift b/iosApp/flare/UI/Component/SwiftInAppNotification.swift
@@ -0,0 +1,31 @@
+import KotlinSharedUI
+import Drops
+import Foundation
+
+class SwiftInAppNotification: InAppNotification {
+    private init() {}
+    static let shared = SwiftInAppNotification()
+    
+    func onError(message: Message, throwable: KotlinThrowable) {
+        switch message {
+        case .compose:
+            Drops.show(.init(stringLiteral: .init(localized: "notification_compose_error")))
+        case .loginExpired:
+            Drops.show(.init(stringLiteral: .init(localized: "notification_login_expired")))
+        }
+    }
+
+    func onProgress(message: Message, progress: Int32, total: Int32) {
+
+    }
+
+    func onSuccess(message: Message) {
+        switch message {
+        case .compose:
+            Drops.show(.init(stringLiteral: .init(localized: "notification_compose_success")))
+        case .loginExpired:
+            // do nothing
+            break
+        }
+    }
+}
diff --git a/iosApp/flare/UI/Screen/ComposeScreen.swift b/iosApp/flare/UI/Screen/ComposeScreen.swift
@@ -320,6 +320,7 @@ struct ComposeScreen: View {
             }
             ToolbarItem(placement: .confirmationAction) {
                 Button {
+                    send()
                 } label: {
                     Label {
                         Text("compose_button_send")
@@ -358,6 +359,54 @@ struct ComposeScreen: View {
         textView.selectedRange = NSRange(location: newLocation, length: 0)
         textView.scrollRangeToVisible(NSRange(location: max(0, newLocation - 1), length: 1))
     }
+    
+    private func getComposeData() -> [ComposeData] {
+        return presenter.state.selectedAccounts.map { account in
+            ComposeData(
+                account: account,
+                content: viewModel.text,
+                visibility: getVisibility(),
+                language: ["en"],
+                medias: getMedia(),
+                sensitive: viewModel.mediaViewModel.sensitive,
+                spoilerText: viewModel.contentWarning,
+                poll: getPoll(),
+                localOnly: false,
+                referenceStatus: getReferenceStatus()
+            )
+        }
+    }
+    
+    private func send() {
+        let datas = getComposeData()
+        for data in datas {
+            presenter.state.send(data: data)
+        }
+        dismiss()
+    }
+    
+    private func getMedia() -> [FileItem] {
+        return viewModel.mediaViewModel.items.map { item in
+            FileItem(name: item.item.itemIdentifier, data: KotlinByteArray.from(data: item.data!))
+        }
+    }
+    private func getReferenceStatus() -> ComposeData.ReferenceStatus? {
+        return if let data = composeStatus, let replyState = presenter.state.replyState, case .success(let timeline) = onEnum(of: replyState) {
+            ComposeData.ReferenceStatus(data: timeline.data, composeStatus: data)
+        } else {
+            nil
+        }
+    }
+    private func getPoll() -> ComposeData.Poll? {
+        return if viewModel.pollViewModel.enabled {
+            ComposeData.Poll(options: viewModel.pollViewModel.choices.map { item in item.text }, expiredAfter: viewModel.pollViewModel.expired.inWholeMilliseconds, multiple: viewModel.pollViewModel.pollType == ComposePollType.multiple)
+        } else {
+            nil
+        }
+    }
+    private func getVisibility() -> UiTimeline.ItemContentStatusTopEndContentVisibilityType {
+        return viewModel.visibility
+    }
 
 }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/UiPoll.kt
@@ -15,12 +15,19 @@ public data class UiPoll internal constructor(
     val multiple: Boolean,
     val ownVotes: ImmutableList<Int>,
     val onVote: (options: ImmutableList<Int>) -> Unit,
-    private val expiresAt: Instant,
+    // null indicates no expiration
+    private val expiresAt: Instant?,
     private val enabled: Boolean = true,
 ) {
-    val expired: Boolean by lazy { expiresAt < Clock.System.now() }
+    val expired: Boolean by lazy {
+        if (expiresAt == null) {
+            false
+        } else {
+            expiresAt < Clock.System.now()
+        }
+    }
     val voted: Boolean by lazy { ownVotes.isNotEmpty() }
-    val expiredAt: UiDateTime by lazy { expiresAt.toUi() }
+    val expiredAt: UiDateTime? by lazy { expiresAt?.toUi() }
 
     val canVote: Boolean by lazy { !expired && !voted && enabled }
 
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/model/mapper/Mastodon.kt
@@ -425,7 +425,7 @@ private fun Status.renderStatus(
                                             )?.takeUnless { it.isNaN() } ?: 0f,
                                 )
                             }?.toPersistentList() ?: persistentListOf(),
-                    expiresAt = it.expiresAt ?: Instant.DISTANT_PAST,
+                    expiresAt = it.expiresAt,
                     multiple = it.multiple ?: false,
                     ownVotes = it.ownVotes?.toPersistentList() ?: persistentListOf(),
                     onVote = { options ->
diff --git a/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposeUseCase.kt b/shared/src/commonMain/kotlin/dev/dimension/flare/ui/presenter/compose/ComposeUseCase.kt

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,10 @@ struct StatusView: View {`
`120`	`120`
`121`	`121`	`}`
`122`	`122`	`}`
	`123`	`+ if let poll = data.poll, showMedia {`
	`124`	`+ StatusPollView(data: poll)`
	`125`	`+ }`
	`126`	`+`
`123`	`127`	`if !data.images.isEmpty, showMedia {`
`124`	`128`	`StatusMediaView(data: data.images, sensitive: data.sensitive)`
`125`	`129`	`}`