Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into feat/mmkv
  • Loading branch information
triniwiz committed Sep 12, 2022
commit f465bd1780aeb78a934cbeca5e2569eb6efceb42
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ npm start
- [@nativescript/localize](packages/localize/README.md)
- [@nativescript/mmkv](packages/mmkv/README.md)
- [@nativescript/mmkv-metal](packages/mmkv-metal/README.md)
- [@nativescript/pdf](packages/pdf/README.md)
- [@nativescript/picker](packages/picker/README.md)
- [@nativescript/shared-notification-delegate](packages/shared-notification-delegate/README.md)
- [@nativescript/social-share](packages/social-share/README.md)
Expand Down
2 changes: 2 additions & 0 deletions apps/demo-angular/src/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const routes: Routes = [
{ path: 'geolocation', loadChildren: () => import('./plugin-demos/geolocation.module').then((m) => m.GeolocationModule) },
{ path: 'google-maps', loadChildren: () => import('./plugin-demos/google-maps.module').then((m) => m.GoogleMapsModule) },
{ path: 'google-signin', loadChildren: () => import('./plugin-demos/google-signin.module').then((m) => m.GoogleSigninModule) },
{ path: 'haptics', loadChildren: () => import('./plugin-demos/haptics.module').then((m) => m.HapticsModule) },
{ path: 'imagepicker', loadChildren: () => import('./plugin-demos/imagepicker.module').then((m) => m.ImagepickerModule) },
{ path: 'ionic-portals', loadChildren: () => import('./plugin-demos/ionic-portals.module').then((m) => m.IonicPortalsModule) },
{ path: 'ios-security', loadChildren: () => import('./plugin-demos/ios-security.module').then((m) => m.IosSecurityModule) },
Expand All @@ -35,6 +36,7 @@ const routes: Routes = [
{ path: 'localize', loadChildren: () => import('./plugin-demos/localize.module').then((m) => m.LocalizeModule) },
{ path: 'mmkv', loadChildren: () => import('./plugin-demos/mmkv.module').then((m) => m.MmkvModule) },
{ path: 'mmkv-metal', loadChildren: () => import('./plugin-demos/mmkv-metal.module').then((m) => m.MmkvMetalModule) },
{ path: 'pdf', loadChildren: () => import('./plugin-demos/pdf.module').then((m) => m.PdfModule) },
{ path: 'picker', loadChildren: () => import('./plugin-demos/picker.module').then((m) => m.PickerModule) },
{ path: 'shared-notification-delegate', loadChildren: () => import('./plugin-demos/shared-notification-delegate.module').then((m) => m.SharedNotificationDelegateModule) },
{ path: 'social-share', loadChildren: () => import('./plugin-demos/social-share.module').then((m) => m.SocialShareModule) },
Expand Down
6 changes: 6 additions & 0 deletions apps/demo-angular/src/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ export class HomeComponent {
{
name: 'google-signin',
},
{
name: 'haptics',
},
{
name: 'imagepicker',
},
Expand All @@ -90,6 +93,9 @@ export class HomeComponent {
{
name: 'mmkv-metal',
},
{
name: 'pdf',
},
{
name: 'picker',
},
Expand Down
5 changes: 3 additions & 2 deletions apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"license": "SEE LICENSE IN <your-license-filename>",
"repository": "<fill-your-repository-here>",
"dependencies": {
"@nativescript/core": "file:../../node_modules/@nativescript/core",
"@nativescript/pdf": "file:../../packages/pdf",
"@nativescript/animated-circle": "file:../../packages/animated-circle",
"@nativescript/appavailability": "file:../../packages/appavailability",
"@nativescript/apple-sign-in": "file:../../packages/apple-sign-in",
Expand All @@ -13,7 +15,6 @@
"@nativescript/brightness": "file:../../packages/brightness",
"@nativescript/camera": "file:../../packages/camera",
"@nativescript/contacts": "file:../../packages/contacts",
"@nativescript/core": "file:../../node_modules/@nativescript/core",
"@nativescript/datetimepicker": "file:../../packages/datetimepicker",
"@nativescript/debug-android": "file:../../packages/debug-android",
"@nativescript/debug-ios": "file:../../packages/debug-ios",
Expand All @@ -31,7 +32,7 @@
"@nativescript/ios-security": "file:../../packages/ios-security",
"@nativescript/iqkeyboardmanager": "file:../../packages/iqkeyboardmanager",
"@nativescript/local-notifications": "file:../../packages/local-notifications",
"@nativescript/localize": "file:../../dist/packages/localize",
"@nativescript/localize": "file:../../packages/localize",
"@nativescript/mmkv": "file:../../packages/mmkv",
"@nativescript/mmkv-metal": "file:../../packages/mmkv-metal",
"@nativescript/picker": "file:../../packages/picker",
Expand Down
5 changes: 1 addition & 4 deletions packages/google-maps/utils/index.android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,7 @@ export function intoNativeGroundOverlayOptions(options: GroundOverlayOptions) {
}

if (options?.bounds) {
opts.positionFromBounds(new com.google.android.gms.maps.model.LatLngBounds(
new com.google.android.gms.maps.model.LatLng(options.bounds.southwest.lat, options.bounds.southwest.lng),
new com.google.android.gms.maps.model.LatLng(options.bounds.northeast.lat, options.bounds.northeast.lng)
));
opts.positionFromBounds(new com.google.android.gms.maps.model.LatLngBounds(new com.google.android.gms.maps.model.LatLng(options.bounds.southwest.lat, options.bounds.southwest.lng), new com.google.android.gms.maps.model.LatLng(options.bounds.northeast.lat, options.bounds.northeast.lng)));
}

if (typeof options?.transparency) {
Expand Down
4 changes: 2 additions & 2 deletions tools/assets/App_Resources/iOS/Podfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
platform :ios, '13.0'
platform :ios, '14.0'

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
# config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
end
end
Expand Down
2 changes: 1 addition & 1 deletion tools/assets/App_Resources/iOS/build.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
// To build for device with Xcode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
// DEVELOPMENT_TEAM = YOUR_TEAM_ID;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
IPHONEOS_DEPLOYMENT_TARGET = 13.0
IPHONEOS_DEPLOYMENT_TARGET = 14.0
1 change: 1 addition & 0 deletions tools/demo/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export * from './local-notifications';
export * from './localize';
export * from './mmkv';
export * from './mmkv-metal';
export * from './pdf';
export * from './picker';
export * from './shared-notification-delegate';
export * from './social-share';
Expand Down
22 changes: 22 additions & 0 deletions tools/workspace-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,20 @@ module.exports = {
description: '@nativescript/mmkv-metal: Build',
},
},
// @nativescript/haptics
haptics: {
build: {
script: 'nx run haptics:build.all',
description: '@nativescript/haptics: Build',
},
},
// @nativescript/pdf
pdf: {
build: {
script: 'nx run pdf:build.all',
description: '@nativescript/pdf: Build',
},
},
'build-all': {
script: 'nx run-many --target=build.all --all',
description: 'Build all packages',
Expand Down Expand Up @@ -445,6 +459,14 @@ module.exports = {
script: 'nx run mmkv-metal:focus',
description: 'Focus on @nativescript/mmkv-metal',
},
haptics: {
script: 'nx run haptics:focus',
description: 'Focus on @nativescript/haptics',
},
pdf: {
script: 'nx run pdf:focus',
description: 'Focus on @nativescript/pdf',
},
reset: {
script: 'nx g @nativescript/plugin-tools:focus-packages',
description: 'Reset Focus',
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@
"@nativescript/twitter": ["packages/twitter/index.d.ts"],
"@nativescript/zip": ["packages/zip/index.d.ts"],
"@nativescript/mmkv": ["packages/mmkv/index.d.ts"],
"@nativescript/mmkv-metal": ["packages/mmkv-metal/index.d.ts"]
"@nativescript/mmkv-metal": ["packages/mmkv-metal/index.d.ts"],
"@nativescript/haptics": ["packages/haptics/index.d.ts"]
}
},
"exclude": ["node_modules", "tmp"]
Expand Down
3 changes: 2 additions & 1 deletion workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"twitter": "packages/twitter",
"zip": "packages/zip",
"mmkv": "packages/mmkv",
"mmkv-metal": "packages/mmkv-metal"
"mmkv-metal": "packages/mmkv-metal",
"haptics": "packages/haptics"
}
}
You are viewing a condensed version of this merge commit. You can view the full changes here.