Skip to content

Commit 04f413c

Browse files
authored
Merge pull request #26 from noppefoxwolf/hotfix/preferredScreenEdgesDeferringSystemGestures
Hotfix/preferred screen edges deferring system gestures
2 parents 3fd2f47 + 04d857b commit 04f413c

File tree

13 files changed

+232
-5
lines changed

13 files changed

+232
-5
lines changed

Example.swiftpm/Package.swift

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ let package = Package(
1414
],
1515
products: [
1616
.iOSApplication(
17-
name: "Example",
18-
targets: ["AppModule"],
19-
bundleIdentifier: "dev.noppe.DebugMenu.Example",
17+
name: "SwiftUIExample",
18+
targets: ["SwiftUIExampleModule"],
19+
bundleIdentifier: "dev.noppe.DebugMenu.SwiftUIExample",
2020
teamIdentifier: "FBQ6Z8AF3U",
2121
displayVersion: "1.0",
2222
bundleVersion: "1",
@@ -32,14 +32,48 @@ let package = Package(
3232
.landscapeLeft,
3333
.portraitUpsideDown(.when(deviceFamilies: [.pad]))
3434
]
35-
)
35+
),
36+
.iOSApplication(
37+
name: "UIKitExample",
38+
targets: ["UIKItExampleModule"],
39+
bundleIdentifier: "dev.noppe.DebugMenu.UIKitExample",
40+
teamIdentifier: "FBQ6Z8AF3U",
41+
displayVersion: "1.0",
42+
bundleVersion: "1",
43+
iconAssetName: "AppIcon",
44+
accentColorAssetName: "AccentColor",
45+
supportedDeviceFamilies: [
46+
.pad,
47+
.phone
48+
],
49+
supportedInterfaceOrientations: [
50+
.portrait,
51+
.landscapeRight,
52+
.landscapeLeft,
53+
.portraitUpsideDown(.when(deviceFamilies: [.pad]))
54+
]
55+
),
3656
],
3757
dependencies: [
3858
.package(name: "DebugMenu", path: "../")
3959
],
4060
targets: [
4161
.executableTarget(
42-
name: "AppModule",
62+
name: "SwiftUIExampleModule",
63+
dependencies: [
64+
.productItem(name: "DebugMenu", package: "DebugMenu", condition: nil),
65+
"Shared"
66+
]
67+
),
68+
.executableTarget(
69+
name: "UIKItExampleModule",
70+
dependencies: [
71+
.productItem(name: "DebugMenu", package: "DebugMenu", condition: nil),
72+
"Shared"
73+
]
74+
),
75+
.target(
76+
name: "Shared",
4377
dependencies: [
4478
.productItem(name: "DebugMenu", package: "DebugMenu", condition: nil)
4579
]

Example.swiftpm/Source/AppModule/ColorViewController.swift renamed to Example.swiftpm/Source/Shared/ColorViewController.swift

File renamed without changes.

Example.swiftpm/Source/AppModule/CustomDashboardItem.swift renamed to Example.swiftpm/Source/Shared/CustomDashboardItem.swift

File renamed without changes.
File renamed without changes.

Example.swiftpm/Source/AppModule/App.swift renamed to Example.swiftpm/Source/SwiftUIExampleModule/App.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import SwiftUI
22
import DebugMenu
3+
import Shared
34

45
@main
56
struct App: SwiftUI.App {

Example.swiftpm/Source/AppModule/Assets.xcassets/AccentColor.colorset/Contents.json renamed to Example.swiftpm/Source/SwiftUIExampleModule/Assets.xcassets/AccentColor.colorset/Contents.json

File renamed without changes.

Example.swiftpm/Source/AppModule/Assets.xcassets/AppIcon.appiconset/Contents.json renamed to Example.swiftpm/Source/SwiftUIExampleModule/Assets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

Example.swiftpm/Source/AppModule/Assets.xcassets/Contents.json renamed to Example.swiftpm/Source/SwiftUIExampleModule/Assets.xcassets/Contents.json

File renamed without changes.
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
import UIKit
2+
import DebugMenu
3+
import Shared
4+
5+
@main
6+
class AppDelegate: NSObject, UIApplicationDelegate {
7+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
8+
return true
9+
}
10+
11+
func application(
12+
_ application: UIApplication,
13+
configurationForConnecting connectingSceneSession: UISceneSession,
14+
options: UIScene.ConnectionOptions
15+
) -> UISceneConfiguration {
16+
let configuration = UISceneConfiguration(name: nil, sessionRole: connectingSceneSession.role)
17+
configuration.sceneClass = UIWindowScene.self
18+
configuration.delegateClass = SceneDelegate.self
19+
return configuration
20+
}
21+
}
22+
23+
class SceneDelegate: UIResponder, UIWindowSceneDelegate {
24+
var window: UIWindow?
25+
26+
func scene(
27+
_ scene: UIScene, willConnectTo session: UISceneSession,
28+
options connectionOptions: UIScene.ConnectionOptions
29+
) {
30+
guard let windowScene = (scene as? UIWindowScene) else { return }
31+
window = UIWindow(windowScene: windowScene)
32+
window?.rootViewController = RootViewController()
33+
window?.makeKeyAndVisible()
34+
35+
DebugMenu.install(
36+
windowScene: windowScene,
37+
items: [
38+
ViewControllerDebugItem<ColorViewController>(builder: { $0.init(color: .blue) }),
39+
ClearCacheDebugItem(),
40+
UserDefaultsResetDebugItem(),
41+
CustomDebugItem(),
42+
SliderDebugItem(title: "Attack Rate", current: { 0.1 }, range: 0.0...100.0, onChange: { value in print(value) }),
43+
KeyValueDebugItem(title: "UserDefaults", fetcher: { completions in
44+
let envelops = UserDefaults.standard.dictionaryRepresentation().map({ Envelope(key: $0.key, value: "\($0.value)") })
45+
completions(envelops)
46+
}),
47+
GroupDebugItem(title: "Info", items: [
48+
AppInfoDebugItem(),
49+
DeviceInfoDebugItem(),
50+
]),
51+
], dashboardItems: [
52+
CPUUsageDashboardItem(),
53+
CPUGraphDashboardItem(),
54+
GPUMemoryUsageDashboardItem(),
55+
MemoryUsageDashboardItem(),
56+
NetworkUsageDashboardItem(),
57+
FPSDashboardItem(),
58+
ThermalStateDashboardItem(),
59+
CustomDashboardItem(),
60+
IntervalDashboardItem(title: "Reduce time", name: "dev.noppe.calc")
61+
], options: [.showsWidgetOnLaunch]
62+
)
63+
}
64+
}
65+
66+
class RootViewController: UIViewController {
67+
override func viewDidLoad() {
68+
super.viewDidLoad()
69+
view.backgroundColor = .systemBackground
70+
}
71+
72+
override var preferredScreenEdgesDeferringSystemGestures: UIRectEdge { .all }
73+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"colors" : [
3+
{
4+
"idiom" : "universal"
5+
}
6+
],
7+
"info" : {
8+
"author" : "xcode",
9+
"version" : 1
10+
}
11+
}

0 commit comments

Comments
 (0)