javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(dark-mode): window and page background color

Browse Source
This commit is contained in:
Vasil Chimev
2019-09-09 20:52:47 +03:00
parent 948fc20114
commit ed383d9b75
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tns-core-modules/application/application.ios.ts
View File

@@ -27,6 +27,7 @@ import { ios } from "../utils/utils";
const IOS_PLATFORM = "ios";
const getVisibleViewController = ios.getVisibleViewController;
const majorVersion = ios.MajorVersion;
// NOTE: UIResponder with implementation of window - related to https://github.com/NativeScript/ios-runtime/issues/430
// TODO: Refactor the UIResponder to use Typescript extends when this issue is resolved:
@@ -39,8 +40,8 @@ const Responder = (<any>UIResponder).extend({
// NOOP
}
}, {
protocols: [UIApplicationDelegate]
}
protocols: [UIApplicationDelegate]
}
);
class NotificationObserver extends NSObject {
@@ -158,11 +159,19 @@ class IOSApplication implements IOSApplicationDefinition {
}
this._window = UIWindow.alloc().initWithFrame(UIScreen.mainScreen.bounds);
// TODO: add CompatibilityColor.backgroundColor;
let backgroundColor;
if (majorVersion <= 12) {
backgroundColor = UIColor.whiteColor;
} else {
backgroundColor = UIColor.systemBackgroundColor;
}
// TODO: Expose Window module so that it can we styled from XML & CSS
this._window.backgroundColor = UIColor.whiteColor;
this._window.backgroundColor = backgroundColor;
this.notifyAppStarted(notification);
}
public notifyAppStarted(notification?: NSNotification) {

15
tns-core-modules/ui/page/page.ios.ts
View File

@@ -148,7 +148,7 @@ class UIViewControllerImpl extends UIViewController {
const isReplace = navigationContext.navigationType === NavigationType.replace;
frame.setCurrent(newEntry, navigationContext.navigationType);
if (isReplace) {
let controller = newEntry.resolvedPage.ios;
if (controller) {
@@ -282,7 +282,6 @@ class UIViewControllerImpl extends UIViewController {
}
}
const whiteColor = new Color("white").ios;
export class Page extends PageBase {
nativeViewProtected: UIView;
viewController: UIViewControllerImpl;
@@ -294,7 +293,17 @@ export class Page extends PageBase {
super();
const controller = UIViewControllerImpl.initWithOwner(new WeakRef(this));
this.viewController = this._ios = controller;
controller.view.backgroundColor = whiteColor;
// Make transitions look good
let backgroundColor;
if (majorVersion <= 12) {
backgroundColor = UIColor.whiteColor;
} else {
backgroundColor = UIColor.systemBackgroundColor;
}
// TODO: add CompatibilityColor.backgroundColor;
controller.view.backgroundColor = backgroundColor;
}
createNativeView() {