Merge pull request #26 from noppefoxwolf/hotfix/preferredScreenEdgesD…

…eferringSystemGestures Hotfix/preferred screen edges deferring system gestures
noppefoxwolf · Dec 30, 2021 · 04f413c · 04f413c
2 parents 3fd2f47 + 04d857b
commit 04f413c
Show file tree

Hide file tree

Showing 13 changed files with 232 additions and 5 deletions.
diff --git a/Example.swiftpm/Package.swift b/Example.swiftpm/Package.swift
@@ -14,9 +14,9 @@ let package = Package(
     ],
     products: [
         .iOSApplication(
-            name: "Example",
-            targets: ["AppModule"],
-            bundleIdentifier: "dev.noppe.DebugMenu.Example",
+            name: "SwiftUIExample",
+            targets: ["SwiftUIExampleModule"],
+            bundleIdentifier: "dev.noppe.DebugMenu.SwiftUIExample",
             teamIdentifier: "FBQ6Z8AF3U",
             displayVersion: "1.0",
             bundleVersion: "1",
@@ -32,14 +32,48 @@ let package = Package(
                 .landscapeLeft,
                 .portraitUpsideDown(.when(deviceFamilies: [.pad]))
             ]
-        )
+        ),
+        .iOSApplication(
+            name: "UIKitExample",
+            targets: ["UIKItExampleModule"],
+            bundleIdentifier: "dev.noppe.DebugMenu.UIKitExample",
+            teamIdentifier: "FBQ6Z8AF3U",
+            displayVersion: "1.0",
+            bundleVersion: "1",
+            iconAssetName: "AppIcon",
+            accentColorAssetName: "AccentColor",
+            supportedDeviceFamilies: [
+                .pad,
+                .phone
+            ],
+            supportedInterfaceOrientations: [
+                .portrait,
+                .landscapeRight,
+                .landscapeLeft,
+                .portraitUpsideDown(.when(deviceFamilies: [.pad]))
+            ]
+        ),
     ],
     dependencies: [
         .package(name: "DebugMenu", path: "../")
     ],
     targets: [
         .executableTarget(
-            name: "AppModule",
+            name: "SwiftUIExampleModule",
+            dependencies: [
+                .productItem(name: "DebugMenu", package: "DebugMenu", condition: nil),
+                "Shared"
+            ]
+        ),
+        .executableTarget(
+            name: "UIKItExampleModule",
+            dependencies: [
+                .productItem(name: "DebugMenu", package: "DebugMenu", condition: nil),
+                "Shared"
+            ]
+        ),
+        .target(
+            name: "Shared",
             dependencies: [
                 .productItem(name: "DebugMenu", package: "DebugMenu", condition: nil)
             ]

diff --git a/...ource/AppModule/ColorViewController.swift → ...m/Source/Shared/ColorViewController.swift b/...ource/AppModule/ColorViewController.swift → ...m/Source/Shared/ColorViewController.swift
diff --git a/...ource/AppModule/CustomDashboardItem.swift → ...m/Source/Shared/CustomDashboardItem.swift b/...ource/AppModule/CustomDashboardItem.swift → ...m/Source/Shared/CustomDashboardItem.swift
diff --git a/...pm/Source/AppModule/CustomDebugItem.swift → ...iftpm/Source/Shared/CustomDebugItem.swift b/...pm/Source/AppModule/CustomDebugItem.swift → ...iftpm/Source/Shared/CustomDebugItem.swift
diff --git a/Example.swiftpm/Source/AppModule/App.swift → ...tpm/Source/SwiftUIExampleModule/App.swift b/Example.swiftpm/Source/AppModule/App.swift → ...tpm/Source/SwiftUIExampleModule/App.swift
@@ -1,5 +1,6 @@
 import SwiftUI
 import DebugMenu
+import Shared
 
 @main
 struct App: SwiftUI.App {

diff --git a/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json b/...assets/AccentColor.colorset/Contents.json → ...assets/AccentColor.colorset/Contents.json
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...e/AppModule/Assets.xcassets/Contents.json → ...ampleModule/Assets.xcassets/Contents.json b/...e/AppModule/Assets.xcassets/Contents.json → ...ampleModule/Assets.xcassets/Contents.json
diff --git a/Example.swiftpm/Source/UIKItExampleModule/App.swift b/Example.swiftpm/Source/UIKItExampleModule/App.swift
@@ -0,0 +1,73 @@
+import UIKit
+import DebugMenu
+import Shared
+
+@main
+class AppDelegate: NSObject, UIApplicationDelegate {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+        return true
+    }
+
+    func application(
+        _ application: UIApplication,
+        configurationForConnecting connectingSceneSession: UISceneSession,
+        options: UIScene.ConnectionOptions
+    ) -> UISceneConfiguration {
+        let configuration = UISceneConfiguration(name: nil, sessionRole: connectingSceneSession.role)
+        configuration.sceneClass = UIWindowScene.self
+        configuration.delegateClass = SceneDelegate.self
+        return configuration
+    }
+}
+
+class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+    var window: UIWindow?
+
+    func scene(
+        _ scene: UIScene, willConnectTo session: UISceneSession,
+        options connectionOptions: UIScene.ConnectionOptions
+    ) {
+        guard let windowScene = (scene as? UIWindowScene) else { return }
+        window = UIWindow(windowScene: windowScene)
+        window?.rootViewController = RootViewController()
+        window?.makeKeyAndVisible()
+
+        DebugMenu.install(
+            windowScene: windowScene,
+            items: [
+                ViewControllerDebugItem<ColorViewController>(builder: { $0.init(color: .blue) }),
+                ClearCacheDebugItem(),
+                UserDefaultsResetDebugItem(),
+                CustomDebugItem(),
+                SliderDebugItem(title: "Attack Rate", current: { 0.1 }, range: 0.0...100.0, onChange: { value in print(value) }),
+                KeyValueDebugItem(title: "UserDefaults", fetcher: { completions in
+                    let envelops = UserDefaults.standard.dictionaryRepresentation().map({ Envelope(key: $0.key, value: "\($0.value)") })
+                    completions(envelops)
+                }),
+                GroupDebugItem(title: "Info", items: [
+                    AppInfoDebugItem(),
+                    DeviceInfoDebugItem(),
+                ]),
+            ], dashboardItems: [
+                CPUUsageDashboardItem(),
+                CPUGraphDashboardItem(),
+                GPUMemoryUsageDashboardItem(),
+                MemoryUsageDashboardItem(),
+                NetworkUsageDashboardItem(),
+                FPSDashboardItem(),
+                ThermalStateDashboardItem(),
+                CustomDashboardItem(),
+                IntervalDashboardItem(title: "Reduce time", name: "dev.noppe.calc")
+            ], options: [.showsWidgetOnLaunch]
+        )
+    }
+}
+
+class RootViewController: UIViewController {
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .systemBackground
+    }
+
+    override var preferredScreenEdgesDeferringSystemGestures: UIRectEdge { .all }
+}
diff --git a/Example.swiftpm/Source/UIKItExampleModule/Assets.xcassets/AccentColor.colorset/Contents.json b/Example.swiftpm/Source/UIKItExampleModule/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Example.swiftpm/Source/UIKItExampleModule/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example.swiftpm/Source/UIKItExampleModule/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Example.swiftpm/Source/UIKItExampleModule/Assets.xcassets/Contents.json b/Example.swiftpm/Source/UIKItExampleModule/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Sources/DebugMenu/View/InAppDebuggerWindow.swift b/Sources/DebugMenu/View/InAppDebuggerWindow.swift
@@ -53,7 +53,11 @@ public class InAppDebuggerWindow: UIWindow {
             dashboardItems: dashboardItems,
             options: options
         )
+        // visible時にディスプレイサイズと同じサイズだとスクリーンエッジの設定を決める対象に選ばれるので避ける
+        window.frame.size.width += 1
         window.makeKeyAndVisible()
+        window.frame.size.width -= 1
+
         keyWindow?.makeKeyAndVisible()
         windows.append(window)
     }