Modify itmeline load more logic

110 · 110 · commit 618589a47bd0 · 2025-07-22T17:05:04.000+08:00
diff --git a/iosApp/iosApp/UI/DataLayer/PagingStateConverter.swift b/iosApp/iosApp/UI/DataLayer/PagingStateConverter.swift
@@ -9,7 +9,6 @@ class PagingStateConverter {
     /// 转换队列
     private let conversionQueue = DispatchQueue(label: "timeline.state.converter", qos: .userInitiated)
 
-    /// 缓存变量
     private var convertedItems: [TimelineItem] = []
 
     init() {
@@ -108,7 +107,17 @@ class PagingStateConverter {
             // 执行增量转换：从当前缓存大小开始转换新数据
             let startIndex = convertedItems.count
             guard maxConvertibleIndex > startIndex else {
-                FlareLog.debug("[PagingStateConverter] 无新数据需要转换")
+                if maxConvertibleIndex > 0, let firstNewItem = successState.peek(index: 0) {
+                    let firstNewItemId = firstNewItem.itemKey
+                    let firstOldItemId = convertedItems.first?.id
+
+                    if firstNewItemId != firstOldItemId {
+                        FlareLog.debug("[PagingStateConverter] 检测到数据内容变化，执行全量转换")
+                        return performConversion(successState, isFullConversion: true)
+                    }
+                }
+
+                FlareLog.debug("[PagingStateConverter] 无新数据需要转换，当前缓存: \(startIndex), KMP总数: \(maxConvertibleIndex)")
                 return generateFilteredState(successState)
             }
 
diff --git a/iosApp/iosApp/UI/Navigation/FlareRootView.swift b/iosApp/iosApp/UI/Navigation/FlareRootView.swift
@@ -43,7 +43,7 @@ struct FlareRootView: View {
                                         destination: destination,
                                         router: router
                                     ).environment(theme)
-                                    .applyTheme(theme)
+                                        .applyTheme(theme)
                                         .environment(appState)
                                 }
                             }
diff --git a/iosApp/iosApp/UI/Page/Compose/TimelineV2/TimelineItemsViewV2.swift b/iosApp/iosApp/UI/Page/Compose/TimelineV2/TimelineItemsViewV2.swift
@@ -17,7 +17,7 @@ struct TimelineItemsViewV2: View {
         ForEach(Array(items.enumerated()), id: \.element.id) { index, item in
             TimelineStatusViewV2(
                 item: item,
-                index: index,
+                index: index
 //                presenter: presenter,
 //                scrollPositionID: $scrollPositionID,
 //                onError: onError
diff --git a/iosApp/iosApp/UI/Page/Home/Data/AppBarNotificationService.swift b/iosApp/iosApp/UI/Page/Home/Data/AppBarNotificationService.swift
@@ -5,7 +5,6 @@ import SwiftUI
 
 // 通知管理服务
 class AppBarNotificationService {
- 
     // 发送标签更新通知
     func postTabsDidUpdateNotification(updatedTabKey: String? = nil, newTitle: String? = nil) {
         var userInfo: [String: Any]?
diff --git a/iosApp/iosApp/UI/Page/Home/Data/AppBarTabSettingStore.swift b/iosApp/iosApp/UI/Page/Home/Data/AppBarTabSettingStore.swift
@@ -10,7 +10,6 @@ extension Notification.Name {
 }
 
 class AppBarTabSettingStore: ObservableObject, TabStateProvider {
-    
     static let shared = AppBarTabSettingStore(accountType: AccountTypeGuest())
 
     @Published var primaryHomeItems: [FLTabItem] = [] // 主要标签（不可更改状态）Appbar 第一个Home 标签
diff --git a/iosApp/iosApp/UI/Page/Home/Data/ListTabManager.swift b/iosApp/iosApp/UI/Page/Home/Data/ListTabManager.swift
@@ -4,7 +4,6 @@ import shared
 import SwiftUI
 
 class ListTabManager {
- 
     func moveListTab(
         from source: IndexSet,
         to destination: Int,
diff --git a/iosApp/iosApp/UI/Page/Home/Model/TimelineExtState.swift b/iosApp/iosApp/UI/Page/Home/Model/TimelineExtState.swift
@@ -2,5 +2,5 @@ import SwiftUI
 
 class TimelineExtState: ObservableObject {
     @Published var scrollToTopTrigger = false
-    @Published var showFloatingButton = false 
+    @Published var showFloatingButton = false
 }
diff --git a/iosApp/iosApp/UI/Page/Home/View/AppBar/AppBarSettingTabItemRowView.swift b/iosApp/iosApp/UI/Page/Home/View/AppBar/AppBarSettingTabItemRowView.swift
@@ -3,7 +3,6 @@ import os
 import shared
 import SwiftUI
 
-
 struct AppBarSettingRow: View {
     let tab: FLTabItem
     let store: AppBarTabSettingStore
@@ -15,7 +14,6 @@ struct AppBarSettingRow: View {
 
     @Environment(FlareTheme.self) private var theme
 
-  
     init(tab: FLTabItem, store: AppBarTabSettingStore, isPrimary: Bool, defaultToggleValue: Bool = true) {
         self.tab = tab
         self.store = store
@@ -57,32 +55,32 @@ struct AppBarSettingRow: View {
 
             if !isPrimary {
                 Toggle(
-"",
- isOn: Binding(
-                    get: {
-                        let isEnabled = store.availableAppBarTabsItems.contains(
-                            where: { $0.key == tab.key
-                            })
-                        FlareLog
-                            .debug(
-                                "Toggle GET: tab=\(tab.key), isEnabled=\(isEnabled), defaultValue=\(defaultToggleValue)"
-                            )
-                        return isEnabled ? true : defaultToggleValue
-                    },
-                    set: { _ in
-                        if !isProcessing {
-                            isProcessing = true
-                            FlareLog.debug("Toggle SET: tab=\(tab.key), 开始切换状态")
-                            store.toggleTab(tab.key)
-                            // 设置短暂延迟避免频繁操作
-                            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                                isProcessing = false
-                                FlareLog.debug("Toggle SET: tab=\(tab.key), 切换完成")
+                    "",
+                    isOn: Binding(
+                        get: {
+                            let isEnabled = store.availableAppBarTabsItems.contains(
+                                where: { $0.key == tab.key
+                                })
+                            FlareLog
+                                .debug(
+                                    "Toggle GET: tab=\(tab.key), isEnabled=\(isEnabled), defaultValue=\(defaultToggleValue)"
+                                )
+                            return isEnabled ? true : defaultToggleValue
+                        },
+                        set: { _ in
+                            if !isProcessing {
+                                isProcessing = true
+                                FlareLog.debug("Toggle SET: tab=\(tab.key), 开始切换状态")
+                                store.toggleTab(tab.key)
+                                // 设置短暂延迟避免频繁操作
+                                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                                    isProcessing = false
+                                    FlareLog.debug("Toggle SET: tab=\(tab.key), 切换完成")
+                                }
                             }
                         }
-                    }
+                    )
                 )
-)
                 .disabled(isProcessing)
             }
         }
@@ -96,13 +94,12 @@ struct ListTabItemRowRow: View {
     let store: AppBarTabSettingStore
     let onRequestEdit: (String, String) -> Void
     let isBlueskyFeed: Bool
-    let defaultToggleValue: Bool 
+    let defaultToggleValue: Bool
 
     @Environment(FlareTheme.self) private var theme
     @State private var isProcessing = false
     @State private var currentTitle: String
 
- 
     init(listId: String, title: String, store: AppBarTabSettingStore, onRequestEdit: @escaping (String, String) -> Void, isBlueskyFeed: Bool = false, defaultToggleValue: Bool = true) {
         self.listId = listId
         self.title = title
diff --git a/iosApp/iosApp/UI/Page/Home/View/AppBar/AppBarViewSwiftUI.swift b/iosApp/iosApp/UI/Page/Home/View/AppBar/AppBarViewSwiftUI.swift
@@ -43,9 +43,8 @@ struct AppBarViewSwiftUI: View {
                 }
                 .frame(width: 44)
                 .padding(.trailing, 8)
-            } 
+            }
         }
         .frame(height: 44)
-
     }
 }
diff --git a/iosApp/iosApp/UI/Page/Home/View/AppBar/HomeAppBarSettingsView.swift b/iosApp/iosApp/UI/Page/Home/View/AppBar/HomeAppBarSettingsView.swift
@@ -3,35 +3,33 @@ import os
 import shared
 import SwiftUI
 
-private let logger = Logger(subsystem: "com.flare.app", category: "HomeAppBarSettingsView")
-
 struct HomeAppBarSettingsView: View {
     @Environment(\.dismiss) var dismiss
     @ObservedObject var store: AppBarTabSettingStore = .shared
 
-    // 添加列表 presenter 状态
+    // 列表 presenter 状态
     @State private var listPresenter: AllListPresenter
     @State private var lastListState: AllListState?
     @State private var isActionInProgress = false
 
-    // 添加Feeds presenter状态（只用于Bluesky）
+    // Feeds presenter状态（只用于Bluesky）
     @State private var feedsPresenter: PinnableTimelineTabPresenter?
     @State private var lastFeedsState: PinnableTimelineTabPresenterState?
     @State private var isBlueskyPlatform: Bool = false
 
-    // 添加编辑标题所需的状态
+    // 编辑标题所需的状态
     @State private var isEditingTitle = false
     @State private var editingList: UiList?
     @State private var editedTitle = ""
 
-    // 添加使用ID和标题更新的状态
+    // 使用ID和标题更新的状态
     @State private var editingListId: String?
     @State private var editingListTitle: String = ""
 
-    // 添加新字段以标识编辑的是Feed还是List
+    // 新字段以标识编辑的是Feed还是List
     @State private var editingItemIsBlueskyFeed: Bool = false
 
-    // 添加折叠相关状态
+    // 折叠相关状态
     @State private var isAvailableListsExpanded: Bool = false
     @State private var isAvailableFeedsExpanded: Bool = false
     @State private var availableListsLimit: Int = 5 // 默认显示数量限制
@@ -725,7 +723,7 @@ struct HomeAppBarSettingsView: View {
 
         // 先设置处理状态，防止并发操作
         isActionInProgress = true
-        logger.debug("更新列表标题: \(list.id) 从 '\(list.title)' 到 '\(newTitle)'")
+        FlareLog.debug("更新列表标题: \(list.id) 从 '\(list.title)' 到 '\(newTitle)'")
 
         // 这里只更新本地存储的标题，不调用API
         NotificationCenter.default.post(
@@ -755,7 +753,7 @@ struct HomeAppBarSettingsView: View {
 
         // 先设置处理状态，防止并发操作
         isActionInProgress = true
-        logger.debug("更新标题: \(listId) 从 '\(oldTitle)' 到 '\(newTitle)'")
+        FlareLog.debug("更新标题: \(listId) 从 '\(oldTitle)' 到 '\(newTitle)'")
 
         // 这里只更新本地存储的标题，不调用API
         NotificationCenter.default.post(
diff --git a/iosApp/iosApp/UI/Page/Home/View/Floating/FloatingButtonConfig.swift b/iosApp/iosApp/UI/Page/Home/View/Floating/FloatingButtonConfig.swift
@@ -1,38 +1,27 @@
 import SwiftUI
 
-/// 浮动滚动到顶部按钮的配置
 enum FloatingButtonConfig {
-    /// 按钮大小，与底部 tabbar 的 home 按钮大小一致
     static let buttonSize: CGFloat = 44
 
-    /// 屏幕边距
     static let screenPadding: CGFloat = 20
 
-    /// 底部额外边距（避免与 tabbar 重叠）
     static let bottomExtraMargin: CGFloat = 100
 
-    /// 默认位置偏移量
     static let defaultPositionOffset = CGSize(width: 80, height: 250)
 
-    /// 拖动时的缩放效果
     static let dragScale: CGFloat = 1.1
 
-    /// 图标大小
     static let iconSize: CGFloat = 20
 
-    /// 阴影参数
     static let shadowRadius: CGFloat = 8
     static let shadowOffset = CGSize(width: 0, height: 4)
     static let shadowOpacity: Double = 0.2
 
-    /// 动画参数
     static let springResponse: Double = 0.3
     static let springDamping: Double = 0.7
     static let showHideAnimationDuration: Double = 0.3
 
-    /// 滚动检测阈值
     static let scrollThreshold: CGFloat = 50
 
-    /// z-index 层级
     static let zIndex: Double = 999
 }
diff --git a/iosApp/iosApp/UI/Page/Home/View/Home/HomeTabViewContentV2.swift b/iosApp/iosApp/UI/Page/Home/View/Home/HomeTabViewContentV2.swift
@@ -7,7 +7,7 @@ import shared
 import SwiftUI
 
 struct HomeTabViewContentV2: View {
-     @Environment(FlareRouter.self) private var router
+    @Environment(FlareRouter.self) private var router
     @Environment(FlareAppState.self) private var appState
     @Environment(FlareTheme.self) private var theme
     @Environment(\.appSettings) private var appSettings
diff --git a/iosApp/iosApp/UI/Page/Home/View/TimelineViewSwiftUI/TimelineItemsView.swift b/iosApp/iosApp/UI/Page/Home/View/TimelineViewSwiftUI/TimelineItemsView.swift
@@ -11,17 +11,36 @@ struct TimelineItemsView: View {
     @State private var lastItemId: String?
     @Environment(\.appSettings) private var appSettings
 
+    private let loadMoreThreshold = 3
+
     var body: some View {
-        ForEach(items) { item in
-            TimelineStatusViewV2(
-                item: item,
-                index: itemIndexMap[item.id] ?? 0,
-            )
-            .padding(.vertical, 4)
-            .onAppear {
-                if item.id == lastItemId, hasMore, !isRefreshing, !viewModel.isLoadingMore {
-                    FlareLog.debug("Timeline Last item appeared, triggering load more")
-                    handleLoadMore()
+        Group {
+            ForEach(items) { item in
+                TimelineStatusViewV2(
+                    item: item,
+                    index: itemIndexMap[item.id] ?? 0,
+                )
+                .padding(.vertical, 4)
+                .onAppear {
+                    if let currentIndex = itemIndexMap[item.id] {
+                        let remainingItems = items.count - currentIndex - 1
+
+                        if remainingItems <= loadMoreThreshold, hasMore, !isRefreshing, !viewModel.isLoadingMore {
+                            FlareLog.debug("Timeline 提前触发load more，当前索引: \(currentIndex), 剩余items: \(remainingItems)")
+                            handleLoadMore()
+                        }
+                    }
+                }
+            }
+
+            if viewModel.isLoadingMore {
+                ForEach(0 ..< 2, id: \.self) { index in
+                    TimelineStatusViewV2(
+                        item: createSampleTimelineItem(),
+                        index: items.count + index
+                    )
+                    .redacted(reason: .placeholder)
+                    .padding(.vertical, 4)
                 }
             }
         }
diff --git a/iosApp/iosApp/UI/Page/Home/View/TimelineViewSwiftUI/TimelineViewModel.swift b/iosApp/iosApp/UI/Page/Home/View/TimelineViewSwiftUI/TimelineViewModel.swift
@@ -169,6 +169,39 @@ struct TimelineLoadingView: View {
     }
 }
 
+func createSampleTimelineItem() -> TimelineItem {
+    let sampleUser = User(
+        key: "sample@mastodon.social",
+        name: RichText(raw: "Sample User Name"),
+        handle: "@sampleuser",
+        avatar: "https://example.com/avatar.jpg",
+        banner: "https://example.com/banner.jpg",
+        description: RichText(raw: "Sample user description")
+    )
+
+    return TimelineItem(
+        id: "sample-timeline-item-\(UUID().uuidString)",
+        content: RichText(raw: "This is a sample timeline content for skeleton loading. It shows how the timeline item will look when loaded."),
+        user: sampleUser,
+        timestamp: Date(),
+        images: [],
+        url: "https://example.com/status",
+        platformType: "Mastodon",
+        aboveTextContent: nil,
+        contentWarning: nil,
+        card: nil,
+        quote: [],
+        bottomContent: nil,
+        topEndContent: nil,
+        poll: nil,
+        topMessage: nil,
+        sensitive: false,
+        visibility: "public",
+        language: "en",
+        actions: []
+    )
+}
+
 struct TimelineEmptyView: View {
     var body: some View {
         VStack(spacing: 16) {
diff --git a/iosApp/iosApp/UI/Page/Home/View/TimelineViewSwiftUI/TimelineViewSwiftUIV4.swift b/iosApp/iosApp/UI/Page/Home/View/TimelineViewSwiftUI/TimelineViewSwiftUIV4.swift
@@ -34,9 +34,16 @@ struct TimelineViewSwiftUIV4: View {
 
                     switch viewModel.timelineState {
                     case .loading:
-                        TimelineLoadingView()
+                        ForEach(0 ..< 5, id: \.self) { index in
+                            TimelineStatusViewV2(
+                                item: createSampleTimelineItem(),
+                                index: index
+                            )
+                            .redacted(reason: .placeholder)
                             .listRowBackground(theme.primaryBackgroundColor)
                             .listRowInsets(EdgeInsets())
+                            .listRowSeparator(.hidden)
+                        }
 
                     case let .loaded(items, hasMore, isRefreshing):
                         TimelineItemsView(
diff --git a/iosApp/iosApp/UI/Page/Home/View/TimelineWaterfall/WaterfallItemsView.swift b/iosApp/iosApp/UI/Page/Home/View/TimelineWaterfall/WaterfallItemsView.swift
@@ -15,7 +15,7 @@ struct WaterfallItemsView: View {
     @EnvironmentObject private var timelineState: TimelineExtState
     @Environment(FlareRouter.self) private var router
 
-    @State private var scrollThreshold: CGFloat = 100
+    @State private var scrollThreshold: CGFloat = 500
     @State private var hasInitialLoadCompleted = false
 
     @Environment(FlareTheme.self) private var theme
diff --git a/iosApp/iosApp/UI/Page/Menu/FlareAppState.swift b/iosApp/iosApp/UI/Page/Menu/FlareAppState.swift

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ struct FlareRootView: View {`
`43`	`43`	`destination: destination,`
`44`	`44`	`router: router`
`45`	`45`	`).environment(theme)`
`46`		`- .applyTheme(theme)`
	`46`	`+ .applyTheme(theme)`
`47`	`47`	`.environment(appState)`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ extension Notification.Name {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`class AppBarTabSettingStore: ObservableObject, TabStateProvider {`
`13`		`-`
`14`	`13`	`static let shared = AppBarTabSettingStore(accountType: AccountTypeGuest())`
`15`	`14`
`16`	`15`	`@Published var primaryHomeItems: [FLTabItem] = [] // 主要标签（不可更改状态）Appbar 第一个Home 标签`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ import SwiftUI`
`2`	`2`
`3`	`3`	`class TimelineExtState: ObservableObject {`
`4`	`4`	`@Published var scrollToTopTrigger = false`
`5`		`- @Published var showFloatingButton = false`
	`5`	`+ @Published var showFloatingButton = false`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,8 @@ struct AppBarViewSwiftUI: View {`
`43`	`43`	`}`
`44`	`44`	`.frame(width: 44)`
`45`	`45`	`.padding(.trailing, 8)`
`46`		`- }`
	`46`	`+ }`
`47`	`47`	`}`
`48`	`48`	`.frame(height: 44)`
`49`		`-`
`50`	`49`	`}`
`51`	`50`	`}`