Merge branch 'develop' into feature/write-form

Author: SubvertDev

ForPDA.xcodeproj/project.pbxproj

@@ -9,7 +9,6 @@ import Foundation
 
 public enum ForumEvent: Event {
     case onRefresh
-    case settingsButtonTapped
     case topicTapped(Int, Int)
     case subforumRedirectTapped(URL)
     case subforumTapped(Int, String)

Modules/Sources/AnalyticsClient/Events/ForumEvent.swift

@@ -67,7 +67,7 @@ public struct AnnouncementFeature: Reducer, Sendable {
             case ._loadAnnouncement:
                 guard state.announcement == nil else { return .none }
                 return .run { [id = state.announcementId] send in
-                    let result = await Result { try await apiClient.getAnnouncement(id: id) }
+                    let result = await Result { try await apiClient.getAnnouncement(id) }
                     await send(._announcementResponse(result))
                 }
 

Modules/Sources/AnnouncementFeature/AnnouncementFeature.swift

@@ -24,6 +24,7 @@ import QMSFeature
 import SettingsFeature
 import NotificationsFeature
 import DeveloperFeature
+import ToastClient
 import AlertToast
 import SFSafeSymbols
 import SharedUI
@@ -48,27 +49,34 @@ public struct AppView: View {
         WithPerceptionTracking {
             ZStack(alignment: .bottom) {
                 TabView(selection: $store.selectedTab) {
-                    ArticlesListTab()
-                    FavoritesTab()
-                    ForumTab()
-                    ProfileTab()
+                    StackTabView(store: store.scope(state: \.articlesTab, action: \.articlesTab))
+                        .tag(AppTab.articles)
+
+                    StackTabView(store: store.scope(state: \.favoritesTab, action: \.favoritesTab))
+                        .tag(AppTab.favorites)
+                    
+                    StackTabView(store: store.scope(state: \.forumTab, action: \.forumTab))
+                        .tag(AppTab.forum)
+                    
+                    StackTabView(store: store.scope(state: \.profileTab, action: \.profileTab))
+                        .tag(AppTab.profile)
                 }
 
                 Group {
-                    if store.isShowingTabBar {
+                    if store.showTabBar {
                         PDATabView()
                             .transition(.move(edge: .bottom))
                     }
                 }
                 // Animation on whole ZStack breaks safeareainset for next screens
-                .animation(.default, value: store.isShowingTabBar)
+                .animation(.default, value: store.showTabBar)
 
-                if store.showToast {
-                    Toast()
+                if let toast = store.toastMessage {
+                    Toast(toast)
                         .ignoresSafeArea(.keyboard, edges: .bottom)
                 }
             }
-            .animation(.default, value: store.showToast)
+            .animation(.default, value: store.toastMessage)
             .ignoresSafeArea(.keyboard, edges: .bottom)
             .preferredColorScheme(store.appSettings.appColorScheme.asColorScheme)
             .fullScreenCover(item: $store.scope(state: \.auth, action: \.auth)) { store in
@@ -86,155 +94,6 @@ public struct AppView: View {
         }
     }
 
-    // MARK: - Articles List Tab
-    
-    @ViewBuilder
-    private func ArticlesListTab() -> some View {
-        NavigationStack(
-            path: $store.scope(state: \.articlesPath, action: \.articlesPath)
-        ) {
-            ArticlesListScreen(store: store.scope(state: \.articlesList, action: \.articlesList))
-                .tracking(for: ArticlesListScreen.self)
-        } destination: { store in
-            WithPerceptionTracking {
-                switch store.case {
-                case let .article(store):
-                    ArticleScreen(store: store)
-                        .tracking(for: ArticleScreen.self, ["id": store.articlePreview.id])
-                    
-                case let .profile(store):
-                    ProfileScreen(store: store)
-                        .tracking(for: ProfileScreen.self, ["id": store.userId ?? 0])
-                    
-                case let .settingsPath(path):
-                    SettingsPath(path)
-                }
-            }
-        }
-        .tag(AppTab.articlesList)
-        .toolbar(store.isShowingTabBar ? .visible : .hidden, for: .tabBar)
-    }
-    
-    // MARK: - Favorites Tab
-    @ViewBuilder
-    private func FavoritesTab() -> some View {
-        NavigationStack(
-            path: $store.scope(state: \.favoritesRootPath, action: \.favoritesRootPath)
-        ) {
-            FavoritesRootScreen(store: store.scope(state: \.favoritesRoot, action: \.favoritesRoot))
-                .tracking(for: FavoritesRootScreen.self)
-        } destination: { store in
-            switch store.case {
-            case let .forumPath(path):
-                ForumPath(path)
-                
-            case let .settingsPath(path):
-                SettingsPath(path)
-            }
-        }
-        .tag(AppTab.favorites)
-        .toolbar(store.isShowingTabBar ? .visible : .hidden, for: .tabBar)
-    }
-    
-    // MARK: - Forum Tab
-    
-    @ViewBuilder
-    private func ForumTab() -> some View {
-        NavigationStack(
-            path: $store.scope(state: \.forumPath, action: \.forumPath)
-        ) {
-            ForumsListScreen(store: store.scope(state: \.forumsList, action: \.forumsList))
-                .tracking(for: ForumsListScreen.self)
-        } destination: { store in
-            ForumPath(store)
-        }
-        .tag(AppTab.forum)
-        .toolbar(store.isShowingTabBar ? .visible : .hidden, for: .tabBar)
-    }
-    
-    // MARK: - Profile Tab
-    
-    @ViewBuilder
-    private func ProfileTab() -> some View {
-        NavigationStack(
-            path: $store.scope(state: \.profilePath, action: \.profilePath)
-        ) {
-            ProfileScreen(store: store.scope(state: \.profile, action: \.profile))
-                .tracking(for: ProfileScreen.self)
-        } destination: { store in
-            switch store.case {
-            case let .history(store):
-                HistoryScreen(store: store)
-                    .tracking(for: HistoryScreen.self)
-            case let .qmsPath(path):
-                QMSPath(path)
-            case let .settingsPath(path):
-                SettingsPath(path)
-            }
-        }
-        .tag(AppTab.profile)
-        .toolbar(store.isShowingTabBar ? .visible : .hidden, for: .tabBar)
-    }
-    
-    // MARK: - QMS Path
-    
-    @ViewBuilder
-    private func QMSPath(_ store: StoreOf<AppFeature.QMSPath.Body>) -> some View {
-        switch store.case {
-        case let .qmsList(store):
-            QMSListScreen(store: store)
-                .tracking(for: QMSListScreen.self)
-        case let .qms(store):
-            QMSScreen(store: store)
-                .tracking(for: QMSScreen.self)
-        }
-    }
-    
-    // MARK: - Forum Path
-    
-    @ViewBuilder
-    private func ForumPath(_ store: StoreOf<AppFeature.ForumPath.Body>) -> some View {
-        WithPerceptionTracking {
-            switch store.case {
-            case let .forum(store):
-                ForumScreen(store: store)
-                    .tracking(for: ForumScreen.self, ["id": store.forumId])
-                
-            case let .topic(store):
-                TopicScreen(store: store)
-                    .tracking(for: TopicScreen.self, ["id": store.topicId])
-                
-            case let .profile(store):
-                ProfileScreen(store: store)
-                    .tracking(for: ProfileScreen.self, ["id": store.userId ?? 0])
-                
-            case let .announcement(store):
-                AnnouncementScreen(store: store)
-                    .tracking(for: AnnouncementScreen.self, ["id": store.announcementId])
-                
-            case let .settingsPath(path):
-                SettingsPath(path)
-            }
-        }
-    }
-    
-    // MARK: - Settings Path
-    
-    @ViewBuilder
-    private func SettingsPath(_ store: StoreOf<AppFeature.SettingsPath.Body>) -> some View {
-        switch store.case {
-        case let .settings(store):
-            SettingsScreen(store: store)
-                .tracking(for: SettingsScreen.self)
-        case let .developer(store):
-            DeveloperScreen(store: store)
-                .tracking(for: DeveloperScreen.self)
-        case let .notifications(store):
-            NotificationsScreen(store: store)
-                .tracking(for: NotificationsScreen.self)
-        }
-    }
-    
     // MARK: - PDA Tab View
 
     @ViewBuilder
@@ -287,15 +146,15 @@ public struct AppView: View {
     @State private var duration = 5
 
     @ViewBuilder
-    private func Toast() -> some View {
+    private func Toast(_ toast: ToastMessage) -> some View {
         HStack(spacing: 0) {
-            Image(systemSymbol: store.toast.isError ? .xmarkCircleFill : .checkmarkCircleFill)
+            Image(systemSymbol: toast.isError ? .xmarkCircleFill : .checkmarkCircleFill)
                 .font(.body)
-                .foregroundStyle(store.toast.isError ? Color(.Main.red) : tintColor)
+                .foregroundStyle(toast.isError ? Color(.Main.red) : tintColor)
                 .frame(width: 32, height: 32)
 
             if isExpanded {
-                Text(store.toast.message, bundle: store.localizationBundle)
+                Text(toast.description, bundle: .toast)
                     .font(.caption)
                     .foregroundStyle(Color(.Labels.primary))
                     .padding(.trailing, 12)
@@ -329,6 +188,15 @@ public struct AppView: View {
     }
 }
 
+// MARK: - UINC edge swipe enable
+
+extension UINavigationController {
+    override open func viewDidLoad() {
+        super.viewDidLoad()
+        interactivePopGestureRecognizer?.delegate = nil
+    }
+}
+
 // MARK: - Model Extensions
 
 extension AppTintColor {

Modules/Sources/AppFeature/AppFeature.swift

@@ -11,7 +11,7 @@ import Models
 extension AppTab {
     public var title: LocalizedStringKey {
         switch self {
-        case .articlesList:
+        case .articles:
             return "Articles"
         case .favorites:
             return "Favorites"