Merge branch 'main' into merge_from_akylas

# Conflicts:
#	apps/automated/nativescript.config.ts
#	apps/automated/package.json
#	apps/toolbox/nativescript.config.ts
#	apps/toolbox/package.json
#	apps/toolbox/src/pages/box-shadow.ts
#	nx.json
#	package-lock.json
#	package.json
#	packages/core/application/application-common.ts
#	packages/core/application/application-interfaces.ts
#	packages/core/application/application.android.ts
#	packages/core/application/application.ios.ts
#	packages/core/application/helpers.android.ts
#	packages/core/connectivity/index.android.ts
#	packages/core/core-types/index.ts
#	packages/core/core-types/validators.ts
#	packages/core/data/observable/index.ts
#	packages/core/image-asset/image-asset-common.ts
#	packages/core/platforms/android/widgets-release.aar
#	packages/core/references.d.ts
#	packages/core/tsconfig.lib.json
#	packages/core/ui/animation/index.d.ts
#	packages/core/ui/button/index.android.ts
#	packages/core/ui/core/view/index.android.ts
#	packages/core/ui/core/view/index.ios.ts
#	packages/core/ui/core/view/view-common.ts
#	packages/core/ui/core/view/view-helper/view-helper-common.ts
#	packages/core/ui/frame/fragment.transitions.android.ts
#	packages/core/ui/frame/index.android.ts
#	packages/core/ui/frame/index.ios.ts
#	packages/core/ui/label/index.android.ts
#	packages/core/ui/page/index.android.ts
#	packages/core/ui/scroll-view/index.ios.ts
#	packages/core/ui/styling/background-common.ts
#	packages/core/ui/styling/style-properties.ts
#	packages/core/ui/tab-view/index.ios.ts
#	packages/core/ui/text-base/index.android.ts
#	packages/core/ui/text-base/index.d.ts
#	packages/core/ui/text-base/text-base-common.ts
#	packages/types-android/src/lib/android/org.nativescript.widgets.d.ts
#	packages/ui-mobile-base/android/build.gradle
#	packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties
#	packages/ui-mobile-base/android/widgets/build.gradle
#	packages/ui-mobile-base/android/widgets/src/main/AndroidManifest.xml
#	packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
#	packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BoxShadowDrawable.java
#	packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/LayoutBase.java
#	packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
#	packages/webpack5/package-lock.json
#	packages/webpack5/src/transformers/NativeClass/index.ts

Author: farfromrefug

.gitignore

@@ -8,9 +8,8 @@
 
 # dependencies
 **/node_modules
-**/yarn.lock
-**/pnpm-lock.yaml
 .npmrc
+.yarn
 
 # IDEs and editors
 .idea

apps/automated/src/pages/page11.ts

