Merge remote-tracking branch 'origin/main' into feat/mmkv

NativeScript · triniwiz · Jun 11, 2022 · Sep 12, 2022 · Sep 12, 2022 · Sep 19, 2022
commit 2e144a30db91a29d28d5b129ebae747a48dec2ee
diff --git a/apps/demo/package.json b/apps/demo/package.json
@@ -32,9 +32,10 @@
 		"@nativescript/ios-security": "file:../../packages/ios-security",
 		"@nativescript/iqkeyboardmanager": "file:../../packages/iqkeyboardmanager",
 		"@nativescript/local-notifications": "file:../../packages/local-notifications",
-		"@nativescript/localize": "file:../../packages/localize",
+		"@nativescript/localize": "file:../../dist/packages/localize",
 		"@nativescript/mmkv": "file:../../packages/mmkv",
 		"@nativescript/mmkv-metal": "file:../../packages/mmkv-metal",
+		"@nativescript/pdf": "file:../../packages/pdf",
 		"@nativescript/picker": "file:../../packages/picker",
 		"@nativescript/shared-notification-delegate": "file:../../packages/shared-notification-delegate",
 		"@nativescript/social-share": "file:../../packages/social-share",

diff --git a/packages/geolocation/index.d.ts b/packages/geolocation/index.d.ts
@@ -131,14 +131,13 @@ export function getCurrentLocation(options?: Options): Promise<Location>;
  */
 export function watchLocation(successCallback: successCallbackType, errorCallback: errorCallbackType, options?: Options): number;
 
-
 /**
  * Monitor for location permission change. Only on iOS!
  * @param permissionCallback gets called on location permission state change
  * @param errorCallback gets called on error
  * @returns {number} the watch id
  */
- export function watchPermissionStatus(permissionCallback: permissionCallbackType, errorCallback: errorCallbackType): number;
+export function watchPermissionStatus(permissionCallback: permissionCallbackType, errorCallback: errorCallbackType): number;
 
 /**
  * Stop monitoring for location change. Parameter expected is the watchId returned from `watchLocation`.

diff --git a/packages/google-maps/utils/index.android.ts b/packages/google-maps/utils/index.android.ts
@@ -76,7 +76,7 @@ export function intoNativeMarkerOptions(options: MarkerOptions) {
 		opts.icon(com.google.android.gms.maps.model.BitmapDescriptorFactory.defaultMarker(hueFromColor(color)));
 	}
 
-	if(typeof options?.opacity === 'number') {
+	if (typeof options?.opacity === 'number') {
 		opts.alpha(options.opacity);
 	}
 

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -54,7 +54,7 @@
 			"@nativescript/local-notifications": ["packages/local-notifications/index.d.ts"],
 			"@nativescript/localize": ["packages/localize/index.d.ts"],
 			"@nativescript/localize/angular": ["packages/localize/angular/index.ts"],
-      "@nativescript/mmkv": ["packages/mmkv/index.d.ts"],
+			"@nativescript/mmkv": ["packages/mmkv/index.d.ts"],
 			"@nativescript/mmkv-metal": ["packages/mmkv-metal/index.d.ts"],
 			"@nativescript/pdf": ["packages/pdf/index.d.ts"],
 			"@nativescript/picker": ["packages/picker/index.d.ts"],

diff --git a/workspace.json b/workspace.json
@@ -31,7 +31,7 @@
 		"jetpack-compose": "packages/jetpack-compose",
 		"local-notifications": "packages/local-notifications",
 		"localize": "packages/localize",
-    "mmkv": "packages/mmkv",
+		"mmkv": "packages/mmkv",
 		"mmkv-metal": "packages/mmkv-metal",
 		"pdf": "packages/pdf",
 		"picker": "packages/picker",