Merge pull request #28 from mtj0928/fix-foreground-color

Fix foreground color and fix iOS's app structure

Author: mtj0928

SlideKitDemo-iOS/SlideKitDemo-iOS/SceneDelegate.swift

@@ -20,16 +20,13 @@ final class SceneDelegate: NSObject, SlideWindowSceneDelegate {
 
     var window: UIWindow?
 
-    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        guard let windowScene = (scene as? UIWindowScene) else { return }
-
-        if session.role == .externalDisplay && Self.externalDisplayManager.externalDisplayMode == .mirroring {
-            return
-        }
+    var content: some View {
+        SlideRouterView(slideIndexController: Self.slideIndexController)
+            .background(.white)
+            .foregroundColor(.black)
+    }
 
-        self.window = makeRootWindow(
-            windowScene: windowScene,
-            slidePresentationMode: session.role == .externalDisplay ? .presentation : .presenter
-        )
+    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
+        setup(scene, willConnectTo: session, options: connectionOptions)
     }
 }

SlideKitDemo-iOS/SlideKitDemo-iOS/Slides/BasicSlide.swift

@@ -19,6 +19,7 @@ struct BasicSlide: Slide {
                 HStack {
                     Text("Hoge")
                     Circle()
+                        .frame(width: 50, height: 50)
                 }
             } child: {
                 Item("AAA")

SlideKitDemo-macOS/SlideKitDemo-macOS/SlideKitDemo_macOSApp.swift

@@ -19,6 +19,7 @@ struct SlideKitDemo_macOSApp: App {
     var presentationContentView: some View {
         SlideRouterView(slideIndexController: Self.configuration.slideIndexController)
             .slideTheme(Self.configuration.theme)
+            .foregroundColor(.black) // Edit this color if you want to use another color for text color.
             .background(.white)
     }
 

SlideKitDemo-macOS/SlideKitDemo-macOS/Slides/CustomHeaderStyleSlide.swift

@@ -37,6 +37,7 @@ struct CustomHeaderStyle: HeaderSlideStyle {
                 }
             VStack(alignment: .leading, spacing: 48) {
                 configuration.content
+                    .font(.system(size: 48))
             }
             .padding()
         }
@@ -62,16 +63,14 @@ struct CustomItemStyle: ItemStyle {
                     case nil: EmptyView()
                     }
                 }
-                .font(.system(size: configuration.fontSize))
 
                 configuration.label
-                    .font(.system(size: configuration.fontSize))
                     .fixedSize()
             }
 
 
             if let child = configuration.child {
-                child.padding(.leading, configuration.fontSize)
+                child.padding(.leading)
             }
         }
     }

Sources/SlideKit/SlideWindowSceneDelegate.swift

@@ -10,7 +10,10 @@ import SwiftUI
 import UIKit
 
 public protocol SlideWindowSceneDelegate where Self: UIWindowSceneDelegate {
+    associatedtype SlideContent: View
     var window: UIWindow? { get set }
+    var content: SlideContent { get }
+
     static var slideSize: CGSize { get }
     static var slideIndexController: SlideIndexController { get }
     static var externalDisplayManager: ExternalDisplayManager { get }
@@ -19,6 +22,22 @@ public protocol SlideWindowSceneDelegate where Self: UIWindowSceneDelegate {
     func rootView(for presentationMode: SlidePresentationMode) -> AnyView
 }
 
+extension SlideWindowSceneDelegate {
+
+    public func setup(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
+        guard let windowScene = (scene as? UIWindowScene) else { return }
+
+        if session.role == .externalDisplay && Self.externalDisplayManager.externalDisplayMode == .mirroring {
+            return
+        }
+
+        self.window = makeRootWindow(
+            windowScene: windowScene,
+            slidePresentationMode: session.role == .externalDisplay ? .presentation : .presenter
+        )
+    }
+}
+
 extension SlideWindowSceneDelegate {
     func startMirroring() {
         guard self.window?.windowScene?.session.role == .externalDisplay else {
@@ -49,17 +68,38 @@ extension SlideWindowSceneDelegate {
             slideSize: Self.slideSize,
             slideIndexController: Self.slideIndexController,
             externalDisplayManager: Self.externalDisplayManager
-
-        ))
+        ) { [weak self] in
+            if let self {
+                self.content
+            } else {
+                Text("failed to cast self")
+            }
+        })
     }
 }
 
-public struct _RootView: View {
+public struct _RootView<Content: View>: View {
     let presentationMode: SlidePresentationMode
     let slideSize: CGSize
     let slideIndexController: SlideIndexController
     let externalDisplayManager: ExternalDisplayManager
 
+    let content: () -> Content
+
+    init(
+        presentationMode: SlidePresentationMode,
+        slideSize: CGSize,
+        slideIndexController: SlideIndexController,
+        externalDisplayManager: ExternalDisplayManager,
+        @ViewBuilder content: @escaping () -> Content
+    ) {
+        self.presentationMode = presentationMode
+        self.slideSize = slideSize
+        self.slideIndexController = slideIndexController
+        self.externalDisplayManager = externalDisplayManager
+        self.content = content
+    }
+
     public var body: some View {
         switch presentationMode {
         case .presenter:
@@ -68,13 +108,11 @@ public struct _RootView: View {
                 slideIndexController: slideIndexController,
                 externalDisplayManager: externalDisplayManager
             ) {
-                SlideRouterView(slideIndexController: slideIndexController)
-                    .background(.white)
+                content()
             }
         case .presentation:
             PresentationView(slideSize: slideSize) {
-                SlideRouterView(slideIndexController: slideIndexController)
-                    .background(.white)
+                content()
             }
         }
     }

Sources/SlideKit/Views/PresentationView.swift

@@ -42,7 +42,6 @@ public struct PresentationView<Content>: View where Content: View {
 #endif
 
         }
-        .preferredColorScheme(.light)
         .ignoresSafeArea()
 #if os(macOS)
         .configureWindow { window in

Sources/SlideKit/Views/SlideRouterView.swift

@@ -29,7 +29,6 @@ public struct SlideRouterView: View {
             forward: { slideIndexController.forward() }
         )
         .environment(\.slideIndexController, slideIndexController)
-        .foregroundColor(.black)
     }
 }