[Feature] Add ForumatePlus (#60)

Kyle-Ye · Sep 9, 2023 · ab2356f · ab2356f
1 parent 554410d
commit ab2356f
Show file tree

Hide file tree

Showing 27 changed files with 1,240 additions and 537 deletions.
diff --git a/Forumate.xcodeproj/project.pbxproj b/Forumate.xcodeproj/project.pbxproj
diff --git a/Forumate.xcodeproj/xcshareddata/xcschemes/Forumate.xcscheme b/Forumate.xcodeproj/xcshareddata/xcschemes/Forumate.xcscheme
@@ -62,6 +62,9 @@
             ReferencedContainer = "container:Forumate.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <StoreKitConfigurationFileReference
+         identifier = "../../Forumate/Store/Forumate.storekit">
+      </StoreKitConfigurationFileReference>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Forumate/AppViewModifier.swift b/Forumate/AppViewModifier.swift
@@ -0,0 +1,23 @@
+//
+//  AppViewModifier.swift
+//  Forumate
+//
+//  Created by Kyle on 2023/9/9.
+//
+
+import SwiftUI
+
+struct AppViewModifier: ViewModifier {
+    #if os(iOS) || os(macOS)
+    @Environment(ThemeManager.self)
+    private var themeManager
+    #endif
+
+    func body(content: Content) -> some View {
+        content
+        #if os(iOS) || os(macOS)
+            .preferredColorScheme(themeManager.colorScheme)
+            .tint(themeManager.accentColor)
+        #endif
+    }
+}
diff --git a/Forumate/ForumateApp.swift b/Forumate/ForumateApp.swift
@@ -24,32 +24,32 @@ struct ForumateApp: App {
     #if os(iOS) || os(macOS)
     @State private var themeManager = ThemeManager()
     #endif
+
+    @State private var plusManager = PlusManager()
 
     var body: some Scene {
         WindowGroup {
             ContentView()
-                .environmentObject(appState)
-            #if os(iOS) || os(macOS)
-                .preferredColorScheme(themeManager.colorScheme)
-                .tint(themeManager.accentColor)
-            #endif
+                .modifier(AppViewModifier())
         }
-        .modelContainer(container)
+        .environmentObject(appState)
         #if os(iOS) || os(macOS)
             .environment(themeManager)
         #endif
+            .environment(plusManager)
+            .modelContainer(container)
+
         #if os(iOS) || os(visionOS) || os(macOS)
         WindowGroup("Topic Detail", id: "topic", for: TopicDetailWindowModel.self) { $detailModel in
             DetailWindowView(detailModel: detailModel)
-            #if os(iOS) || os(macOS)
-                .preferredColorScheme(themeManager.colorScheme)
-                .tint(themeManager.accentColor)
-            #endif
+                .modifier(AppViewModifier())
         }
-        .modelContainer(container)
+        .environmentObject(appState)
         #if os(iOS) || os(macOS)
             .environment(themeManager)
         #endif
+            .environment(plusManager)
+            .modelContainer(container)
         #endif
     }
 }
@@ -65,7 +65,6 @@ struct DetailWindowView: View {
         if let detailModel,
            let community = context.model(for: detailModel.communityID) as? Community {
             TopicDetail(topic: detailModel.topic)
-                .environmentObject(appState)
                 .environmentObject(CommunityDetailState(community: community))
         } else {
             PlaceholderView(text: "No Topic Detail")

diff --git a/Forumate/Other/Assets.xcassets/graph/Contents.json b/Forumate/Other/Assets.xcassets/graph/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Forumate/Other/Assets.xcassets/graph/graph.imageset/Contents.json b/Forumate/Other/Assets.xcassets/graph/graph.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "graph.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Forumate/Other/Assets.xcassets/graph/graph.imageset/graph.svg b/Forumate/Other/Assets.xcassets/graph/graph.imageset/graph.svg
diff --git a/Forumate/Other/Assets.xcassets/graph/graph1.colorset/Contents.json b/Forumate/Other/Assets.xcassets/graph/graph1.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "extended-linear-srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "214",
+          "green" : "222",
+          "red" : "248"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Forumate/Other/Assets.xcassets/graph/graph2.colorset/Contents.json b/Forumate/Other/Assets.xcassets/graph/graph2.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "extended-linear-srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "244",
+          "green" : "245",
+          "red" : "215"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}