@nativescript/core 8.8.0-next-07-01-2024-9747699474 → 8.8.0-pre-next-07-02-2024-9765997232

package/media-query-list/index.js

@@ -0,0 +1,169 @@
+import { Observable } from '../data/observable';
+import { Screen } from '../platform';
+import { Application } from '../application';
+import { matchQuery, MediaQueryType } from '../css-mediaquery';
+import { Trace } from '../trace';
+const mediaQueryLists = [];
+const applicationEvents = [Application.orientationChangedEvent, Application.systemAppearanceChangedEvent];
+// In browser, developers cannot create MediaQueryList instances without calling matchMedia
+let isMediaInitializationEnabled = false;
+function toggleApplicationEventListeners(toAdd) {
+    for (const eventName of applicationEvents) {
+        if (toAdd) {
+            Application.on(eventName, onDeviceChange);
+        }
+        else {
+            Application.off(eventName, onDeviceChange);
+        }
+    }
+}
+function onDeviceChange(args) {
+    for (const mql of mediaQueryLists) {
+        const matches = checkIfMediaQueryMatches(mql.media);
+        if (mql.matches !== matches) {
+            mql._matches = matches;
+            mql.notify({
+                eventName: MediaQueryListImpl.changeEvent,
+                object: mql,
+                matches: mql.matches,
+                media: mql.media,
+            });
+        }
+    }
+}
+function checkIfMediaQueryMatches(mediaQueryString) {
+    const { widthPixels, heightPixels } = Screen.mainScreen;
+    let matches;
+    try {
+        matches = matchQuery(mediaQueryString, {
+            type: MediaQueryType.screen,
+            width: widthPixels,
+            height: heightPixels,
+            'device-width': widthPixels,
+            'device-height': heightPixels,
+            orientation: Application.orientation(),
+            'prefers-color-scheme': Application.systemAppearance(),
+        });
+    }
+    catch (err) {
+        matches = false;
+        Trace.write(err, Trace.categories.MediaQuery, Trace.messageType.error);
+    }
+    return matches;
+}
+function matchMedia(mediaQueryString) {
+    isMediaInitializationEnabled = true;
+    const mediaQueryList = new MediaQueryListImpl();
+    isMediaInitializationEnabled = false;
+    mediaQueryList._media = mediaQueryString;
+    mediaQueryList._matches = checkIfMediaQueryMatches(mediaQueryString);
+    return mediaQueryList;
+}
+class MediaQueryListImpl extends Observable {
+    constructor() {
+        super();
+        if (!isMediaInitializationEnabled) {
+            throw new TypeError('Illegal constructor');
+        }
+        Object.defineProperties(this, {
+            _media: {
+                writable: true,
+            },
+            _matches: {
+                writable: true,
+            },
+            _onChange: {
+                writable: true,
+                value: null,
+            },
+            mediaQueryChangeListeners: {
+                value: new Map(),
+            },
+            _throwInvocationError: {
+                value: null,
+            },
+        });
+    }
+    get media() {
+        this._throwInvocationError?.();
+        return this._media;
+    }
+    get matches() {
+        this._throwInvocationError?.();
+        return this._matches;
+    }
+    // @ts-ignore
+    addEventListener(eventName, callback, thisArg) {
+        this._throwInvocationError?.();
+        const hasChangeListeners = this.hasListeners(MediaQueryListImpl.changeEvent);
+        // Call super method first since it throws in the case of bad parameters
+        super.addEventListener(eventName, callback, thisArg);
+        if (eventName === MediaQueryListImpl.changeEvent && !hasChangeListeners) {
+            mediaQueryLists.push(this);
+            if (mediaQueryLists.length === 1) {
+                toggleApplicationEventListeners(true);
+            }
+        }
+    }
+    // @ts-ignore
+    removeEventListener(eventName, callback, thisArg) {
+        this._throwInvocationError?.();
+        // Call super method first since it throws in the case of bad parameters
+        super.removeEventListener(eventName, callback, thisArg);
+        if (eventName === MediaQueryListImpl.changeEvent) {
+            const hasChangeListeners = this.hasListeners(MediaQueryListImpl.changeEvent);
+            if (!hasChangeListeners) {
+                const index = mediaQueryLists.indexOf(this);
+                if (index >= 0) {
+                    mediaQueryLists.splice(index, 1);
+                    if (!mediaQueryLists.length) {
+                        toggleApplicationEventListeners(false);
+                    }
+                }
+            }
+        }
+    }
+    addListener(callback) {
+        this._throwInvocationError?.();
+        // This kind of implementation helps maintain listener registration order
+        // regardless of using the deprecated methods or property onchange
+        const wrapperCallback = (data) => {
+            callback.call(this, {
+                matches: this.matches,
+                media: this.media,
+            });
+        };
+        // Call this method first since it throws in the case of bad parameters
+        this.addEventListener(MediaQueryListImpl.changeEvent, wrapperCallback);
+        this.mediaQueryChangeListeners.set(callback, wrapperCallback);
+    }
+    removeListener(callback) {
+        this._throwInvocationError?.();
+        if (this.mediaQueryChangeListeners.has(callback)) {
+            // Call this method first since it throws in the case of bad parameters
+            this.removeEventListener(MediaQueryListImpl.changeEvent, this.mediaQueryChangeListeners.get(callback));
+            this.mediaQueryChangeListeners.delete(callback);
+        }
+    }
+    get onchange() {
+        this._throwInvocationError?.();
+        return this._onChange;
+    }
+    set onchange(callback) {
+        this._throwInvocationError?.();
+        // Remove old listener if any
+        if (this._onChange) {
+            this.removeListener(this._onChange);
+        }
+        if (callback) {
+            this.addListener(callback);
+        }
+        this._onChange = callback;
+    }
+    _throwInvocationError() {
+        throw new TypeError('Illegal invocation');
+    }
+}
+MediaQueryListImpl.changeEvent = 'change';
+export { matchMedia, MediaQueryListImpl as MediaQueryList, checkIfMediaQueryMatches };
+//# sourceMappingURL=index.js.map

