From 40b2a6a6dbad1aebc72393b94fb4d6de19279e51 Mon Sep 17 00:00:00 2001 From: farfromrefuge Date: Sat, 25 Nov 2023 16:34:25 +0000 Subject: [PATCH] chore: use `__ANDROID__` and `__IOS__` throughout (#10446) Standardizes usage for more macro style removal during bundling for target platforms. [skip ci] --- .../core/accessibility/accessibility-properties.ts | 2 +- packages/core/accessibility/font-scale-common.ts | 2 +- packages/core/file-system/index.ts | 8 ++++---- packages/core/ui/content-view/index.ts | 2 +- packages/core/ui/core/view-base/index.ts | 12 ++++++------ packages/core/ui/dialogs/dialogs-common.ts | 6 +++--- packages/core/ui/frame/frame-common.ts | 6 +++--- packages/core/ui/gestures/touch-manager.ts | 4 ++-- packages/core/ui/image/image-common.ts | 2 +- .../ui/layouts/dock-layout/dock-layout-common.ts | 2 +- .../flexbox-layout/flexbox-layout-common.ts | 10 +++++----- .../ui/layouts/stack-layout/stack-layout-common.ts | 2 +- .../ui/layouts/wrap-layout/wrap-layout-common.ts | 6 +++--- packages/core/ui/page/page-common.ts | 4 ++-- packages/core/ui/search-bar/search-bar-common.ts | 2 +- packages/core/ui/slider/slider-common.ts | 6 +++--- packages/core/ui/tab-view/tab-view-common.ts | 4 ++-- packages/core/ui/text-base/text-base-common.ts | 14 +++++++------- packages/core/ui/transition/shared-transition.ts | 6 +++--- packages/core/utils/debug.ts | 2 +- packages/core/utils/platform-check.ts | 2 +- 21 files changed, 52 insertions(+), 52 deletions(-) diff --git a/packages/core/accessibility/accessibility-properties.ts b/packages/core/accessibility/accessibility-properties.ts index 3e10c6cf2..ba2860c2c 100644 --- a/packages/core/accessibility/accessibility-properties.ts +++ b/packages/core/accessibility/accessibility-properties.ts @@ -55,7 +55,7 @@ export const iosAccessibilityMaxFontScaleProperty = new InheritedCssProperty= 29) { + if (__ANDROID__ && SDK_VERSION >= 29) { fileAccess = new FileSystemAccess29(); } else { fileAccess = new FileSystemAccess(); @@ -275,7 +275,7 @@ function getAndroidDirectory(value: AndroidDirectory): { path: string; column: a class Android { createFile(options: { relativePath?: string; name: string; mime: string; directory: AndroidDirectory }): File { - if (!global.isAndroid) { + if (!__ANDROID__) { throw new Error(`createFile is available on Android only!`); } @@ -326,7 +326,7 @@ export class File extends FileSystemEntity { throw error; }; - if (global.isAndroid && copy) { + if (__ANDROID__ && copy) { if (path.startsWith('content:')) { const fileInfo = getFileAccess().getFile(path, onError); // falls back to creating a temp file without a known extension. @@ -897,7 +897,7 @@ export namespace knownFolders { export namespace ios { function _checkPlatform(knownFolderName: string) { - if (!global.isIOS) { + if (!__IOS__) { throw new Error(`The "${knownFolderName}" known folder is available on iOS only!`); } } diff --git a/packages/core/ui/content-view/index.ts b/packages/core/ui/content-view/index.ts index 94074a0eb..b28861022 100644 --- a/packages/core/ui/content-view/index.ts +++ b/packages/core/ui/content-view/index.ts @@ -27,7 +27,7 @@ export class ContentView extends CustomLayoutView implements AddChildFromBuilder } this._onContentChanged(oldView, value); - if (global.isIOS && oldView !== value) { + if (__IOS__ && oldView !== value) { this.requestLayout(); } } diff --git a/packages/core/ui/core/view-base/index.ts b/packages/core/ui/core/view-base/index.ts index 58dd4c561..79ca72c45 100644 --- a/packages/core/ui/core/view-base/index.ts +++ b/packages/core/ui/core/view-base/index.ts @@ -991,7 +991,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition private resetNativeViewInternal(): void { // const nativeView = this.nativeViewProtected; - // if (nativeView && global.isAndroid) { + // if (nativeView && __ANDROID__) { // const recycle = this.recycleNativeView; // if (recycle === "always" || (recycle === "auto" && !this._disableNativeViewRecycling)) { // resetNativeView(this); @@ -1038,7 +1038,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition // or for backward compatibility - set before _setupUI in iOS constructor. let nativeView = this.nativeViewProtected; - // if (global.isAndroid) { + // if (__ANDROID__) { // const recycle = this.recycleNativeView; // if (recycle === "always" || (recycle === "auto" && !this._disableNativeViewRecycling)) { // nativeView = getNativeView(context, this.typeName); @@ -1048,7 +1048,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition nativeView = this.createNativeView(); } - if (global.isAndroid) { + if (__ANDROID__) { // this check is also unecessary as this code should never be reached with _androidView != null unless reusable = true // also adding this check for feature flag safety if (this._androidView !== nativeView || !this.reusable) { @@ -1172,7 +1172,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition } // const nativeView = this.nativeViewProtected; - // if (nativeView && global.isAndroid) { + // if (nativeView && __ANDROID__) { // const recycle = this.recycleNativeView; // let shouldRecycle = false; // if (recycle === "always") { @@ -1182,7 +1182,7 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition // shouldRecycle = propertiesSet <= this.recyclePropertyCounter; // } - // // const nativeParent = global.isAndroid ? (nativeView).getParent() : (nativeView).superview; + // // const nativeParent = __ANDROID__ ? (nativeView).getParent() : (nativeView).superview; // const nativeParent = (nativeView).getParent(); // const animation = (nativeView).getAnimation(); // if (shouldRecycle && !nativeParent && !animation) { @@ -1433,7 +1433,7 @@ bindingContextProperty.register(ViewBase); export const hiddenProperty = new Property({ name: 'hidden', defaultValue: false, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: booleanConverter, valueChanged: (target, oldValue, newValue) => { if (target) { diff --git a/packages/core/ui/dialogs/dialogs-common.ts b/packages/core/ui/dialogs/dialogs-common.ts index b54b122a7..40357a437 100644 --- a/packages/core/ui/dialogs/dialogs-common.ts +++ b/packages/core/ui/dialogs/dialogs-common.ts @@ -271,7 +271,7 @@ export function getButtonColors(): { color: Color; backgroundColor: Color } { if (!button) { const Button = require('../button').Button; button = new Button(); - if (global.isIOS) { + if (__IOS__) { button._setupUI({}); } } @@ -290,7 +290,7 @@ export function getLabelColor(): Color { if (!label) { const Label = require('../label').Label; label = new Label(); - if (global.isIOS) { + if (__IOS__) { label._setupUI({}); } } @@ -307,7 +307,7 @@ export function getTextFieldColor(): Color { if (!textField) { const TextField = require('../text-field').TextField; textField = new TextField(); - if (global.isIOS) { + if (__IOS__) { textField._setupUI({}); } } diff --git a/packages/core/ui/frame/frame-common.ts b/packages/core/ui/frame/frame-common.ts index fa42e9ac6..c3f4ba055 100644 --- a/packages/core/ui/frame/frame-common.ts +++ b/packages/core/ui/frame/frame-common.ts @@ -557,11 +557,11 @@ export class FrameBase extends CustomLayoutView { public _getNavigationTransition(entry: NavigationEntry): NavigationTransition { if (entry) { - if (global.isIOS && entry.transitioniOS !== undefined) { + if (__IOS__ && entry.transitioniOS !== undefined) { return entry.transitioniOS; } - if (global.isAndroid && entry.transitionAndroid !== undefined) { + if (__ANDROID__ && entry.transitionAndroid !== undefined) { return entry.transitionAndroid; } @@ -768,5 +768,5 @@ export const defaultPage = new Property({ }); defaultPage.register(FrameBase); -export const actionBarVisibilityProperty = new Property({ name: 'actionBarVisibility', defaultValue: 'auto', affectsLayout: global.isIOS }); +export const actionBarVisibilityProperty = new Property({ name: 'actionBarVisibility', defaultValue: 'auto', affectsLayout: __IOS__ }); actionBarVisibilityProperty.register(FrameBase); diff --git a/packages/core/ui/gestures/touch-manager.ts b/packages/core/ui/gestures/touch-manager.ts index 15b411136..3b834bad6 100644 --- a/packages/core/ui/gestures/touch-manager.ts +++ b/packages/core/ui/gestures/touch-manager.ts @@ -65,7 +65,7 @@ export class TouchManager { const handleDown = (view?.touchAnimation && (view?.touchAnimation).down) || (TouchManager.animations && TouchManager.animations.down); const handleUp = (view?.touchAnimation && (view?.touchAnimation).up) || (TouchManager.animations && TouchManager.animations.up); - if (global.isIOS) { + if (__IOS__) { if (view?.ios?.addTargetActionForControlEvents) { // can use UIControlEvents if (!TouchManager.touchHandlers) { @@ -215,7 +215,7 @@ export let TouchControlHandler: { ensureTouchControlHandlers(); function ensureTouchControlHandlers() { - if (global.isIOS) { + if (__IOS__) { @NativeClass class TouchHandlerImpl extends NSObject { private _owner: WeakRef; diff --git a/packages/core/ui/image/image-common.ts b/packages/core/ui/image/image-common.ts index b5654aa73..be1af749a 100644 --- a/packages/core/ui/image/image-common.ts +++ b/packages/core/ui/image/image-common.ts @@ -153,7 +153,7 @@ isLoadingProperty.register(ImageBase); export const stretchProperty = new Property({ name: 'stretch', defaultValue: 'aspectFit', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, }); stretchProperty.register(ImageBase); diff --git a/packages/core/ui/layouts/dock-layout/dock-layout-common.ts b/packages/core/ui/layouts/dock-layout/dock-layout-common.ts index e9cc01979..3b1b46d84 100644 --- a/packages/core/ui/layouts/dock-layout/dock-layout-common.ts +++ b/packages/core/ui/layouts/dock-layout/dock-layout-common.ts @@ -53,7 +53,7 @@ dockProperty.register(View); export const stretchLastChildProperty = new Property({ name: 'stretchLastChild', defaultValue: true, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: booleanConverter, }); stretchLastChildProperty.register(DockLayoutBase); diff --git a/packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts b/packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts index 98918586e..43c3e0831 100644 --- a/packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts +++ b/packages/core/ui/layouts/flexbox-layout/flexbox-layout-common.ts @@ -222,7 +222,7 @@ export const flexDirectionProperty = new CssProperty({ name: 'flexDirection', cssName: 'flex-direction', defaultValue: FlexDirection.ROW, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: FlexDirection.parse, }); flexDirectionProperty.register(Style); @@ -231,7 +231,7 @@ export const flexWrapProperty = new CssProperty({ name: 'flexWrap', cssName: 'flex-wrap', defaultValue: 'nowrap', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: FlexWrap.parse, }); flexWrapProperty.register(Style); @@ -240,7 +240,7 @@ export const justifyContentProperty = new CssProperty({ name: 'justifyContent', cssName: 'justify-content', defaultValue: JustifyContent.FLEX_START, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: JustifyContent.parse, }); justifyContentProperty.register(Style); @@ -249,7 +249,7 @@ export const alignItemsProperty = new CssProperty({ name: 'alignItems', cssName: 'align-items', defaultValue: AlignItems.STRETCH, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: AlignItems.parse, }); alignItemsProperty.register(Style); @@ -258,7 +258,7 @@ export const alignContentProperty = new CssProperty({ name: 'alignContent', cssName: 'align-content', defaultValue: AlignContent.STRETCH, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: AlignContent.parse, }); alignContentProperty.register(Style); diff --git a/packages/core/ui/layouts/stack-layout/stack-layout-common.ts b/packages/core/ui/layouts/stack-layout/stack-layout-common.ts index 893f41b86..ff17789b0 100644 --- a/packages/core/ui/layouts/stack-layout/stack-layout-common.ts +++ b/packages/core/ui/layouts/stack-layout/stack-layout-common.ts @@ -16,7 +16,7 @@ const converter = makeParser(makeValidator('horizonta export const orientationProperty = new Property({ name: 'orientation', defaultValue: 'vertical', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: converter, }); orientationProperty.register(StackLayoutBase); diff --git a/packages/core/ui/layouts/wrap-layout/wrap-layout-common.ts b/packages/core/ui/layouts/wrap-layout/wrap-layout-common.ts index 80eb9df4d..2bb2050d3 100644 --- a/packages/core/ui/layouts/wrap-layout/wrap-layout-common.ts +++ b/packages/core/ui/layouts/wrap-layout/wrap-layout-common.ts @@ -21,7 +21,7 @@ WrapLayoutBase.prototype.recycleNativeView = 'auto'; export const itemWidthProperty = new Property({ name: 'itemWidth', defaultValue: 'auto', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: (v) => Length.parse(v), valueChanged: (target, oldValue, newValue) => (target.effectiveItemWidth = Length.toDevicePixels(newValue, -1)), }); @@ -30,7 +30,7 @@ itemWidthProperty.register(WrapLayoutBase); export const itemHeightProperty = new Property({ name: 'itemHeight', defaultValue: 'auto', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: (v) => Length.parse(v), valueChanged: (target, oldValue, newValue) => (target.effectiveItemHeight = Length.toDevicePixels(newValue, -1)), }); @@ -40,7 +40,7 @@ const converter = makeParser(makeValidator({ name: 'orientation', defaultValue: CoreTypes.Orientation.horizontal, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: converter, }); orientationProperty.register(WrapLayoutBase); diff --git a/packages/core/ui/page/page-common.ts b/packages/core/ui/page/page-common.ts index 709b3afe8..b238419f4 100644 --- a/packages/core/ui/page/page-common.ts +++ b/packages/core/ui/page/page-common.ts @@ -185,7 +185,7 @@ export interface PageBase { */ export const actionBarHiddenProperty = new Property({ name: 'actionBarHidden', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: booleanConverter, }); actionBarHiddenProperty.register(PageBase); @@ -196,7 +196,7 @@ actionBarHiddenProperty.register(PageBase); export const backgroundSpanUnderStatusBarProperty = new Property({ name: 'backgroundSpanUnderStatusBar', defaultValue: false, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: booleanConverter, }); backgroundSpanUnderStatusBarProperty.register(PageBase); diff --git a/packages/core/ui/search-bar/search-bar-common.ts b/packages/core/ui/search-bar/search-bar-common.ts index 71574d027..e0110cf39 100644 --- a/packages/core/ui/search-bar/search-bar-common.ts +++ b/packages/core/ui/search-bar/search-bar-common.ts @@ -20,7 +20,7 @@ SearchBarBase.prototype.recycleNativeView = 'auto'; export const textProperty = new Property({ name: 'text', defaultValue: '', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, }); textProperty.register(SearchBarBase); diff --git a/packages/core/ui/slider/slider-common.ts b/packages/core/ui/slider/slider-common.ts index 507ddcbce..7d8e22e74 100644 --- a/packages/core/ui/slider/slider-common.ts +++ b/packages/core/ui/slider/slider-common.ts @@ -39,7 +39,7 @@ export const valueProperty = new CoercibleProperty({ return value; }, - valueConverter: (v) => (global.isIOS ? parseFloat(v) : parseInt(v)), + valueConverter: (v) => (__IOS__ ? parseFloat(v) : parseInt(v)), }); valueProperty.register(SliderBase); @@ -53,7 +53,7 @@ export const minValueProperty = new Property({ maxValueProperty.coerce(target); valueProperty.coerce(target); }, - valueConverter: (v) => (global.isIOS ? parseFloat(v) : parseInt(v)), + valueConverter: (v) => (__IOS__ ? parseFloat(v) : parseInt(v)), }); minValueProperty.register(SliderBase); @@ -72,6 +72,6 @@ export const maxValueProperty = new CoercibleProperty({ return value; }, valueChanged: (target, oldValue, newValue) => valueProperty.coerce(target), - valueConverter: (v) => (global.isIOS ? parseFloat(v) : parseInt(v)), + valueConverter: (v) => (__IOS__ ? parseFloat(v) : parseInt(v)), }); maxValueProperty.register(SliderBase); diff --git a/packages/core/ui/tab-view/tab-view-common.ts b/packages/core/ui/tab-view/tab-view-common.ts index eac13467e..c3d4d0370 100644 --- a/packages/core/ui/tab-view/tab-view-common.ts +++ b/packages/core/ui/tab-view/tab-view-common.ts @@ -216,7 +216,7 @@ export function traceMissingIcon(icon: string) { export const selectedIndexProperty = new CoercibleProperty({ name: 'selectedIndex', defaultValue: -1, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueChanged: (target, oldValue, newValue) => { target.onSelectedIndexChanged(oldValue, newValue); }, @@ -257,7 +257,7 @@ androidIconRenderingModeProperty.register(TabViewBase); export const androidOffscreenTabLimitProperty = new Property({ name: 'androidOffscreenTabLimit', defaultValue: 1, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: (v) => parseInt(v), }); androidOffscreenTabLimitProperty.register(TabViewBase); diff --git a/packages/core/ui/text-base/text-base-common.ts b/packages/core/ui/text-base/text-base-common.ts index 739525c46..274f4f8da 100644 --- a/packages/core/ui/text-base/text-base-common.ts +++ b/packages/core/ui/text-base/text-base-common.ts @@ -225,7 +225,7 @@ export function isBold(fontWeight: FontWeightType): boolean { export const textProperty = new Property({ name: 'text', defaultValue: '', - affectsLayout: global.isAndroid, + affectsLayout: __ANDROID__, }); textProperty.register(TextBaseCommon); @@ -286,7 +286,7 @@ textTransformProperty.register(Style); export const textShadowProperty = new CssProperty({ name: 'textShadow', cssName: 'text-shadow', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: (value) => { return parseCSSShadow(value); }, @@ -296,7 +296,7 @@ textShadowProperty.register(Style); export const textStrokeProperty = new CssProperty({ name: 'textStroke', cssName: 'text-stroke', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: (value) => { return parseCSSStroke(value); }, @@ -308,7 +308,7 @@ export const whiteSpaceProperty = new CssProperty({ name: 'letterSpacing', cssName: 'letter-spacing', defaultValue: 0, - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: (v) => parseFloat(v), }); letterSpacingProperty.register(Style); @@ -344,7 +344,7 @@ letterSpacingProperty.register(Style); export const lineHeightProperty = new InheritedCssProperty({ name: 'lineHeight', cssName: 'line-height', - affectsLayout: global.isIOS, + affectsLayout: __IOS__, valueConverter: (v) => parseFloat(v), }); lineHeightProperty.register(Style); diff --git a/packages/core/ui/transition/shared-transition.ts b/packages/core/ui/transition/shared-transition.ts index 45b6bc4a2..38af17385 100644 --- a/packages/core/ui/transition/shared-transition.ts +++ b/packages/core/ui/transition/shared-transition.ts @@ -177,7 +177,7 @@ export class SharedTransition { if (isNumber(pageEnd?.duration)) { // Android uses milliseconds/iOS uses seconds // users pass in milliseconds - transition.setDuration(global.isIOS ? pageEnd?.duration / 1000 : pageEnd?.duration); + transition.setDuration(__IOS__ ? pageEnd?.duration / 1000 : pageEnd?.duration); } return { instance: transition }; } @@ -365,9 +365,9 @@ export function getPageStartDefaultsForType(type: TransitionNavigationType) { } function getPlatformWidth() { - return global.isAndroid ? Screen.mainScreen.widthPixels : Screen.mainScreen.widthDIPs; + return __ANDROID__ ? Screen.mainScreen.widthPixels : Screen.mainScreen.widthDIPs; } function getPlatformHeight() { - return global.isAndroid ? Screen.mainScreen.heightPixels : Screen.mainScreen.heightDIPs; + return __ANDROID__ ? Screen.mainScreen.heightPixels : Screen.mainScreen.heightDIPs; } diff --git a/packages/core/utils/debug.ts b/packages/core/utils/debug.ts index 8b0819e21..c830a0a67 100644 --- a/packages/core/utils/debug.ts +++ b/packages/core/utils/debug.ts @@ -61,7 +61,7 @@ export class ScopeError extends Error { formattedMessage = message || inner.message || undefined; } super(formattedMessage); - this.stack = global.isAndroid ? 'Error: ' + this.message + '\n' + inner.stack.substr(inner.stack.indexOf('\n') + 1) : inner.stack; + this.stack = __ANDROID__ ? 'Error: ' + this.message + '\n' + inner.stack.substr(inner.stack.indexOf('\n') + 1) : inner.stack; this.message = formattedMessage; } } diff --git a/packages/core/utils/platform-check.ts b/packages/core/utils/platform-check.ts index 68f8385d9..5b25c18d3 100644 --- a/packages/core/utils/platform-check.ts +++ b/packages/core/utils/platform-check.ts @@ -8,7 +8,7 @@ export function platformCheck(parent?: string) { { get(_, prop) { const propPretty = [parent, prop.toString()].join('.'); - const hintPlatformCheck = global.isAndroid ? 'global.isIOS' : 'global.isAndroid'; + const hintPlatformCheck = __ANDROID__ ? '__IOS__' : '__ANDROID__'; // prettier-ignore const errorMsg = [