javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-19 06:10:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:NativeScript/NativeScript

Browse Source
This commit is contained in:
Martin Guillon
2021-08-02 15:01:32 +02:00
parent ae193189ae d0f00e24d8
commit 880215a3b1
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/index.d.ts vendored
View File

@ -8,7 +8,7 @@
export type { NativeScriptConfig } from './config'; export type { NativeScriptConfig } from './config';
export { iOSApplication, AndroidApplication } from './application'; export { iOSApplication, AndroidApplication } from './application';
export type { ApplicationEventData, LaunchEventData, OrientationChangedEventData, UnhandledErrorEventData, DiscardedErrorEventData, CssChangedEventData, LoadAppCSSEventData, AndroidActivityEventData, AndroidActivityBundleEventData, AndroidActivityRequestPermissionsEventData, AndroidActivityResultEventData, AndroidActivityNewIntentEventData, AndroidActivityBackPressedEventData, SystemAppearanceChangedEventData } from './application'; export type { ApplicationEventData, LaunchEventData, OrientationChangedEventData, UnhandledErrorEventData, DiscardedErrorEventData, CssChangedEventData, LoadAppCSSEventData, AndroidActivityEventData, AndroidActivityBundleEventData, AndroidActivityRequestPermissionsEventData, AndroidActivityResultEventData, AndroidActivityNewIntentEventData, AndroidActivityBackPressedEventData, SystemAppearanceChangedEventData } from './application';
import { systemAppearanceChanged, getMainEntry, getRootView, _resetRootView, getResources, setResources, setCssFileName, getCssFileName, loadAppCss, addCss, on, off, notify, hasListeners, run, orientation, getNativeApplication, hasLaunched, systemAppearance } from './application'; import { systemAppearanceChanged, getMainEntry, getRootView, _resetRootView, getResources, setResources, setCssFileName, getCssFileName, loadAppCss, addCss, on, off, notify, hasListeners, run, orientation, getNativeApplication, hasLaunched, systemAppearance, setAutoSystemAppearanceChanged } from './application';
export declare const Application: { export declare const Application: {
launchEvent: string; launchEvent: string;
displayedEvent: string; displayedEvent: string;
@ -40,6 +40,7 @@ export declare const Application: {
getNativeApplication: typeof getNativeApplication; getNativeApplication: typeof getNativeApplication;
hasLaunched: typeof hasLaunched; hasLaunched: typeof hasLaunched;
systemAppearance: typeof systemAppearance; systemAppearance: typeof systemAppearance;
setAutoSystemAppearanceChanged: typeof setAutoSystemAppearanceChanged;
android: import('./application').AndroidApplication; android: import('./application').AndroidApplication;
ios: import('./application').iOSApplication; ios: import('./application').iOSApplication;
}; };

3
packages/core/index.ts
View File

@ -5,7 +5,7 @@ import './globals';
export { iOSApplication, AndroidApplication } from './application'; export { iOSApplication, AndroidApplication } from './application';
export type { ApplicationEventData, LaunchEventData, OrientationChangedEventData, UnhandledErrorEventData, DiscardedErrorEventData, CssChangedEventData, LoadAppCSSEventData, AndroidActivityEventData, AndroidActivityBundleEventData, AndroidActivityRequestPermissionsEventData, AndroidActivityResultEventData, AndroidActivityNewIntentEventData, AndroidActivityBackPressedEventData, SystemAppearanceChangedEventData } from './application'; export type { ApplicationEventData, LaunchEventData, OrientationChangedEventData, UnhandledErrorEventData, DiscardedErrorEventData, CssChangedEventData, LoadAppCSSEventData, AndroidActivityEventData, AndroidActivityBundleEventData, AndroidActivityRequestPermissionsEventData, AndroidActivityResultEventData, AndroidActivityNewIntentEventData, AndroidActivityBackPressedEventData, SystemAppearanceChangedEventData } from './application';
import { fontScaleChangedEvent, launchEvent, displayedEvent, uncaughtErrorEvent, discardedErrorEvent, suspendEvent, resumeEvent, exitEvent, lowMemoryEvent, orientationChangedEvent, systemAppearanceChanged, systemAppearanceChangedEvent, getMainEntry, getRootView, _resetRootView, getResources, setResources, setCssFileName, getCssFileName, loadAppCss, addCss, on, off, notify, hasListeners, run, orientation, getNativeApplication, hasLaunched, android as appAndroid, ios as iosApp, systemAppearance } from './application'; import { fontScaleChangedEvent, launchEvent, displayedEvent, uncaughtErrorEvent, discardedErrorEvent, suspendEvent, resumeEvent, exitEvent, lowMemoryEvent, orientationChangedEvent, systemAppearanceChanged, systemAppearanceChangedEvent, getMainEntry, getRootView, _resetRootView, getResources, setResources, setCssFileName, getCssFileName, loadAppCss, addCss, on, off, notify, hasListeners, run, orientation, getNativeApplication, hasLaunched, android as appAndroid, ios as iosApp, systemAppearance, setAutoSystemAppearanceChanged } from './application';
export const Application = { export const Application = {
launchEvent, launchEvent,
displayedEvent, displayedEvent,
@ -38,6 +38,7 @@ export const Application = {
getNativeApplication, getNativeApplication,
hasLaunched, hasLaunched,
systemAppearance, systemAppearance,
setAutoSystemAppearanceChanged,
android: appAndroid, android: appAndroid,
ios: iosApp, ios: iosApp,

2
packages/core/ui/core/view/index.android.ts
View File

@ -1317,7 +1317,7 @@ function createNativePercentLengthProperty(options: NativePercentLengthPropertyO
setPercent = options.setPercent || percentNotSupported; setPercent = options.setPercent || percentNotSupported;
options = null; options = null;
} }
if (length == 'auto' || !length) { if (length == 'auto' || length == null) {
// tslint:disable-line // tslint:disable-line
setPixels(this.nativeViewProtected, auto); setPixels(this.nativeViewProtected, auto);
} else if (typeof length === 'number') { } else if (typeof length === 'number') {