add open_status_image_viewer for macos

Tlaster · Tlaster · commit 7767f270f014 · 2025-09-04T13:39:30.000+09:00
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
@@ -55,7 +55,7 @@ compose.desktop {
                 val hasSigningProps = file.exists()
                 packageBuildVersion = System.getenv("BUILD_NUMBER") ?: "21"
                 bundleID = "dev.dimension.flare"
-                minimumSystemVersion = "12.0"
+                minimumSystemVersion = "14.0"
                 appStore = hasSigningProps
 
                 jvmArgs(
diff --git a/desktopApp/src/main/kotlin/dev/dimension/flare/common/macos/MacosBridge.kt b/desktopApp/src/main/kotlin/dev/dimension/flare/common/macos/MacosBridge.kt
@@ -8,6 +8,9 @@ import kotlinx.serialization.Serializable
 
 internal object MacosBridge {
     private interface Bridge : Library {
+        @Suppress("FunctionName")
+        fun open_status_image_viewer(modelJson: String)
+
         @Suppress("FunctionName")
         fun open_video_viewer(modelJson: String)
 
@@ -122,18 +125,10 @@ internal object MacosBridge {
                 index = selectedIndex,
                 medias = medias,
             )
-
-        val selectedItem = data.getOrNull(selectedIndex)
-        when (selectedItem) {
-            is UiMedia.Audio -> Unit
-            is UiMedia.Gif ->
-                lib.open_img_viewer(selectedItem.url)
-            is UiMedia.Image ->
-                lib.open_img_viewer(selectedItem.url)
-            is UiMedia.Video ->
-                lib.open_video_viewer(selectedItem.url)
-            null -> Unit
-        }
+        val modelJson =
+            kotlinx.serialization.json.Json
+                .encodeToString(OpenStatusImageModel.serializer(), model)
+        lib.open_status_image_viewer(modelJson)
     }
 
     @Serializable
diff --git a/desktopApp/src/main/swift/macosBridge.xcodeproj/project.pbxproj b/desktopApp/src/main/swift/macosBridge.xcodeproj/project.pbxproj
@@ -268,7 +268,7 @@
 					"$(PROJECT_DIR)/macosBridge/build/macosBridge.build/Release/macosBridge.build/Objects-normal/arm64/Binary",
 					"$(PROJECT_DIR)/macosBridge/build/macosBridge.build/Release/macosBridge.build/Objects-normal/x86_64/Binary",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -293,7 +293,7 @@
 					"$(PROJECT_DIR)/macosBridge/build/macosBridge.build/Release/macosBridge.build/Objects-normal/arm64/Binary",
 					"$(PROJECT_DIR)/macosBridge/build/macosBridge.build/Release/macosBridge.build/Objects-normal/x86_64/Binary",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 14.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 6.0;
diff --git a/desktopApp/src/main/swift/macosBridge/ImageViewerBridge.swift b/desktopApp/src/main/swift/macosBridge/ImageViewerBridge.swift
@@ -4,20 +4,27 @@ import Kingfisher
 import SwiftUI
 import AVKit
 
+class ClosableWindow : NSWindow {
+    override func cancelOperation(_ sender: Any?) {
+        self.close()
+    }
+}
+
 @_cdecl("open_img_viewer")
 public func open_img_viewer(urlCString: UnsafePointer<CChar>?) {
     let urlStr = urlCString.flatMap { String(cString: $0) } ?? "about:blank"
     let targetURL = URL(string: urlStr)!
     DispatchQueue.main.async {
         if NSApp == nil { _ = NSApplication.shared }
 
-        let win = NSWindow(contentRect: NSRect(x: 200, y: 200, width: 1000, height: 700),
+        let win = ClosableWindow(contentRect: NSRect(x: 200, y: 200, width: 1000, height: 700),
                            styleMask: [.resizable, .titled, .closable, .miniaturizable, .fullSizeContentView],
                            backing: .buffered, defer: false)
         win.titlebarAppearsTransparent = true
         win.titleVisibility = .hidden
         win.isMovableByWindowBackground = true
         win.appearance = .init(named: .darkAqua)
+        win.setFrameOriginToPositionWindowInCenterOfScreen()
 
         win.contentView = makeZoomingScrollView(targetURL: targetURL)
         win.isReleasedWhenClosed = false
@@ -35,13 +42,14 @@ public func open_video_viewer(urlCString: UnsafePointer<CChar>?) {
     DispatchQueue.main.async {
         if NSApp == nil { _ = NSApplication.shared }
 
-        let win = NSWindow(contentRect: NSRect(x: 200, y: 200, width: 1000, height: 700),
+        let win = ClosableWindow(contentRect: NSRect(x: 200, y: 200, width: 1000, height: 700),
                            styleMask: [.resizable, .titled, .closable, .miniaturizable, .fullSizeContentView],
                            backing: .buffered, defer: false)
         win.titlebarAppearsTransparent = true
         win.titleVisibility = .hidden
         win.isMovableByWindowBackground = true
         win.appearance = .init(named: .darkAqua)
+        win.setFrameOriginToPositionWindowInCenterOfScreen()
         let playerView = AVPlayerView()
         let videoPlayer = AVPlayer(url: targetURL)
         playerView.player = videoPlayer
@@ -56,53 +64,94 @@ public func open_video_viewer(urlCString: UnsafePointer<CChar>?) {
 
 
 
-//struct OpenStatusImageModel: Decodable {
-//    let index: Int
-//    let medias: [StatusMediaItem]
-//}
-//
-//struct StatusMediaItem: Decodable {
-//    let url: String
-//    let type: String
-//    let placeholder: String?
-//}
-//
-//@_cdecl("open_status_image_viewer")
-//public func open_status_image_viewer(_ json: UnsafePointer<CChar>?) {
-//    guard let json = json else { return }
-//    let s = String(cString: json)
-//    if let data = s.data(using: .utf8),
-//       let model = try? JSONDecoder().decode(OpenStatusImageModel.self, from: data) {
-//        DispatchQueue.main.sync {
-//            if NSApp == nil { _ = NSApplication.shared }
-//            let win = NSWindow(contentRect: NSRect(x: 200, y: 200, width: 1000, height: 700),
-//                               styleMask: [.resizable, .titled, .closable, .miniaturizable, .fullSizeContentView],
-//                               backing: .buffered, defer: false)
-////            let win = NSWindow(contentViewController: OpenStatusPagerViewController(model: model))
-////            win.contentMinSize = .init(width: 100, height: 100)
-////            win.styleMask = [.resizable, .titled, .closable, .miniaturizable, .fullSizeContentView]
-//            win.titlebarAppearsTransparent = true
-//            win.titleVisibility = .hidden
-//            win.isMovableByWindowBackground = true
-//            win.appearance = .init(named: .darkAqua)
-//            
-////            let pagerVC = OpenStatusPagerViewController(model: model)
-////            win.contentViewController = pagerVC
-//            win.contentView = NSHostingView(rootView: MediaPagerView(model: model))
-//            win.isReleasedWhenClosed = false
-//            win.delegate = windowDelegate
-//            openedWindows.insert(win)
-//            swiftLog(2, "Window opened. Total windows: \(openedWindows.count)") // 调试日志
-//
-//            win.makeKeyAndOrderFront(nil)
-//            NSApp.activate(ignoringOtherApps: true)
-//            swiftLog(2, "8. Window should be visible. Window count: \(openedWindows.count)")
-//            swiftLog(2, "9. Window is visible: \(win.isVisible), is key: \(win.isKeyWindow)")
-//
-//        }
-//    }
-//}
+struct OpenStatusImageModel: Decodable {
+    let index: Int
+    let medias: [StatusMediaItem]
+}
+
+struct StatusMediaItem: Decodable {
+    let url: String
+    let type: String
+    let placeholder: String?
+}
+
+@_cdecl("open_status_image_viewer")
+public func open_status_image_viewer(_ json: UnsafePointer<CChar>?) {
+    guard let json = json else { return }
+    let s = String(cString: json)
+    if let data = s.data(using: .utf8),
+       let model = try? JSONDecoder().decode(OpenStatusImageModel.self, from: data) {
+        DispatchQueue.main.sync {
+            if NSApp == nil { _ = NSApplication.shared }
+            let win = ClosableWindow(contentRect: NSRect(x: 200, y: 200, width: 1000, height: 700),
+                               styleMask: [.resizable, .titled, .closable, .miniaturizable, .fullSizeContentView],
+                               backing: .buffered, defer: false)
+            win.titlebarAppearsTransparent = true
+            win.titleVisibility = .hidden
+            win.isMovableByWindowBackground = true
+            win.appearance = .init(named: .darkAqua)
+            win.setFrameOriginToPositionWindowInCenterOfScreen()
+            
+            win.contentView = NSHostingView(rootView: StatusMediaView(medias: model.medias, page: model.index))
+            win.isReleasedWhenClosed = false
+            
+            win.makeKeyAndOrderFront(nil)
+            NSApp.activate(ignoringOtherApps: true)
+
+        }
+    }
+}
+
 
+struct StatusMediaView: View {
+    let medias: [StatusMediaItem]
+    @State var page: Int? = 0
+    var body: some View {
+        ScrollView(.horizontal) {
+            HStack(spacing: 0) {
+                ForEach(0..<medias.count, id: \.self) { i in
+                    let media = medias[i]
+                    ZStack {
+                        if (media.type == "gif" || media.type == "image") {
+                            KFImage(.init(string: media.url)!)
+                                .placeholder({
+                                    if let placeholder = media.placeholder {
+                                        KFImage
+                                            .url(.init(string: placeholder)!)
+                                            .resizable()
+                                            .scaledToFit()
+                                    } else {
+                                        ProgressView()
+                                    }
+                                })
+                                .resizable()
+                                .scaledToFit()
+                        } else if (media.type == "video") {
+                            if (page == i) {
+                                let player = AVPlayer(url: .init(string: media.url)!)
+                                VideoPlayer(player: player)
+                                    .onAppear {
+                                        player.play()
+                                    }
+                            } else if let placeholder = media.placeholder {
+                                KFImage(.init(string: placeholder)!)
+                            } else {
+                                EmptyView()
+                            }
+                        }
+                    }
+                    .containerRelativeFrame(.horizontal, count: 1, spacing: 0)
+                    .id(i)
+                }
+            }
+            .scrollTargetLayout()
+        }
+        .scrollIndicators(.hidden)
+        .scrollTargetBehavior(.paging)
+        .scrollPosition(id: $page)
+        .ignoresSafeArea()
+    }
+}
 
 
 
@@ -165,3 +214,11 @@ final class CenteringClipView: NSClipView {
         return rect
     }
 }
+
+extension NSWindow {
+    public func setFrameOriginToPositionWindowInCenterOfScreen() {
+        if let screenSize = screen?.frame.size {
+            self.setFrameOrigin(NSPoint(x: (screenSize.width-frame.size.width)/2, y: (screenSize.height-frame.size.height)/2))
+        }
+    }
+}
