Merge pull request #699 from DimensionDev/ios/fixed_bugs_20250130

Ios/fixed bugs 20250130
DimensionDev · Jan 31, 2025 · 8ea1237 · 8ea1237
2 parents 3ff0a43 + ed74fd7
commit 8ea1237
Show file tree

Hide file tree

Showing 35 changed files with 1,076 additions and 206 deletions.
diff --git a/iosApp/Generated/Sources/Assets.swift b/iosApp/Generated/Sources/Assets.swift
@@ -20,7 +20,7 @@ public typealias AssetImageTypeAlias = ImageAsset.Image
 
 // swiftlint:disable superfluous_disable_command file_length implicit_return
 
-// MARK: - Asset Catalogs
+// - Asset Catalogs
 
 // swiftlint:disable identifier_name line_length nesting type_body_length type_name
 public enum Asset {
@@ -402,7 +402,7 @@ public enum Asset {
 
 // swiftlint:enable identifier_name line_length nesting type_body_length type_name
 
-// MARK: - Implementation Details
+// - Implementation Details
 
 public final class ColorAsset {
     public fileprivate(set) var name: String

diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
diff --git a/iosApp/iosApp/UI/Page/Compose/Components/JXPagingView/JXPagingListContainerView.swift b/iosApp/iosApp/UI/Page/Compose/Components/JXPagingView/JXPagingListContainerView.swift
@@ -258,7 +258,7 @@ open class JXPagingListContainerView: UIView {
         }
     }
 
-    // MARK: - JXSegmentedViewListContainer
+    // - JXSegmentedViewListContainer
 
     public func contentScrollView() -> UIScrollView {
         scrollView
@@ -302,7 +302,7 @@ open class JXPagingListContainerView: UIView {
         listDidAppear(at: currentIndex)
     }
 
-    // MARK: - Private
+    // - Private
 
     func initListIfNeeded(at index: Int) {
         guard let dataSource else { return }

diff --git a/iosApp/iosApp/UI/Page/Compose/Components/JXPagingView/JXPagingSmoothView.swift b/iosApp/iosApp/UI/Page/Compose/Components/JXPagingView/JXPagingSmoothView.swift
@@ -193,7 +193,7 @@ open class JXPagingSmoothView: UIView {
         }
     }
 
-    // MARK: - KVO
+    // - KVO
 
     override open func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
         if keyPath == "contentOffset" {
@@ -216,7 +216,7 @@ open class JXPagingSmoothView: UIView {
         }
     }
 
-    // MARK: - Private
+    // - Private
 
     func listHeader(for listScrollView: UIScrollView) -> UIView? {
         for (index, list) in listDict {

diff --git a/iosApp/iosApp/UI/Page/Compose/Components/JXPagingView/JXPagingView.swift b/iosApp/iosApp/UI/Page/Compose/Components/JXPagingView/JXPagingView.swift
@@ -237,7 +237,7 @@ open class JXPagingView: UIView {
         }
     }
 
-    // MARK: - Private
+    // - Private
 
     func refreshTableHeaderView() {
         guard let delegate else { return }
@@ -301,7 +301,7 @@ open class JXPagingView: UIView {
     }
 }
 
-// MARK: - UITableViewDataSource, UITableViewDelegate
+// - UITableViewDataSource, UITableViewDelegate
 
 extension JXPagingView: UITableViewDataSource, UITableViewDelegate {
     open func tableView(_: UITableView, numberOfRowsInSection _: Int) -> Int {

diff --git a/iosApp/iosApp/UI/Page/Compose/Components/MediaPreview/Image/MediaPreviewImageView.swift b/iosApp/iosApp/UI/Page/Compose/Components/MediaPreview/Image/MediaPreviewImageView.swift
@@ -134,7 +134,7 @@ import UIKit
 //
 // }
 //
-//// MARK: - UIScrollViewDelegate
+//// - UIScrollViewDelegate
 // extension MediaPreviewImageView: UIScrollViewDelegate {
 //
 //    func scrollViewShouldScrollToTop(_ scrollView: UIScrollView) -> Bool {

diff --git a/...osApp/UI/Page/Compose/Components/MediaPreview/Image/MediaPreviewImageViewController.swift b/...osApp/UI/Page/Compose/Components/MediaPreview/Image/MediaPreviewImageViewController.swift
@@ -148,7 +148,7 @@ import WebKit
 //
 // }
 //
-//// MARK: - ShareActivityProvider
+//// - ShareActivityProvider
 // extension MediaPreviewImageViewController: ShareActivityProvider {
 //    var activities: [Any] {
 //        return []
@@ -162,7 +162,7 @@ import WebKit
 //    }
 // }
 //
-//// MARK: - MediaPreviewTransitionViewController
+//// - MediaPreviewTransitionViewController
 // extension MediaPreviewImageViewController: MediaPreviewTransitionViewController {
 //    var mediaPreviewTransitionContext: MediaPreviewTransitionContext? {
 //        let transitionView = containerView
@@ -181,7 +181,7 @@ import WebKit
 //    }
 // }
 //
-//// MARK: - WKNavigationDelegate
+//// - WKNavigationDelegate
 // extension MediaPreviewImageViewController: WKNavigationDelegate {
 //    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
 //        webView.isOpaque = false

diff --git a/iosApp/iosApp/UI/Page/Compose/Components/MediaPreview/MediaPreviewViewController.swift b/iosApp/iosApp/UI/Page/Compose/Components/MediaPreview/MediaPreviewViewController.swift
@@ -202,7 +202,7 @@ import Kingfisher
 //
 // }
 //
-//// MARK: - PageboyViewControllerDelegate
+//// - PageboyViewControllerDelegate
 // extension MediaPreviewViewController: PageboyViewControllerDelegate {
 //    func pageboyViewController(
 //        _ pageboyViewController: PageboyViewController,
@@ -241,7 +241,7 @@ import Kingfisher
 //
 // }
 //
-//// MARK: - MediaPreviewingViewController
+//// - MediaPreviewingViewController
 // extension MediaPreviewViewController: MediaPreviewingViewController {
 //
 //    func isInteractiveDismissible() -> Bool {
@@ -273,7 +273,7 @@ import Kingfisher
 //
 // }
 //
-//// MARK: - MediaPreviewImageViewControllerDelegate
+//// - MediaPreviewImageViewControllerDelegate
 // extension MediaPreviewViewController: MediaPreviewImageViewControllerDelegate {
 //
 //    func mediaPreviewImageViewController(_ viewController: MediaPreviewImageViewController, tapGestureRecognizerDidTrigger tapGestureRecognizer: UITapGestureRecognizer) {
@@ -295,7 +295,7 @@ import Kingfisher
 //
 // }
 //
-//// MARK: - ShareActivityProvider
+//// - ShareActivityProvider
 // extension MediaPreviewViewController: ShareActivityProvider {
 //    var activities: [Any] {
 //        if let provider = pageViewController.currentViewController as? ShareActivityProvider {

diff --git a/iosApp/iosApp/UI/Page/Compose/Components/MediaPreview/MediaPreviewViewModel.swift b/iosApp/iosApp/UI/Page/Compose/Components/MediaPreview/MediaPreviewViewModel.swift
@@ -157,7 +157,7 @@ import Kingfisher
 //
 // }
 //
-//// MARK: - PageboyViewControllerDataSource
+//// - PageboyViewControllerDataSource
 // extension MediaPreviewViewModel: PageboyViewControllerDataSource {
 //
 //    func numberOfViewControllers(in pageboyViewController: PageboyViewController) -> Int {

diff --git a/...osApp/UI/Page/Compose/Components/MediaPreview/Video/MediaPreviewVideoViewController.swift b/...osApp/UI/Page/Compose/Components/MediaPreview/Video/MediaPreviewVideoViewController.swift
@@ -144,7 +144,7 @@ extension MediaPreviewVideoViewController {
     }
 }
 
-// MARK: - ShareActivityProvider
+// - ShareActivityProvider
 
 extension MediaPreviewVideoViewController: ShareActivityProvider {
     var activities: [Any] {
@@ -163,7 +163,7 @@ extension MediaPreviewVideoViewController: ShareActivityProvider {
     }
 }
 
-// MARK: - MediaPreviewTransitionViewController
+// - MediaPreviewTransitionViewController
 
 // extension MediaPreviewVideoViewController: MediaPreviewTransitionViewController {
 //    var mediaPreviewTransitionContext: MediaPreviewTransitionContext? {
@@ -202,6 +202,6 @@ extension MediaPreviewVideoViewController: ShareActivityProvider {
 //    }
 // }
 
-// MARK: - AVPlayerViewControllerDelegate
+// - AVPlayerViewControllerDelegate
 
 extension MediaPreviewVideoViewController: AVPlayerViewControllerDelegate {}
diff --git a/iosApp/iosApp/UI/Page/Compose/Components/MediaPreview/Video/PlaybackState.swift b/iosApp/iosApp/UI/Page/Compose/Components/MediaPreview/Video/PlaybackState.swift
@@ -17,7 +17,7 @@ public enum PlaybackState: Int {
     case failed = 6
 }
 
-// MARK: - CustomStringConvertible
+// - CustomStringConvertible
 
 extension PlaybackState: CustomStringConvertible {
     public var description: String {

diff --git a/iosApp/iosApp/UI/Page/Compose/Components/WebView.swift b/iosApp/iosApp/UI/Page/Compose/Components/WebView.swift
@@ -9,7 +9,7 @@
     import WebKit
 
     public struct WebView: WebViewRepresentable {
-        // MARK: - Initializers
+        // - Initializers
 
         public init(
             url: URL? = nil,
@@ -21,13 +21,13 @@
             self.webView = webView
         }
 
-        // MARK: - Properties
+        // - Properties
 
         private let url: URL?
         private let configuration: WKWebViewConfiguration?
         private let webView: (WKWebView) -> Void
 
-        // MARK: - Functions
+        // - Functions
 
         #if os(iOS)
             public func makeUIView(context _: Context) -> WKWebView {

diff --git a/iosApp/iosApp/UI/Page/Home/Components/Status/CommonTimelineStatusComponent.swift b/iosApp/iosApp/UI/Page/Home/Components/Status/CommonTimelineStatusComponent.swift
@@ -94,7 +94,7 @@ struct CommonTimelineStatusComponent: View {
                 }
                 Spacer()
                 // icon + time
-                VStack(alignment: .trailing, spacing: 1) { 
+                VStack(alignment: .trailing, spacing: 1) {
                     // 更多按钮
                     if !processActions().moreActions.isEmpty {
                         Menu {
@@ -338,7 +338,7 @@ struct CommonTimelineStatusComponent: View {
                                 StatusActionLabel(item: item)
                             })
                             .frame(maxWidth: .infinity)
-                            .padding(.horizontal, 12)  // 添加水平内边距
+                            .padding(.horizontal, 10) // 添加水平内边距
                         case let .group(group):
                             Menu {
                                 ForEach(0 ..< group.actions.count, id: \.self) { subActionIndex in
@@ -382,14 +382,14 @@ struct CommonTimelineStatusComponent: View {
                                 StatusActionLabel(item: group.displayItem)
                             }
                             .frame(maxWidth: .infinity)
-                            .padding(.horizontal, 12)  // 添加水平内边距
+                            .padding(.horizontal, 10) // 添加水平内边距
                         }
                     }
-                    
+
                     // 使用新的 ShareButton
                     ShareButton(content: data.content.raw, view: self)
                         .frame(maxWidth: .infinity)
-                        .padding(.horizontal, 0)  // 添加水平内边距
+                        .padding(.horizontal, 0) // 添加水平内边距
                 }
                 .labelStyle(CenteredLabelStyle())
                 .buttonStyle(.borderless)
@@ -556,7 +556,7 @@ struct CenteredLabelStyle: LabelStyle {
             configuration.icon
             configuration.title
                 .font(.system(size: 12))
-            Spacer() // 添加 Spacer 让内容靠左
+            // Spacer() // 添加 Spacer 让内容靠左
         }
         .frame(maxWidth: .infinity, alignment: .center)
     }
@@ -591,15 +591,16 @@ struct ShareButton: View {
     @Environment(\.colorScheme) var colorScheme
     let content: String
     let view: CommonTimelineStatusComponent
-    
+
     var body: some View {
         Menu {
             Button(action: {
                 // 系统分享
                 let activityVC = UIActivityViewController(activityItems: [content], applicationActivities: nil)
                 if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
                    let window = windowScene.windows.first,
-                   let rootVC = window.rootViewController {
+                   let rootVC = window.rootViewController
+                {
                     activityVC.popoverPresentationController?.sourceView = window
                     rootVC.present(activityVC, animated: true)
                 }
@@ -610,11 +611,12 @@ struct ShareButton: View {
                     Image(systemName: "square.and.arrow.up")
                 }
             }
-            
+
             Button(action: {
                 // 截图分享
                 if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-                   let window = windowScene.windows.first {
+                   let window = windowScene.windows.first
+                {
                     let renderer = ImageRenderer(content: view)
                     if let uiImage = renderer.uiImage {
                         let activityVC = UIActivityViewController(activityItems: [uiImage], applicationActivities: nil)
@@ -633,10 +635,10 @@ struct ShareButton: View {
             }
         } label: {
             HStack {
-                Spacer()  
+                Spacer()
                 Spacer()
                 Label {
-                    Text("")  // 空文本，保持与其他按钮一致的结构
+                    Text("") // 空文本，保持与其他按钮一致的结构
                 } icon: {
                     Image(systemName: "square.and.arrow.up")
                         .imageScale(.medium)

diff --git a/iosApp/iosApp/UI/Page/Home/Components/Status/Text/FlareMarkdownText.swift b/iosApp/iosApp/UI/Page/Home/Components/Status/Text/FlareMarkdownText.swift
@@ -4,7 +4,7 @@ import TwitterText
 import UIKit
 
 public enum FlareMarkdownText {
-    // MARK: - Constants
+    // - Constants
 
     public static let lensIDRegex: NSRegularExpression? = {
         guard let regex = try? NSRegularExpression(
@@ -17,7 +17,7 @@ public enum FlareMarkdownText {
         return regex
     }()
 
-    // MARK: - Style Configuration
+    // - Style Configuration
 
     public struct Style {
         public let font: UIFont
@@ -71,7 +71,7 @@ public enum FlareMarkdownText {
         }
     }
 
-    // MARK: - Link Types
+    // - Link Types
 
     public enum LinkType {
         case url(URL)
@@ -198,7 +198,7 @@ public enum FlareMarkdownText {
         return (AttributedString(nsAttrString), previewLink, luckyDropLink)
     }
 
-    // MARK: - Private Methods
+    // - Private Methods
 
     private static func parseEntities(from text: String) -> [Entity] {
         var entities: [Entity] = []
@@ -280,7 +280,7 @@ public enum FlareMarkdownText {
     }
 }
 
-// MARK: - Supporting Types
+// - Supporting Types
 
 extension FlareMarkdownText {
     struct Entity {
@@ -289,7 +289,7 @@ extension FlareMarkdownText {
     }
 }
 
-// MARK: - String Extensions
+// - String Extensions
 
 private extension String {
     var isImageLink: Bool {