@@ -51,7 +51,7 @@ export function createPage() {
 	//page.content = GridLayout;
 	page.content = StackLayout;
 	var x = 1;
-	btn1.on(button.Button.tapEvent, function () {
+	btn1.on(button.tapEvent, function () {
 		x++;
 		var gravity;
 		//btn1.android.setLayoutParams(new android.view.ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, android.view.ViewGroup.LayoutParams.FILL_PARENT));

apps/automated/src/pages/page7.ts

@@ -13,7 +13,7 @@ export function createPage() {
 	var vAligns: CoreTypes.VerticalAlignmentType[] = ['stretch', 'top', 'middle', 'bottom'];
 	//var hAligns = ["stretch", "left", "center", "right"];
 	var count = 0;
-	btn.on(buttons.Button.tapEvent, function () {
+	btn.on(buttons.tapEvent, function () {
 		//page.css = "button { vertical-align:" + vAligns[(count++) % 4] + " }";
 		btn.verticalAlignment = vAligns[count++ % 4];
 	});

apps/automated/src/pages/page8.ts

@@ -41,7 +41,7 @@ export function createPage() {
 	var counter = 0;
 	var btn = new btns.Button();
 	btn.text = 'tap';
-	btn.on(btns.Button.tapEvent, function () {
+	btn.on(btns.tapEvent, function () {
 		btn.text = 'hi: ' + counter++;
 	});
 	btn.isEnabled = false;
@@ -52,7 +52,7 @@ export function createPage() {
 	var info = new btns.Button();
 	info.text = 'info';
 	info.className = 'info';
-	info.on(btns.Button.tapEvent, function () {
+	info.on(btns.tapEvent, function () {
 		info.text = 'hi: ' + counter++;
 		btn.isEnabled = true;
 	});

apps/automated/src/pages/property-bindings.ts

@@ -41,7 +41,7 @@ export function createPage() {
 	var count = 0;
 	var control = new btns.Button();
 	control.text = 'test control';
-	control.on(btns.Button.tapEvent, (data) => {
+	control.on(btns.tapEvent, (data) => {
 		control.text = 'count: ' + count++;
 	});
 	grid.addChild(control);

apps/automated/src/tk-unit.ts

@@ -378,7 +378,7 @@ export function waitUntilReady(isReady: () => boolean, timeoutSec: number = 5, s
 
 // Setup for the Android modal loop implementation
 // TODO: If these platform-specific implementations continue to grow, think of per-platform separation (TKUnit.android)
-let nextMethod;
+let nextMethod: java.lang.reflect.Method;
 let targetField;
 let prepared;
 

apps/automated/src/ui/button/button-tests.ts

@@ -2,6 +2,7 @@ import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
 import { View, EventData, Button, Observable, Color, Page, FormattedString, BindingOptions, Span } from '@nativescript/core';
 import * as buttonTestsNative from './button-tests-native';
+import * as button from '@nativescript/core/ui/button';
 
 export function test_recycling() {
 	helper.nativeView_recycling_test(() => new Button());
@@ -95,7 +96,7 @@ var _testOnClick = function (views: Array<View>) {
 
 	var actualValue = false;
 	// >> button-tap
-	button.on(Button.tapEvent, function (args: EventData) {
+	button.on(button.tapEvent, function (args: EventData) {
 		// Do something
 		// >> (hide)
 		actualValue = true;

apps/automated/src/ui/root-view/mymodule/MyControl.ts

@@ -13,7 +13,7 @@ export class MyControl extends stackLayoutModule.StackLayout {
 		lbl.id = 'my-test-label';
 		var btn = new button.Button();
 		btn.text = 'Tap me!';
-		btn.on(button.Button.tapEvent, (args: EventData) => {
+		btn.on(button.tapEvent, (args: EventData) => {
 			lbl.text = 'Tap ' + counter++;
 		});
 

apps/automated/src/ui/tab-view/tab-view-navigation-tests.ts

@@ -1,6 +1,7 @@
 import * as TKUnit from '../../tk-unit';
 import * as helper from '../../ui-helper';
 import { isIOS, isAndroid, Label, StackLayout, Frame, Page, ListView, ItemEventData, TabView, TabViewItem, Button } from '@nativescript/core';
+import * as button from '@nativescript/core/ui/button';
 
 var ASYNC = 2;
 
@@ -37,7 +38,7 @@ function _createListView(): ListView {
 		var button = <Button>args.view;
 		if (!button) {
 			button = new Button();
-			button.on(Button.tapEvent, _clickHandlerFactory(args.index));
+			button.on(button.tapEvent, _clickHandlerFactory(args.index));
 			args.view = button;
 		}
 

apps/automated/src/xml-declaration/mymodule/MyControl.ts

@@ -1,4 +1,5 @@
 import { StackLayout, Label, Button, EventData } from '@nativescript/core';
+import * as button from '@nativescript/core/ui/button';
 
 export class MyControl extends StackLayout {
 	constructor() {
@@ -9,7 +10,7 @@ export class MyControl extends StackLayout {
 		var lbl = new Label();
 		var btn = new Button();
 		btn.text = 'Tap me!';
-		btn.on(Button.tapEvent, (args: EventData) => {
+		btn.on(button.tapEvent, (args: EventData) => {
 			lbl.text = 'Tap ' + counter++;
 		});