Merge pull request #895 from DimensionDev/ios/20250427

Ios/20250427

Author: 110

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 		06B8514F2B6B22A500DFA075 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 06B8514E2B6B22A500DFA075 /* GoogleService-Info.plist */; };
 		06B851512B6B22DD00DFA075 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B851502B6B22DD00DFA075 /* AppDelegate.swift */; };
 		06B851552B6B926D00DFA075 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 06B851542B6B926D00DFA075 /* Localizable.xcstrings */; };
+		642DED2D2DBF6965006B944C /* FontAwesomeSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 642DED2C2DBF6965006B944C /* FontAwesomeSwiftUI */; };
 		644C84F82D535D0B00E92D0D /* JXPagingView in Frameworks */ = {isa = PBXBuildFile; productRef = 644C84F72D535D0B00E92D0D /* JXPagingView */; };
 		64541A902DA3CE5A001208C7 /* Tiercel in Frameworks */ = {isa = PBXBuildFile; productRef = 64541A8F2DA3CE5A001208C7 /* Tiercel */; };
 		64655C2D2CFD6CA000255488 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 64655C2C2CFD6CA000255488 /* Debug.xcconfig */; };
@@ -84,6 +85,7 @@
 				64E877CC2D0842C5003559B9 /* Fuzi in Frameworks */,
 				646CABC52DAE876C00B9EA6F /* ExyteChat in Frameworks */,
 				64E208712CF8458A001C64EF /* FLAnimatedImage in Frameworks */,
+				642DED2D2DBF6965006B944C /* FontAwesomeSwiftUI in Frameworks */,
 				0690507B2CAE634C007FC957 /* Awesome in Frameworks */,
 				066AD0452B3ACDC1006F28F4 /* Collections in Frameworks */,
 				067D89772AD25C1700F8F932 /* MarkdownUI in Frameworks */,
@@ -265,6 +267,7 @@
 				64A2DC652DAD21BF008EF8C2 /* ExyteChat */,
 				646CABC42DAE876C00B9EA6F /* ExyteChat */,
 				6467B2AD2DB109500045DA9A /* SFSymbolKit */,
+				642DED2C2DBF6965006B944C /* FontAwesomeSwiftUI */,
 			);
 			productName = iosApp;
 			productReference = 7555FF7B242A565900829871 /* Flare.app */;
@@ -322,6 +325,7 @@
 				64C17B572DA3E683000291EA /* XCRemoteSwiftPackageReference "GRDB.swift" */,
 				646CABC32DAE876C00B9EA6F /* XCRemoteSwiftPackageReference "Chat" */,
 				6467B2AC2DB109500045DA9A /* XCRemoteSwiftPackageReference "SFSymbolKit" */,
+				642DED2B2DBF6965006B944C /* XCRemoteSwiftPackageReference "FontAwesomeSwiftUI" */,
 			);
 			productRefGroup = 7555FF7C242A565900829871 /* Products */;
 			projectDirPath = "";
@@ -719,6 +723,14 @@
 				minimumVersion = 10.20.0;
 			};
 		};
+		642DED2B2DBF6965006B944C /* XCRemoteSwiftPackageReference "FontAwesomeSwiftUI" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/onmyway133/FontAwesomeSwiftUI";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.0.5;
+			};
+		};
 		644C84F62D535D0B00E92D0D /* XCRemoteSwiftPackageReference "JXPagingView" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pujiaxin33/JXPagingView";
@@ -909,6 +921,11 @@
 			package = 06B851492B6B228600DFA075 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
 			productName = FirebaseCrashlytics;
 		};
+		642DED2C2DBF6965006B944C /* FontAwesomeSwiftUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 642DED2B2DBF6965006B944C /* XCRemoteSwiftPackageReference "FontAwesomeSwiftUI" */;
+			productName = FontAwesomeSwiftUI;
+		};
 		644C84F72D535D0B00E92D0D /* JXPagingView */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 644C84F62D535D0B00E92D0D /* XCRemoteSwiftPackageReference "JXPagingView" */;

iosApp/iosApp/Data/Notifications.swift

