[Internal] Fix toast and update TF notes (#68)

Kyle-Ye · Sep 10, 2023 · ded138c · ded138c
1 parent 9b03579
commit ded138c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/Forumate/ForumateApp.swift b/Forumate/ForumateApp.swift
@@ -56,6 +56,7 @@ struct ForumateApp: App {
         #endif
 
         #if os(iOS) || os(visionOS) || os(macOS)
+        // FIXME: This will lead to a crash for themeManager currently. 
         WindowGroup("Topic Detail", id: "topic", for: TopicDetailWindowModel.self) { $detailModel in
             DetailWindowView(detailModel: detailModel)
                 .modifier(AppViewModifier())

diff --git a/Forumate/Model/TopicDetailWindowModel.swift b/Forumate/Model/TopicDetailWindowModel.swift
@@ -10,6 +10,7 @@ import Foundation
 import SwiftData
 
 struct TopicDetailWindowModel: Codable, Hashable {
+    // FIXME: use topic id instead
     let topic: Topic
     let communityID: PersistentIdentifier
 }
diff --git a/Forumate/View/Tab/Topics/Community/View/CommunityDetail/CommunityDetail.swift b/Forumate/View/Tab/Topics/Community/View/CommunityDetail/CommunityDetail.swift
@@ -39,6 +39,11 @@ struct CommunityDetail: View {
         }
         .navigationTitle(state.community.title)
         .environmentObject(state)
+        .toast(isPresented: $state.unimplementedToast) {
+            Label("Unimplemented Feature", systemImage: "paperplane")
+                .foregroundStyle(.white)
+                .tint(Color.accentColor.opacity(0.8))
+        }
     }
 }
 

diff --git a/Forumate/View/Tab/Topics/Community/View/CommunityDetail/Topic/TopicLabel.swift b/Forumate/View/Tab/Topics/Community/View/CommunityDetail/Topic/TopicLabel.swift
@@ -62,16 +62,12 @@ struct TopicLabel: View {
             Divider()
             Button {
                 // TODO: Mark as read feature unimplemented
-                unimplementedToast.toggle()
+                state.unimplementedToast.toggle()
             } label: {
                 Label("Mark As Read", systemImage: "doc.text.image")
             }
-            .toast(isPresented: $unimplementedToast) {
-                Label("Unimplemented Feature", systemImage: "paperplane")
-                    .foregroundStyle(.white)
-                    .tint(Color.accentColor.opacity(0.8))
-            }
         } preview: {
+            // FIXME: The size for the preview is not correct.
             TopicDetail(topic: topic)
                 .frame(maxHeight: 800)
                 .environmentObject(appState)

diff --git a/Forumate/View/Tab/Topics/Community/View/CommunityDetail/ViewModel/CommunityDetailState.swift b/Forumate/View/Tab/Topics/Community/View/CommunityDetail/ViewModel/CommunityDetailState.swift
@@ -139,7 +139,9 @@ class CommunityDetailState: ObservableObject {
         static var unspecified: CommunityDetailState.ViewByType { categories }
     }
 
-    @AppStorage var viewByType: ViewByType    
+    @AppStorage var viewByType: ViewByType 
+
+    @Published var unimplementedToast = false
 }
 
 enum DefaultViewByTypeSetting: Setting {

diff --git a/TestFlight/WhatToTest.en-US.txt b/TestFlight/WhatToTest.en-US.txt
@@ -1 +1,5 @@
 What's new in v0.7.0-beta
+
+- Updated layout for topic detail view
+- New toolbar item for topic detail view
+- Recommend Community System update