package/media-query-list/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/media-query-list/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/core",
-  "version": "8.8.0-next-07-01-2024-9747699474",
+  "version": "8.8.0-pre-next-07-02-2024-9765997232",
   "description": "A JavaScript library providing an easy to use api for interacting with iOS and Android platform APIs.",
   "main": "index",
   "types": "index.d.ts",

package/platform/{index.android.d.ts → device/index.android.d.ts}

@@ -1,19 +1,3 @@
-export * from './common';
-declare class MainScreen {
-    private _metrics;
-    private reinitMetrics;
-    private initMetrics;
-    private get metrics();
-    get widthPixels(): number;
-    get heightPixels(): number;
-    get scale(): number;
-    get widthDIPs(): number;
-    get heightDIPs(): number;
-}
-export declare class Screen {
-    static mainScreen: MainScreen;
-}
-export declare const screen: typeof Screen;
 declare class DeviceRef {
     private _manufacturer;
     private _model;
@@ -33,3 +17,4 @@ declare class DeviceRef {
 }
 export declare const Device: DeviceRef;
 export declare const device: DeviceRef;
+export {};

package/platform/{index.android.js → device/index.android.js}

@@ -1,51 +1,8 @@
-/* tslint:disable:class-name */
-import { Application } from '../application';
-import { SDK_VERSION } from '../utils/constants';
-import { platformNames } from './common';
+import { Application } from '../../application';
+import { SDK_VERSION } from '../../utils/constants';
+import { platformNames } from '../common';
+import { Screen } from '../screen';
 const MIN_TABLET_PIXELS = 600;
-export * from './common';
-class MainScreen {
-    reinitMetrics() {
-        if (!this._metrics) {
-            this._metrics = new android.util.DisplayMetrics();
-        }
-        this.initMetrics();
-    }
-    initMetrics() {
-        const nativeApp = Application.android.getNativeApplication();
-        nativeApp.getSystemService(android.content.Context.WINDOW_SERVICE).getDefaultDisplay().getRealMetrics(this._metrics);
-    }
-    get metrics() {
-        if (!this._metrics) {
-            // NOTE: This will be memory leak but we MainScreen is singleton
-            Application.on('cssChanged', this.reinitMetrics, this);
-            Application.on(Application.orientationChangedEvent, this.reinitMetrics, this);
-            this._metrics = new android.util.DisplayMetrics();
-            this.initMetrics();
-        }
-        return this._metrics;
-    }
-    get widthPixels() {
-        return this.metrics.widthPixels;
-    }
-    get heightPixels() {
-        return this.metrics.heightPixels;
-    }
-    get scale() {
-        return this.metrics.density;
-    }
-    get widthDIPs() {
-        return this.metrics.widthPixels / this.metrics.density;
-    }
-    get heightDIPs() {
-        return this.metrics.heightPixels / this.metrics.density;
-    }
-}
-export class Screen {
-}
-Screen.mainScreen = new MainScreen();
-// This retains compatibility with NS6
-export const screen = Screen;
 class DeviceRef {
     get manufacturer() {
         if (!this._manufacturer) {

package/platform/device/index.android.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/platform/device/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAE9B,MAAM,SAAS;IAQd,IAAI,YAAY;QACf,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC;QACpD,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;IAED,IAAI,EAAE;QACL,OAAO,aAAa,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,IAAI,SAAS;QACZ,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QACpD,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,IAAI,KAAK;QACR,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,IAAI,UAAU;QACb,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QACjD,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAED,IAAI,UAAU;QACb,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;YAC/G,wEAAwE;YACxE,IAAI,IAAI,IAAI,iBAAiB,EAAE,CAAC;gBAC/B,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;YAC5B,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAED,IAAI,IAAI;QACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;YAC7D,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACtI,CAAC;QAED,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED,IAAI,QAAQ;QACX,IAAI,mBAAmB,CAAC;QACxB,IAAI,WAAW,IAAI,EAAE,EAAE,CAAC;YACvB,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,gBAAgB,EAAE,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxG,CAAC;aAAM,CAAC;YACP,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC;QAC3F,CAAC;QACD,OAAO,mBAAmB,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,MAAM;QACT,IAAI,mBAAmB,CAAC;QACxB,IAAI,WAAW,IAAI,EAAE,EAAE,CAAC;YACvB,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,gBAAgB,EAAE,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACxG,CAAC;aAAM,CAAC;YACP,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC;QAC3F,CAAC;QACD,OAAO,mBAAmB,CAAC,UAAU,EAAE,CAAC;IACzC,CAAC;CACD;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;AAEtC,sCAAsC;AACtC,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC"}

package/platform/device/index.d.ts

@@ -0,0 +1,70 @@
+/*
+ * An object containing device specific information.
+ */
+export interface IDevice {
+	/**
+	 * Gets the manufacturer of the device.
+	 * For example: "Apple" or "HTC" or "Samsung".
+	 */
+	manufacturer: string;
+
+	/**
+	 * Gets the model of the device.
+	 * For example: "Nexus 5" or "iPhone".
+	 */
+	model: string;
+
+	/**
+	 * Gets the OS of the device.
+	 * For example: "Android" or "iOS".
+	 */
+	os: string;
+
+	/**
+	 * Gets the OS version.
+	 * For example: 4.4.4(android), 8.1(ios)
+	 */
+	osVersion: string;
+
+	/**
+	 * Gets the SDK version.
+	 * For example: 19(android), 8.1(ios).
+	 */
+	sdkVersion: string;
+
+	/**
+	 * Gets the type of the current device.
+	 * Available values: "Phone", "Tablet".
+	 */
+	deviceType: 'Phone' | 'Tablet';
+
+	/**
+	 * Gets the uuid.
+	 * On iOS this will return a new uuid if the application is re-installed on the device.
+	 * If you need to receive the same uuid even after the application has been re-installed on the device,
+	 * use this plugin: https://www.npmjs.com/package/nativescript-ios-uuid
+	 */
+	uuid: string;
+
+	/**
+	 * Gets the preferred language. For example "en" or "en-US".
+	 */
+	language: string;
+
+	/**
+	 * Gets the preferred region. For example "US".
+	 */
+	region: string;
+}
+
+/**
+ * Gets the current device information.
+ */
+export const Device: IDevice;
+
+/**
+ * Gets the current device information.
+ *
+ * This retains compatibility with NS6
+ */
+export const device: IDevice;

package/platform/{index.ios.d.ts → device/index.ios.d.ts}

@@ -1,4 +1,3 @@
-export * from './common';
 type DeviceType = 'Phone' | 'Tablet' | 'Vision';
 declare class DeviceRef {
     private _model;
@@ -15,18 +14,6 @@ declare class DeviceRef {
     get language(): string;
     get region(): string;
 }
-declare class MainScreen {
-    private _screen;
-    private get screen();
-    get widthPixels(): number;
-    get heightPixels(): number;
-    get scale(): number;
-    get widthDIPs(): number;
-    get heightDIPs(): number;
-}
 export declare const Device: DeviceRef;
 export declare const device: DeviceRef;
-export declare class Screen {
-    static mainScreen: MainScreen;
-}
-export declare const screen: typeof Screen;
+export {};

package/platform/{index.ios.js → device/index.ios.js}

@@ -1,7 +1,4 @@
-/* tslint:disable:class-name */
-import { platformNames } from './common';
-import { ios } from '../utils';
-export * from './common';
+import { platformNames } from '../common';
 class DeviceRef {
     get manufacturer() {
         return 'Apple';
@@ -66,37 +63,7 @@ class DeviceRef {
         return NSLocale.currentLocale.objectForKey(NSLocaleCountryCode);
     }
 }
-class MainScreen {
-    get screen() {
-        if (!this._screen) {
-            // NOTE: may not want to cache this value with SwiftUI app lifecycle based apps (using NativeScriptViewFactory) given the potential of multiple scenes
-            const window = ios.getWindow();
-            this._screen = window ? window.screen : UIScreen.mainScreen;
-        }
-        return this._screen;
-    }
-    get widthPixels() {
-        return this.widthDIPs * this.scale;
-    }
-    get heightPixels() {
-        return this.heightDIPs * this.scale;
-    }
-    get scale() {
-        return this.screen.scale;
-    }
-    get widthDIPs() {
-        return this.screen.bounds.size.width;
-    }
-    get heightDIPs() {
-        return this.screen.bounds.size.height;
-    }
-}
 export const Device = new DeviceRef();
 // This retains compatibility with NS6
 export const device = Device;
-export class Screen {
-}
-Screen.mainScreen = new MainScreen();
-// This retains compatibility with NS6
-export const screen = Screen;
 //# sourceMappingURL=index.ios.js.map

package/platform/device/index.ios.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../../packages/core/platform/device/index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAI1C,MAAM,SAAS;IAMd,IAAI,YAAY;QACf,OAAO,OAAO,CAAC;IAChB,CAAC;IAED,IAAI,EAAE;QACL,IAAI,YAAY,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC,QAAQ,CAAC;QAC/B,CAAC;aAAM,CAAC;YACP,OAAO,aAAa,CAAC,GAAG,CAAC;QAC1B,CAAC;IACF,CAAC;IAED,IAAI,SAAS;QACZ,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC;QACxD,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,IAAI,KAAK;QACR,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC;QAC5C,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,IAAI,UAAU;QACb,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC;QACzD,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAED,IAAI,UAAU;QACb,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,QAAQ,CAAC,aAAa,CAAC,kBAAkB,uCAA+B,EAAE,CAAC;gBAC9E,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;YAC5B,CAAC;iBAAM,IAAI,QAAQ,CAAC,aAAa,CAAC,kBAAkB,wCAAgC,EAAE,CAAC;gBACtF,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;gBAC5B,sDAAsD;gBACtD,+BAA+B;YAChC,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;YAC7B,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAED,IAAI,IAAI;QACP,MAAM,YAAY,GAAG,cAAc,CAAC,oBAAoB,CAAC;QACzD,MAAM,QAAQ,GAAG,SAAS,CAAC;QAC3B,IAAI,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEnD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,QAAQ,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC;YACpC,YAAY,CAAC,eAAe,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACjD,YAAY,CAAC,WAAW,EAAE,CAAC;QAC5B,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;IACjE,CAAC;CACD;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;AAEtC,sCAAsC;AACtC,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC"}

package/platform/index.d.ts

@@ -25,121 +25,5 @@ export const isApple: boolean;
 export const isVisionOS: boolean;
 
 export * from './common';
-
-/*
- * An object containing device specific information.
- */
-export interface IDevice {
-	/**
-	 * Gets the manufacturer of the device.
-	 * For example: "Apple" or "HTC" or "Samsung".
-	 */
-	manufacturer: string;
-
-	/**
-	 * Gets the model of the device.
-	 * For example: "Nexus 5" or "iPhone".
-	 */
-	model: string;
-
-	/**
-	 * Gets the OS of the device.
-	 * For example: "Android" or "iOS".
-	 */
-	os: string;
-
-	/**
-	 * Gets the OS version.
-	 * For example: 4.4.4(android), 8.1(ios)
-	 */
-	osVersion: string;
-
-	/**
-	 * Gets the SDK version.
-	 * For example: 19(android), 8.1(ios).
-	 */
-	sdkVersion: string;
-
-	/**
-	 * Gets the type of the current device.
-	 * Available values: "Phone", "Tablet".
-	 */
-	deviceType: 'Phone' | 'Tablet';
-
-	/**
-	 * Gets the uuid.
-	 * On iOS this will return a new uuid if the application is re-installed on the device.
-	 * If you need to receive the same uuid even after the application has been re-installed on the device,
-	 * use this plugin: https://www.npmjs.com/package/nativescript-ios-uuid
-	 */
-	uuid: string;
-
-	/**
-	 * Gets the preferred language. For example "en" or "en-US".
-	 */
-	language: string;
-
-	/**
-	 * Gets the preferred region. For example "US".
-	 */
-	region: string;
-}
-
-/**
- * An object containing screen information.
- */
-export interface ScreenMetrics {
-	/**
-	 * Gets the absolute width of the screen in pixels.
-	 */
-	widthPixels: number;
-
-	/**
-	 * Gets the absolute height of the screen in pixels.
-	 */
-	heightPixels: number;
-
-	/**
-	 * Gets the absolute width of the screen in density independent pixels.
-	 */
-	widthDIPs: number;
-
-	/**
-	 * Gets the absolute height of the screen in density independent pixels.
-	 */
-	heightDIPs: number;
-
-	/**
-	 * The logical density of the display. This is a scaling factor for the Density Independent Pixel unit.
-	 */
-	scale: number;
-}
-
-/**
- * An object describing general information about a display.
- */
-export class Screen {
-	/**
-	 * Gets information about the main screen of the current device.
-	 */
-	static mainScreen: ScreenMetrics;
-}
-
-/**
- * An object describing general information about a display.
- *
- * This retains compatibility with NS6
- */
-export const screen: Screen;
-
-/**
- * Gets the current device information.
- */
-export const Device: IDevice;
-
-/**
- * Gets the current device information.
- *
- * This retains compatibility with NS6
- */
-export const device: IDevice;
+export * from './device';
+export * from './screen';

package/platform/index.js

@@ -0,0 +1,4 @@
+export * from './common';
+export * from './device';
+export * from './screen';
+//# sourceMappingURL=index.js.map

package/platform/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/platform/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC"}

package/platform/screen/index.android.d.ts

@@ -0,0 +1,16 @@
+declare class MainScreen {
+    private _metrics;
+    private initMetrics;
+    private get metrics();
+    get widthPixels(): number;
+    get heightPixels(): number;
+    get scale(): number;
+    get widthDIPs(): number;
+    get heightDIPs(): number;
+    _updateMetrics(): void;
+}
+export declare class Screen {
+    static mainScreen: MainScreen;
+}
+export declare const screen: typeof Screen;
+export {};

package/platform/screen/index.android.js

@@ -0,0 +1,41 @@
+import { Application } from '../../application';
+class MainScreen {
+    initMetrics() {
+        const nativeApp = Application.android.getNativeApplication();
+        nativeApp.getSystemService(android.content.Context.WINDOW_SERVICE).getDefaultDisplay().getRealMetrics(this._metrics);
+    }
+    get metrics() {
+        if (!this._metrics) {
+            this._metrics = new android.util.DisplayMetrics();
+            this.initMetrics();
+        }
+        return this._metrics;
+    }
+    get widthPixels() {
+        return this.metrics.widthPixels;
+    }
+    get heightPixels() {
+        return this.metrics.heightPixels;
+    }
+    get scale() {
+        return this.metrics.density;
+    }
+    get widthDIPs() {
+        return this.metrics.widthPixels / this.metrics.density;
+    }
+    get heightDIPs() {
+        return this.metrics.heightPixels / this.metrics.density;
+    }
+    _updateMetrics() {
+        if (!this._metrics) {
+            this._metrics = new android.util.DisplayMetrics();
+        }
+        this.initMetrics();
+    }
+}
+export class Screen {
+}
+Screen.mainScreen = new MainScreen();
+// This retains compatibility with NS6
+export const screen = Screen;
+//# sourceMappingURL=index.android.js.map

package/platform/screen/index.android.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../../packages/core/platform/screen/index.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,UAAU;IAGP,WAAW;QAClB,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;QAC7D,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,iBAAiB,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtH,CAAC;IAED,IAAY,OAAO;QAClB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAClD,IAAI,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACjC,CAAC;IACD,IAAI,YAAY;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;IAClC,CAAC;IACD,IAAI,KAAK;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC7B,CAAC;IACD,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IACxD,CAAC;IACD,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IACzD,CAAC;IAEM,cAAc;QACpB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QACnD,CAAC;QACD,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;CACD;AAED,MAAM,OAAO,MAAM;;AACX,iBAAU,GAAG,IAAI,UAAU,EAAE,CAAC;AAGtC,sCAAsC;AACtC,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC"}

package/platform/screen/index.d.ts

@@ -0,0 +1,48 @@
+/**
+ * An object containing screen information.
+ */
+export interface ScreenMetrics {
+	/**
+	 * Gets the absolute width of the screen in pixels.
+	 */
+	widthPixels: number;
+
+	/**
+	 * Gets the absolute height of the screen in pixels.
+	 */
+	heightPixels: number;
+
+	/**
+	 * Gets the absolute width of the screen in density independent pixels.
+	 */
+	widthDIPs: number;
+
+	/**
+	 * Gets the absolute height of the screen in density independent pixels.
+	 */
+	heightDIPs: number;
+
+	/**
+	 * The logical density of the display. This is a scaling factor for the Density Independent Pixel unit.
+	 */
+	scale: number;
+
+	_updateMetrics(): void;
+}
+
+/**
+ * An object describing general information about a display.
+ */
+export class Screen {
+	/**
+	 * Gets information about the main screen of the current device.
+	 */
+	static mainScreen: ScreenMetrics;
+}
+
+/**
+ * An object describing general information about a display.
+ *
+ * This retains compatibility with NS6
+ */
+export const screen: Screen;