Skip to content

Commit e0f3e18

Browse files
neoneyeneoneye
committed
statusbar inside the simulator is now the same colors as on a physical device
1 parent d2cea60 commit e0f3e18

6 files changed

Lines changed: 31 additions & 25 deletions

File tree

‎Source/TriangleDraw.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
42851C8D2301F7330047C7D0 /* test_orientation_upward.pbm in Resources */ = {isa = PBXBuildFile; fileRef = 42851C8B2301F7330047C7D0 /* test_orientation_upward.pbm */; };
6969
42851C8F2301F7760047C7D0 /* E2CanvasPointOrientationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42851C8E2301F7760047C7D0 /* E2CanvasPointOrientationTests.swift */; };
7070
428666A6296EC83A001F0192 /* BrowserMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428666A5296EC83A001F0192 /* BrowserMenuView.swift */; };
71+
428762DC2974511000AA8EE8 /* CanvasNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 428762DB2974511000AA8EE8 /* CanvasNavigationController.swift */; };
7172
4289827921E7EDA600FC0431 /* BorderedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4289827821E7EDA600FC0431 /* BorderedButton.swift */; };
7273
428B12961832A46500718BEA /* CanvasVC.strings in Resources */ = {isa = PBXBuildFile; fileRef = 428B12911832A46500718BEA /* CanvasVC.strings */; };
7374
428B12DF1832A90700718BEA /* CanvasVC.strings in Resources */ = {isa = PBXBuildFile; fileRef = 428B12DD1832A90700718BEA /* CanvasVC.strings */; };
@@ -430,6 +431,7 @@
430431
42851C8E2301F7760047C7D0 /* E2CanvasPointOrientationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = E2CanvasPointOrientationTests.swift; sourceTree = "<group>"; };
431432
42855B9F19CDFE030000420E /* TriangleDrawMain-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TriangleDrawMain-Bridging-Header.h"; sourceTree = "<group>"; };
432433
428666A5296EC83A001F0192 /* BrowserMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserMenuView.swift; sourceTree = "<group>"; };
434+
428762DB2974511000AA8EE8 /* CanvasNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CanvasNavigationController.swift; sourceTree = "<group>"; };
433435
4289827821E7EDA600FC0431 /* BorderedButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BorderedButton.swift; sourceTree = "<group>"; };
434436
428B12921832A46500718BEA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = CanvasVC.strings; sourceTree = "<group>"; };
435437
428B12DE1832A90700718BEA /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt_PT; path = CanvasVC.strings; sourceTree = "<group>"; };
@@ -963,6 +965,7 @@
963965
42AF9413215451C200D07373 /* AAPLMathUtilities.h */,
964966
42AF9416215451C200D07373 /* AAPLMathUtilities.m */,
965967
42F236B61763FB0500C5D3B9 /* Assets */,
968+
428762DB2974511000AA8EE8 /* CanvasNavigationController.swift */,
966969
426B951222CFE86500DB9359 /* CanvasViewController.storyboard */,
967970
42DE377320FDEEC50007845B /* CanvasViewController.swift */,
968971
42608ED721CEA5F500A99669 /* CanvasViewController+ConfigureHCView.swift */,
@@ -1895,6 +1898,7 @@
18951898
42E227C4210373E000D112E7 /* TDCalculateCubicBezier.swift in Sources */,
18961899
42608ECE21CE77C700A99669 /* UIEdgeInsets+InsetsByAdding.swift in Sources */,
18971900
427B1657216914FB00228748 /* TDCanvasDrawingProtocol.swift in Sources */,
1901+
428762DC2974511000AA8EE8 /* CanvasNavigationController.swift in Sources */,
18981902
42E227C9210373E000D112E7 /* UITextField+TDAlign.swift in Sources */,
18991903
42AF941C215451C200D07373 /* HCBuildEdgeAroundHexagon.swift in Sources */,
19001904
42608ED221CE832000A99669 /* CGRect+FitSizeInSize.swift in Sources */,

‎Source/TriangleDrawMain/Browser/BrowserViewController.swift‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,6 @@ class BrowserViewController: UIDocumentBrowserViewController {
9696
customActions = [action]
9797
}
9898

99-
override var preferredStatusBarStyle: UIStatusBarStyle {
100-
101-
// Since the `UIDocumentBrowserViewController` is configured to use the "dark" browser user interface style, using the "lightContent" for the
102-
// status bar is a good choice.
103-
return UIStatusBarStyle.default
104-
}
105-
10699
// MARK: Gear that opens a Menu
107100

108101
func menu_installMenuButton() {

‎Source/TriangleDrawMain/Canvas/CanvasNavigationController.swift‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// MIT license. Copyright (c) 2023 TriangleDraw. All rights reserved.
2+
import UIKit
3+
4+
/// Semitransparent with blurry background.
5+
class CanvasNavigationController: UINavigationController {
6+
7+
func configure() {
8+
let appearance = UINavigationBarAppearance()
9+
appearance.configureWithTransparentBackground()
10+
appearance.backgroundColor = UIColor.clear
11+
appearance.backgroundEffect = UIBlurEffect(style: .dark)
12+
appearance.titleTextAttributes = [.foregroundColor: UIColor.white]
13+
appearance.largeTitleTextAttributes = [.foregroundColor: UIColor.white]
14+
self.navigationBar.standardAppearance = appearance
15+
self.navigationBar.scrollEdgeAppearance = appearance
16+
self.navigationBar.compactAppearance = appearance
17+
}
18+
19+
override var preferredStatusBarStyle: UIStatusBarStyle {
20+
return .lightContent
21+
}
22+
}

‎Source/TriangleDrawMain/Canvas/CanvasViewController.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@ class CanvasViewController: UIViewController {
5959

6060
static func createInsideNavigationController() -> (UINavigationController, CanvasViewController) {
6161
let vc = CanvasViewController.create()
62-
let nc = UINavigationController(rootViewController: vc)
63-
nc.navigationBar.barStyle = .black
64-
nc.modalTransitionStyle = .crossDissolve
65-
return (nc, vc)
62+
let nc = CanvasNavigationController(rootViewController: vc)
63+
nc.configure()
64+
return (nc, vc)
6665
}
6766

6867
required init?(coder aDecoder: NSCoder) {

‎Source/TriangleDrawMain/Main/AppDelegate.swift‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4848
trackActivation(runCount)
4949
}
5050

51-
func configureNavigationBar() {
52-
if #available(iOS 15, *) {
53-
// On the draw page, the navigationbar is semitransparent with blurry background.
54-
let appearance = UINavigationBarAppearance()
55-
appearance.configureWithTransparentBackground()
56-
appearance.backgroundColor = UIColor.clear
57-
appearance.backgroundEffect = UIBlurEffect(style: .dark)
58-
UINavigationBar.appearance().standardAppearance = appearance
59-
UINavigationBar.appearance().scrollEdgeAppearance = appearance
60-
UINavigationBar.appearance().compactAppearance = appearance
61-
}
62-
}
63-
6451
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
6552
LogHelper.setup_mainExecutable()
6653

6754
//AppDelegate.resetAppleLanguagesAfterUnittest()
6855

69-
configureNavigationBar()
7056
dumpSystemInfo()
7157
trackLaunch()
7258

‎Source/TriangleDrawMain/Resources/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
</array>
7777
<key>UISupportsDocumentBrowser</key>
7878
<true/>
79+
<key>UIViewControllerBasedStatusBarAppearance</key>
80+
<true/>
7981
<key>UTExportedTypeDeclarations</key>
8082
<array>
8183
<dict>

0 commit comments

Comments
 (0)