@nativescript/core 8.3.0-alpha.2-next-07-09-2022-2641678746 → 8.3.0

package/fps-meter/fps-native.android.d.ts

@@ -3,7 +3,9 @@ export declare class FPSCallback implements definition.FPSCallback {
     private impl;
     private onFrame;
     running: boolean;
+    sdkVersion: number;
     constructor(onFrame: (currentTimeMillis: number) => void);
+    private _isNativeFramesSupported;
     start(): void;
     stop(): void;
     private handleFrame;

package/fps-meter/fps-native.android.js

@@ -1,25 +1,47 @@
+import { Device } from '../platform';
 export class FPSCallback {
     constructor(onFrame) {
         this.running = false;
         this.onFrame = onFrame;
-        this.impl = new android.view.Choreographer.FrameCallback({
-            doFrame: (nanos) => {
+        this.sdkVersion = parseInt(Device.sdkVersion);
+        if (this.sdkVersion >= 24 && this._isNativeFramesSupported()) {
+            this.impl = (nanos) => {
                 this.handleFrame(nanos);
-            },
-        });
+            };
+        }
+        else {
+            this.impl = new android.view.Choreographer.FrameCallback({
+                doFrame: (nanos) => {
+                    this.handleFrame(nanos);
+                },
+            });
+        }
+    }
+    _isNativeFramesSupported() {
+        return typeof global.__postFrameCallback === 'function' && typeof global.__removeFrameCallback === 'function';
     }
     start() {
         if (this.running) {
             return;
         }
-        android.view.Choreographer.getInstance().postFrameCallback(this.impl);
+        if (this.sdkVersion >= 24 && this._isNativeFramesSupported()) {
+            global.__postFrameCallback(this.impl);
+        }
+        else {
+            android.view.Choreographer.getInstance().postFrameCallback(this.impl);
+        }
         this.running = true;
     }
     stop() {
         if (!this.running) {
             return;
         }
-        android.view.Choreographer.getInstance().removeFrameCallback(this.impl);
+        if (this.sdkVersion >= 24 && this._isNativeFramesSupported()) {
+            global.__removeFrameCallback(this.impl);
+        }
+        else {
+            android.view.Choreographer.getInstance().removeFrameCallback(this.impl);
+        }
         this.running = false;
     }
     handleFrame(nanos) {
@@ -29,7 +51,12 @@ export class FPSCallback {
         // divide by 1 000 000 since the parameter is in nanoseconds
         this.onFrame(nanos / 1000000);
         // add the FrameCallback instance again since it is automatically removed from the Choreographer
-        android.view.Choreographer.getInstance().postFrameCallback(this.impl);
+        if (this.sdkVersion >= 24 && this._isNativeFramesSupported()) {
+            global.__postFrameCallback(this.impl);
+        }
+        else {
+            android.view.Choreographer.getInstance().postFrameCallback(this.impl);
+        }
     }
 }
 //# sourceMappingURL=fps-native.android.js.map

package/fps-meter/fps-native.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"fps-native.android.js","sourceRoot":"","sources":["../../../../packages/core/fps-meter/fps-native.android.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,WAAW;IAMvB,YAAY,OAA4C;QACvD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,CAAC,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;YACxD,OAAO,EAAE,CAAC,KAAa,EAAE,EAAE;gBAC1B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;IAEM,KAAK;QACX,IAAI,IAAI,CAAC,OAAO,EAAE;YACjB,OAAO;SACP;QAED,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACrB,CAAC;IAEM,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAClB,OAAO;SACP;QAED,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACtB,CAAC;IAEO,WAAW,CAAC,KAAa;QAChC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAClB,OAAO;SACP;QAED,4DAA4D;QAC5D,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC;QAC9B,gGAAgG;QAChG,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC;CACD"}
+{"version":3,"file":"fps-native.android.js","sourceRoot":"","sources":["../../../../packages/core/fps-meter/fps-native.android.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,OAAO,WAAW;IAMvB,YAAY,OAA4C;QACvD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAE9C,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE,IAAI,IAAI,CAAC,wBAAwB,EAAE,EAAE;YAC7D,IAAI,CAAC,IAAI,GAAG,CAAC,KAAa,EAAE,EAAE;gBAC7B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC,CAAC;SACF;aAAM;YACN,IAAI,CAAC,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;gBACxD,OAAO,EAAE,CAAC,KAAa,EAAE,EAAE;oBAC1B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBACzB,CAAC;aACD,CAAC,CAAC;SACH;IACF,CAAC;IAEO,wBAAwB;QAC/B,OAAO,OAAa,MAAO,CAAC,mBAAmB,KAAK,UAAU,IAAI,OAAa,MAAO,CAAC,qBAAqB,KAAK,UAAU,CAAC;IAC7H,CAAC;IAEM,KAAK;QACX,IAAI,IAAI,CAAC,OAAO,EAAE;YACjB,OAAO;SACP;QAED,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE,IAAI,IAAI,CAAC,wBAAwB,EAAE,EAAE;YAC5D,MAAc,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC/C;aAAM;YACN,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;SAC7E;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACrB,CAAC;IAEM,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAClB,OAAO;SACP;QAED,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE,IAAI,IAAI,CAAC,wBAAwB,EAAE,EAAE;YAC5D,MAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACjD;aAAM;YACN,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;SAC/E;QAED,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACtB,CAAC;IAEO,WAAW,CAAC,KAAa;QAChC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAClB,OAAO;SACP;QAED,4DAA4D;QAC5D,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC;QAC9B,gGAAgG;QAEhG,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE,IAAI,IAAI,CAAC,wBAAwB,EAAE,EAAE;YAC5D,MAAc,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC/C;aAAM;YACN,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAW,CAAC,CAAC;SAC7E;IACF,CAAC;CACD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/core",
-  "version": "8.3.0-alpha.2-next-07-09-2022-2641678746",
+  "version": "8.3.0",
   "description": "A JavaScript library providing an easy to use api for interacting with iOS and Android platform APIs.",
   "main": "index",
   "types": "index.d.ts",
@@ -14,7 +14,9 @@
     "**/*.js",
     "**/*.map",
     "**/platforms/ios/**",
-    "**/platforms/android/**",
+    "platforms/android/native-api-usage.json",
+    "platforms/android/res/values/ids.xml",
+    "platforms/android/widgets-release.aar",
     "**/package.json"
   ],
   "keywords": [
@@ -62,4 +64,4 @@
       }
     ]
   }
-}
+}