@@ -1,10 +1,10 @@
 import Foundation
 
 extension Notification.Name {
-    static let flShowNewMenu = Notification.Name("flShowNewMenu")
+//    static let flShowNewMenu = Notification.Name("flShowNewMenu")
     static let showSettings = Notification.Name("ShowSettings")
     static let showTabSettings = Notification.Name("ShowTabSettings")
     static let showLogin = Notification.Name("ShowLogin")
-    static let flMenuStateDidChange = Notification.Name("FLMenuStateDidChange")
+//    static let flMenuStateDidChange = Notification.Name("FLMenuStateDidChange")
     static let userDidUpdate = Notification.Name("userDidUpdate")
 }

iosApp/iosApp/FlareApp.swift

@@ -1,3 +1,4 @@
+import FontAwesomeSwiftUI
 import shared
 import SwiftUI
 
@@ -11,6 +12,9 @@ struct FlareApp: SwiftUI.App {
     @StateObject private var router = FlareRouter()
 
     init() {
+        // Register FontAwesome fonts
+        FontAwesome.register()
+
         KoinHelper.shared.start(inAppNotification: SwitUIInAppNotification())
 
         // 初始化UserManager

iosApp/iosApp/UI/Navigation/AppNavigationController.swift

@@ -3,8 +3,10 @@ import shared
 import SwiftUI
 
 class FlareAppState: ObservableObject {
-    @Published var isMenuOpen: Bool = false
-    @Published var menuProgress: CGFloat = 0.0 // 0表示完全关闭，1表示完全打开
+//    @Published var isMenuOpen: Bool = false
+//    @Published var menuProgress: CGFloat = 0.0 // 0表示完全关闭，1表示完全打开
+
+    @Published var isCustomTabBarHidden: Bool = false
 
     @Published var selectedTab: Int = 0
     @Published var previousTab: Int = 0
@@ -19,21 +21,21 @@ class FlareAppState: ObservableObject {
         currentAccount = UserManager.shared.getCurrentAccount()
     }
 
-    func toggleMenu() {
-        withAnimation(.spring()) {
-            isMenuOpen.toggle()
-            menuProgress = isMenuOpen ? 1.0 : 0.0
-        }
-    }
-
-    func closeMenu() {
-        if isMenuOpen {
-            withAnimation(.spring()) {
-                isMenuOpen = false
-                menuProgress = 0.0
-            }
-        }
-    }
+//    func toggleMenu() {
+//        withAnimation(.spring()) {
+//            isMenuOpen.toggle()
+//            menuProgress = isMenuOpen ? 1.0 : 0.0
+//        }
+//    }
+//
+//    func closeMenu() {
+//        if isMenuOpen {
+//            withAnimation(.spring()) {
+//                isMenuOpen = false
+//                menuProgress = 0.0
+//            }
+//        }
+//    }
 
     func switchTab(_ index: Int) {
         previousTab = selectedTab
@@ -45,27 +47,27 @@ class FlareAppState: ObservableObject {
     }
 
     private func setupObservers() {
-        // 观察Menu通知
-        NotificationCenter.default.publisher(for: .flMenuStateDidChange)
-            .sink { [weak self] notification in
-                if let isOpen = notification.object as? Bool {
-                    self?.isMenuOpen = isOpen
-                    withAnimation(.spring()) {
-                        self?.menuProgress = isOpen ? 1.0 : 0.0
-                    }
-                }
-            }
-            .store(in: &cancellables)
-
-        //  头像点击打开菜单
-        NotificationCenter.default.publisher(for: .flShowNewMenu)
-            .sink { [weak self] _ in
-                withAnimation(.spring()) {
-                    self?.isMenuOpen = true
-                    self?.menuProgress = 1.0
-                }
-            }
-            .store(in: &cancellables)
+//        // 观察Menu通知
+//        NotificationCenter.default.publisher(for: .flMenuStateDidChange)
+//            .sink { [weak self] notification in
+//                if let isOpen = notification.object as? Bool {
+//                    self?.isMenuOpen = isOpen
+//                    withAnimation(.spring()) {
+//                        self?.menuProgress = isOpen ? 1.0 : 0.0
+//                    }
+//                }
+//            }
+//            .store(in: &cancellables)
+//
+//        //  头像点击打开菜单
+//        NotificationCenter.default.publisher(for: .flShowNewMenu)
+//            .sink { [weak self] _ in
+//                withAnimation(.spring()) {
+//                    self?.isMenuOpen = true
+//                    self?.menuProgress = 1.0
+//                }
+//            }
+//            .store(in: &cancellables)
 
         // 监听用户userDidUpdate通知
         NotificationCenter.default.publisher(for: .userDidUpdate)