appbar + list + feed over

Author: 110

iosApp/iosApp/Data/FLTabSettings.swift

@@ -279,9 +279,9 @@ public struct FLTabSettings {
         ]
     }
 
-    private static func defaultBlueskySecondaryItems(accountKey: FLMicroBlogKey) -> [FLTabItem] {
+    private static func defaultBlueskySecondaryItems(accountKey _: FLMicroBlogKey) -> [FLTabItem] {
         [
-//            FLAllListTabItem(
+            //            FLAllListTabItem(
 //                metaData: FLTabMetaData(
 //                    title: .localized(.list),
 //                    icon: .mixed(.list, userKey: accountKey)
@@ -1174,11 +1174,11 @@ public struct FLProfileMediaTabItem: FLTabItem {
 // - AppBar统一存储数据结构
 // AppBar项目配置结构
 public struct AppBarItemConfig: Codable {
-    public let key: String                  // 项目唯一标识
-    public let type: AppBarItemType         // 项目类型
-    public let addedTime: Date              // 添加时间
-    public var metadata: [String: String]   // 元数据
-    
+    public let key: String // 项目唯一标识
+    public let type: AppBarItemType // 项目类型
+    public let addedTime: Date // 添加时间
+    public var metadata: [String: String] // 元数据
+
     public init(key: String, type: AppBarItemType, addedTime: Date = Date(), metadata: [String: String] = [:]) {
         self.key = key
         self.type = type
@@ -1189,36 +1189,36 @@ public struct AppBarItemConfig: Codable {
 
 // 项目类型枚举
 public enum AppBarItemType: String, Codable {
-    case main        // 主标签
-    case secondary   // 次要标签
-    case list        // 固定列表
-    case feed        // 固定Feed
+    case main // 主标签
+    case secondary // 次要标签
+    case list // 固定列表
+    case feed // 固定Feed
 }
 
 // 平台配置结构
 public struct PlatformAppBarConfig: Codable {
     public var enabledItems: [AppBarItemConfig]
-    public let version: Int = 1  // 添加版本字段便于未来扩展
-    
+    public let version: Int = 1 // 添加版本字段便于未来扩展
+
     public init(enabledItems: [AppBarItemConfig] = []) {
         self.enabledItems = enabledItems
     }
 }
 
 // 扩展FLTabSettingsStorage添加AppBar配置相关方法
-extension FLTabSettingsStorage {
+public extension FLTabSettingsStorage {
     // 存储键名前缀
-    private static let appBarConfigKeyPrefix = "appbar_config_3_"
-    
+    private static let appBarConfigKeyPrefix = "appbar_config_4_"
+
     // 获取AppBar配置存储键
     private func appBarConfigKey(for platformType: PlatformType, accountKey: MicroBlogKey) -> String {
         let platformString = platformType.name
         let accountString = accountKey.id
         return "\(Self.appBarConfigKeyPrefix)\(platformString)_\(accountString)"
     }
-    
+
     // 保存AppBar配置
-    public func saveAppBarConfig(_ config: PlatformAppBarConfig, for platformType: PlatformType, accountKey: MicroBlogKey) {
+    func saveAppBarConfig(_ config: PlatformAppBarConfig, for platformType: PlatformType, accountKey: MicroBlogKey) {
         let key = appBarConfigKey(for: platformType, accountKey: accountKey)
         do {
             let data = try JSONEncoder().encode(config)
@@ -1227,90 +1227,90 @@ extension FLTabSettingsStorage {
             NSLog("保存AppBar配置失败: \(error.localizedDescription)")
         }
     }
-    
+
     // 读取AppBar配置
-    public func loadAppBarConfig(for platformType: PlatformType, accountKey: MicroBlogKey) -> PlatformAppBarConfig? {
+    func loadAppBarConfig(for platformType: PlatformType, accountKey: MicroBlogKey) -> PlatformAppBarConfig? {
         let key = appBarConfigKey(for: platformType, accountKey: accountKey)
         guard let data = userDefaults.data(forKey: key) else { return nil }
-        
+
         do {
             return try JSONDecoder().decode(PlatformAppBarConfig.self, from: data)
         } catch {
             NSLog("加载AppBar配置失败: \(error.localizedDescription)")
             return nil
         }
     }
-    
+
     // 清除AppBar配置
-    public func clearAppBarConfig(for platformType: PlatformType, accountKey: MicroBlogKey) {
+    func clearAppBarConfig(for platformType: PlatformType, accountKey: MicroBlogKey) {
         let key = appBarConfigKey(for: platformType, accountKey: accountKey)
         userDefaults.removeObject(forKey: key)
     }
 }
 
 // 扩展FLTabSettingsManager添加AppBar配置相关方法
-extension FLTabSettingsManager {
+public extension FLTabSettingsManager {
     // 保存AppBar配置
-    public func saveAppBarConfig(_ config: PlatformAppBarConfig, for user: UiUserV2) {
+    func saveAppBarConfig(_ config: PlatformAppBarConfig, for user: UiUserV2) {
         storage.saveAppBarConfig(config, for: user.platformType, accountKey: user.key)
     }
-    
+
     // 读取AppBar配置
-    public func getAppBarConfig(for user: UiUserV2) -> PlatformAppBarConfig {
-        return storage.loadAppBarConfig(for: user.platformType, accountKey: user.key) ?? PlatformAppBarConfig()
+    func getAppBarConfig(for user: UiUserV2) -> PlatformAppBarConfig {
+        storage.loadAppBarConfig(for: user.platformType, accountKey: user.key) ?? PlatformAppBarConfig()
     }
-    
+
     // 将FLTabItem转换为AppBarItemConfig
-    public func convertTabToConfig(_ tab: FLTabItem, type: AppBarItemType, addedTime: Date = Date()) -> AppBarItemConfig {
+    func convertTabToConfig(_ tab: FLTabItem, type: AppBarItemType, addedTime: Date = Date()) -> AppBarItemConfig {
         var metadata: [String: String] = [:]
-        
+
         // 添加标题元数据
         switch tab.metaData.title {
         case let .text(text):
             metadata["title"] = text
         case let .localized(key):
             metadata["title"] = NSLocalizedString(key, comment: "")
         }
-        
+
         return AppBarItemConfig(
             key: tab.key,
             type: type,
             addedTime: addedTime,
             metadata: metadata
         )
     }
-    
+
     // 将AppBarItemConfig转换回FLTabItem数组
-    public func convertConfigToTabs(_ config: PlatformAppBarConfig, for user: UiUserV2, accountType: AccountType) -> [FLTabItem] {
+    func convertConfigToTabs(_ config: PlatformAppBarConfig, for user: UiUserV2, accountType: AccountType) -> [FLTabItem] {
         // 获取默认标签以便查找
         let defaultItems = FLTabSettings.defaultSecondary(user: user)
         let mainItems = FLTabSettings.defaultPrimary(user: user)
         let allDefaultItems = mainItems + defaultItems
-        
+
         // 按添加时间排序
         let sortedItems = config.enabledItems.sorted { $0.addedTime < $1.addedTime }
-        
+
         // 转换为FLTabItem
         var result: [FLTabItem] = []
-        
+
         for item in sortedItems {
             // 首先尝试从默认项中查找
             if let tab = allDefaultItems.first(where: { $0.key == item.key }) {
                 result.append(tab)
                 continue
             }
-            
+
             // 特殊处理列表和Feed标签
             if item.type == .list, let components = item.key.split(separator: "_").last {
                 let listId = String(components)
                 let title = item.metadata["title"] ?? "List"
-                
+
                 let listTab = FLListTimelineTabItem(
                     metaData: FLTabMetaData(
                         title: .text(title),
                         icon: .material(.list)
                     ),
-                    account: accountType,  // 使用传入的accountType
+                    account: accountType, // 使用传入的accountType
                     listKey: listId
                 )
                 result.append(listTab)
@@ -1319,32 +1319,32 @@ extension FLTabSettingsManager {
                 if user.platformType == .bluesky {
                     let feedId = String(components)
                     let title = item.metadata["title"] ?? "Feed"
-                    
+
                     let feedTab = FLBlueskyFeedTabItem(
                         metaData: FLTabMetaData(
                             title: .text(title),
                             icon: .material(.feeds)
                         ),
-                        account: accountType,  // 使用传入的accountType
+                        account: accountType, // 使用传入的accountType
                         feedKey: feedId
                     )
                     result.append(feedTab)
                 }
             }
         }
-        
+
         // 确保至少有主页标签
         if result.isEmpty, let homeItem = mainItems.first {
             result.append(homeItem)
         }
-        
+
         return result
     }
-    
+
     // 创建默认配置
-    public func createDefaultAppBarConfig(for user: UiUserV2) -> PlatformAppBarConfig {
+    func createDefaultAppBarConfig(for user: UiUserV2) -> PlatformAppBarConfig {
         var items: [AppBarItemConfig] = []
-        
+
         // 添加主标签，使用1970年确保始终排在最前
         if let homeItem = FLTabSettings.defaultPrimary(user: user).first {
             items.append(convertTabToConfig(
@@ -1353,7 +1353,7 @@ extension FLTabSettingsManager {
                 addedTime: Date(timeIntervalSince1970: 0)
             ))
         }
-        
+
         // 添加默认次要标签
         let secondaryItems = FLTabSettings.defaultSecondary(user: user).prefix(3)
         for (index, item) in secondaryItems.enumerated() {
@@ -1363,12 +1363,12 @@ extension FLTabSettingsManager {
                 addedTime: Date().addingTimeInterval(Double(index) * 60)
             ))
         }
-        
+
         return PlatformAppBarConfig(enabledItems: items)
     }
-    
+
     // 重置为默认AppBar配置
-    public func resetToDefaultAppBarConfig(for user: UiUserV2) {
+    func resetToDefaultAppBarConfig(for user: UiUserV2) {
         let defaultConfig = createDefaultAppBarConfig(for: user)
         saveAppBarConfig(defaultConfig, for: user)
     }

iosApp/iosApp/Data/UserManager.swift

@@ -33,11 +33,11 @@ class UserManager {
                 if case let .success(data) = onEnum(of: state.user) {
                     self.currentUser = data.data
                     isInitialized = true
-                    
+
                     // 初始化AppBarTabSettingStore
                     let account = AccountTypeSpecific(accountKey: data.data.key)
                     AppBarTabSettingStore.shared.initialize(with: account, user: data.data)
-                    
+
                     // 发送通知
                     NotificationCenter.default.post(name: .userDidUpdate, object: data.data)
                     os_log("[UserManager] 初始化完成，用户: %{public}@", log: .default, type: .debug, data.data.name.raw)

iosApp/iosApp/FlareApp.swift

@@ -10,10 +10,10 @@ struct FlareApp: SwiftUI.App {
     #endif
     init() {
         KoinHelper.shared.start(inAppNotification: SwitUIInAppNotification())
-        
+
         // 初始化UserManager
         UserManager.shared.initialize()
-        
+
         // 初始化AppBarTabSettingStore（使用游客模式）
         // UserManager初始化完成后会自动更新为正确的账号
         AppBarTabSettingStore.shared.initialize(with: AccountTypeGuest(), user: nil)

iosApp/iosApp/UI/Page/Home/Data/AppBarConfigService.swift

@@ -0,0 +1,62 @@
+import Foundation
+import os
+import shared
+import SwiftUI
+
+// 配置管理服务
+class AppBarConfigService {
+    private let logger = Logger(subsystem: "com.flare.app", category: "AppBarConfigService")
+    private let settingsManager = FLTabSettingsManager()
+    private let storageLock = NSLock()
+
+    // 加载AppBar配置
+    func loadAppBarConfig(for user: UiUserV2) -> [AppBarItemConfig] {
+        storageLock.lock()
+        defer { storageLock.unlock() }
+
+        // 通过settingsManager加载配置
+        let config = settingsManager.getAppBarConfig(for: user)
+        let items = config.enabledItems
+
+        logger.debug("加载到\(items.count)个配置项")
+        return items
+    }
+
+    // 保存AppBar配置
+    func saveAppBarConfig(_ items: [AppBarItemConfig], for user: UiUserV2) {
+        storageLock.lock()
+        defer { storageLock.unlock() }
+
+        // 通过settingsManager保存配置
+        let config = PlatformAppBarConfig(enabledItems: items)
+        settingsManager.saveAppBarConfig(config, for: user)
+
+        logger.debug("保存\(items.count)个配置项")
+    }
+
+    // 创建默认配置
+    func createDefaultAppBarConfig(for user: UiUserV2) -> [AppBarItemConfig] {
+        let defaultConfig = settingsManager.createDefaultAppBarConfig(for: user)
+        let items = defaultConfig.enabledItems
+        logger.debug("创建默认AppBar配置")
+        return items
+    }
+
+    // 将配置转换为标签
+    func convertConfigToTabs(_ items: [AppBarItemConfig], for user: UiUserV2, accountType: AccountType) -> [FLTabItem] {
+        settingsManager.convertConfigToTabs(
+            PlatformAppBarConfig(enabledItems: items),
+            for: user,
+            accountType: accountType
+        )
+    }
+
+    // 将标签转换为配置
+    func convertTabToConfig(_ tab: FLTabItem, type: AppBarItemType, addedTime: Date) -> AppBarItemConfig {
+        settingsManager.convertTabToConfig(
+            tab,
+            type: type,
+            addedTime: addedTime
+        )
+    }
+}