package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Resources/Info.plist

@@ -29,7 +29,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>13F17a</string>
+	<string>13F100</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
@@ -39,9 +39,9 @@
 	<key>DTSDKName</key>
 	<string>macosx12.3</string>
 	<key>DTXcode</key>
-	<string>1340</string>
+	<string>1341</string>
 	<key>DTXcodeBuild</key>
-	<string>13F17a</string>
+	<string>13F100</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.15</string>
 	<key>UIDeviceFamily</key>

package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-maccatalyst/TNSWidgets.framework/Versions/A/Resources/Info.plist

@@ -29,7 +29,7 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>13F17a</string>
+	<string>13F100</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
@@ -39,9 +39,9 @@
 	<key>DTSDKName</key>
 	<string>macosx12.3</string>
 	<key>DTXcode</key>
-	<string>1340</string>
+	<string>1341</string>
 	<key>DTXcodeBuild</key>
-	<string>13F17a</string>
+	<string>13F100</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.15</string>
 	<key>UIDeviceFamily</key>

package/platforms/ios/TNSWidgets.xcframework/ios-arm64_x86_64-simulator/TNSWidgets.framework/_CodeSignature/CodeResources

@@ -34,7 +34,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		0Rmccf4SQGyUrsxYOyGPzKsCAqU=
+		KklnPw/kxwwBJ+SrnJIQkz/d2oo=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>

package/utils/mainthread-helper.android.d.ts

@@ -1,3 +1,3 @@
 export declare function dispatchToMainThread(func: () => void): void;
 export declare function isMainThread(): boolean;
-export declare function dispatchToUIThread(func: () => void): (func: any) => void;
+export declare function dispatchToUIThread(func: () => void): void;

package/utils/mainthread-helper.android.js

@@ -1,16 +1,28 @@
+import { android as ad } from '../application';
 export function dispatchToMainThread(func) {
-    new android.os.Handler(android.os.Looper.getMainLooper()).post(new java.lang.Runnable({
-        run: func,
-    }));
+    const runOnMainThread = global.__runOnMainThread;
+    if (runOnMainThread) {
+        runOnMainThread(() => {
+            func();
+        });
+    }
+    else {
+        new android.os.Handler(android.os.Looper.getMainLooper()).post(new java.lang.Runnable({
+            run: func,
+        }));
+    }
 }
 export function isMainThread() {
     return android.os.Looper.myLooper() === android.os.Looper.getMainLooper();
 }
 export function dispatchToUIThread(func) {
-    return function (func) {
-        if (func) {
-            func();
-        }
-    };
+    const activity = ad.foregroundActivity || ad.startActivity;
+    if (activity && func) {
+        activity.runOnUiThread(new java.lang.Runnable({
+            run() {
+                func();
+            },
+        }));
+    }
 }
 //# sourceMappingURL=mainthread-helper.android.js.map

package/utils/mainthread-helper.android.js.map

@@ -1 +1 @@
-{"version":3,"file":"mainthread-helper.android.js","sourceRoot":"","sources":["../../../../packages/core/utils/mainthread-helper.android.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,oBAAoB,CAAC,IAAgB;IACpD,IAAI,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACtB,GAAG,EAAE,IAAI;KACT,CAAC,CACF,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY;IAC3B,OAAO,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAgB;IAClD,OAAO,UAAU,IAAI;QACpB,IAAI,IAAI,EAAE;YACT,IAAI,EAAE,CAAC;SACP;IACF,CAAC,CAAC;AACH,CAAC"}
+{"version":3,"file":"mainthread-helper.android.js","sourceRoot":"","sources":["../../../../packages/core/utils/mainthread-helper.android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,UAAU,oBAAoB,CAAC,IAAgB;IACpD,MAAM,eAAe,GAAI,MAAc,CAAC,iBAAiB,CAAC;IAC1D,IAAI,eAAe,EAAE;QACpB,eAAe,CAAC,GAAG,EAAE;YACpB,IAAI,EAAE,CAAC;QACR,CAAC,CAAC,CAAC;KACH;SAAM;QACN,IAAI,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtB,GAAG,EAAE,IAAI;SACT,CAAC,CACF,CAAC;KACF;AACF,CAAC;AAED,MAAM,UAAU,YAAY;IAC3B,OAAO,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAgB;IAClD,MAAM,QAAQ,GAA6C,EAAE,CAAC,kBAAkB,IAAI,EAAE,CAAC,aAAa,CAAC;IACrG,IAAI,QAAQ,IAAI,IAAI,EAAE;QACrB,QAAQ,CAAC,aAAa,CACrB,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtB,GAAG;gBACF,IAAI,EAAE,CAAC;YACR,CAAC;SACD,CAAC,CACF,CAAC;KACF;AACF,CAAC"}