From ab639eeb9d0e06002536790bde29fb18afc5e45a Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Thu, 1 Jul 2021 10:50:13 -0700 Subject: [PATCH 1/2] chore: separate filter components --- .../android-filter.component.ts | 16 ++++++++++ .../src/lib/cdk/platform-filters/index.ts | 30 ++----------------- .../platform-filters/ios-filter.component.ts | 15 ++++++++++ .../src/lib/nativescript-common.module.ts | 4 +-- packages/angular/src/lib/tokens.ts | 5 ++-- 5 files changed, 37 insertions(+), 33 deletions(-) create mode 100644 packages/angular/src/lib/cdk/platform-filters/android-filter.component.ts create mode 100644 packages/angular/src/lib/cdk/platform-filters/ios-filter.component.ts diff --git a/packages/angular/src/lib/cdk/platform-filters/android-filter.component.ts b/packages/angular/src/lib/cdk/platform-filters/android-filter.component.ts new file mode 100644 index 0000000..c643378 --- /dev/null +++ b/packages/angular/src/lib/cdk/platform-filters/android-filter.component.ts @@ -0,0 +1,16 @@ +/* eslint-disable @angular-eslint/component-selector */ +import { Component, Inject } from '@angular/core'; +import { platformNames, IDevice } from '@nativescript/core'; +import { DEVICE } from '../../tokens'; + +@Component({ + selector: 'android', + template: ``, +}) +export class AndroidFilterComponent { + public show: boolean; + + constructor(@Inject(DEVICE) device: IDevice) { + this.show = device.os === platformNames.android; + } +} diff --git a/packages/angular/src/lib/cdk/platform-filters/index.ts b/packages/angular/src/lib/cdk/platform-filters/index.ts index 362e5cc..aeb462d 100644 --- a/packages/angular/src/lib/cdk/platform-filters/index.ts +++ b/packages/angular/src/lib/cdk/platform-filters/index.ts @@ -1,28 +1,2 @@ -/* eslint-disable @angular-eslint/component-selector */ -import { Component, Inject } from '@angular/core'; -import { Device, platformNames } from '@nativescript/core'; -import { DEVICE } from '../../tokens'; - -@Component({ - selector: 'android', - template: ``, -}) -export class AndroidFilterComponent { - public show: boolean; - - constructor(@Inject(DEVICE) device: typeof Device) { - this.show = device.os === platformNames.android; - } -} - -@Component({ - selector: 'ios', - template: ``, -}) -export class IosFilterComponent { - public show: boolean; - constructor(@Inject(DEVICE) device: typeof Device) { - console.log(device.os, platformNames.ios); - this.show = device.os === platformNames.ios; - } -} +export * from './android-filter.component'; +export * from './ios-filter.component'; diff --git a/packages/angular/src/lib/cdk/platform-filters/ios-filter.component.ts b/packages/angular/src/lib/cdk/platform-filters/ios-filter.component.ts new file mode 100644 index 0000000..6e820d1 --- /dev/null +++ b/packages/angular/src/lib/cdk/platform-filters/ios-filter.component.ts @@ -0,0 +1,15 @@ +/* eslint-disable @angular-eslint/component-selector */ +import { Component, Inject } from '@angular/core'; +import { platformNames, IDevice } from '@nativescript/core'; +import { DEVICE } from '../../tokens'; + +@Component({ + selector: 'ios', + template: ``, +}) +export class IOSFilterComponent { + public show: boolean; + constructor(@Inject(DEVICE) device: IDevice) { + this.show = device.os === platformNames.ios; + } +} diff --git a/packages/angular/src/lib/nativescript-common.module.ts b/packages/angular/src/lib/nativescript-common.module.ts index 9a9352f..07a1ace 100644 --- a/packages/angular/src/lib/nativescript-common.module.ts +++ b/packages/angular/src/lib/nativescript-common.module.ts @@ -6,9 +6,9 @@ import { ListViewComponent, TemplateKeyDirective } from './cdk/list-view/list-vi import { registerNativeScriptViewComponents } from './element-registry'; import { ModalDialogService } from './legacy/directives/dialogs'; import { TabViewDirective, TabViewItemDirective } from './cdk/tab-view'; -import { AndroidFilterComponent, IosFilterComponent } from './cdk/platform-filters'; +import { AndroidFilterComponent, IOSFilterComponent } from './cdk/platform-filters'; -const CDK_COMPONENTS = [ActionBarComponent, ActionBarScope, ActionItemDirective, NavigationButtonDirective, ListViewComponent, TemplateKeyDirective, TabViewDirective, TabViewItemDirective, AndroidFilterComponent, IosFilterComponent]; +const CDK_COMPONENTS = [ActionBarComponent, ActionBarScope, ActionItemDirective, NavigationButtonDirective, ListViewComponent, TemplateKeyDirective, TabViewDirective, TabViewItemDirective, AndroidFilterComponent, IOSFilterComponent]; registerNativeScriptViewComponents(); diff --git a/packages/angular/src/lib/tokens.ts b/packages/angular/src/lib/tokens.ts index 4dc4b5b..03e4250 100644 --- a/packages/angular/src/lib/tokens.ts +++ b/packages/angular/src/lib/tokens.ts @@ -1,6 +1,5 @@ import { InjectionToken } from '@angular/core'; -import { Page, View } from '@nativescript/core'; -import { Device } from '@nativescript/core'; +import { IDevice, Page, View } from '@nativescript/core'; export const APP_ROOT_VIEW = new InjectionToken('NativeScriptAppRootView'); export const NATIVESCRIPT_ROOT_MODULE_ID = new InjectionToken('NativeScriptRootModuleId'); @@ -18,7 +17,7 @@ export interface PageFactoryOptions { } export const DISABLE_ROOT_VIEW_HANDLING = new InjectionToken('NativeScriptDisableRootViewHandling'); -export const DEVICE = new InjectionToken('NativeScriptDevice'); +export const DEVICE = new InjectionToken('NativeScriptDevice'); export const PAGE_FACTORY = new InjectionToken('NativeScriptPageFactory'); export const defaultPageFactory: PageFactory = function (_opts: PageFactoryOptions) { return new Page(); From 3174e33d01e3c1676f67e56e8f967eb7624c18d0 Mon Sep 17 00:00:00 2001 From: Eduardo Speroni Date: Thu, 1 Jul 2021 14:56:55 -0300 Subject: [PATCH 2/2] chore: fix ng-packgr build --- packages/angular/src/lib/cdk/platform-filters/index.ts | 2 -- packages/angular/src/lib/nativescript-common.module.ts | 3 ++- packages/angular/src/lib/public_api.ts | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 packages/angular/src/lib/cdk/platform-filters/index.ts diff --git a/packages/angular/src/lib/cdk/platform-filters/index.ts b/packages/angular/src/lib/cdk/platform-filters/index.ts deleted file mode 100644 index aeb462d..0000000 --- a/packages/angular/src/lib/cdk/platform-filters/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './android-filter.component'; -export * from './ios-filter.component'; diff --git a/packages/angular/src/lib/nativescript-common.module.ts b/packages/angular/src/lib/nativescript-common.module.ts index 07a1ace..3bc6315 100644 --- a/packages/angular/src/lib/nativescript-common.module.ts +++ b/packages/angular/src/lib/nativescript-common.module.ts @@ -6,7 +6,8 @@ import { ListViewComponent, TemplateKeyDirective } from './cdk/list-view/list-vi import { registerNativeScriptViewComponents } from './element-registry'; import { ModalDialogService } from './legacy/directives/dialogs'; import { TabViewDirective, TabViewItemDirective } from './cdk/tab-view'; -import { AndroidFilterComponent, IOSFilterComponent } from './cdk/platform-filters'; +import { AndroidFilterComponent } from './cdk/platform-filters/android-filter.component'; +import { IOSFilterComponent } from './cdk/platform-filters/ios-filter.component'; const CDK_COMPONENTS = [ActionBarComponent, ActionBarScope, ActionItemDirective, NavigationButtonDirective, ListViewComponent, TemplateKeyDirective, TabViewDirective, TabViewItemDirective, AndroidFilterComponent, IOSFilterComponent]; diff --git a/packages/angular/src/lib/public_api.ts b/packages/angular/src/lib/public_api.ts index 0130aea..bb44c9d 100644 --- a/packages/angular/src/lib/public_api.ts +++ b/packages/angular/src/lib/public_api.ts @@ -14,7 +14,8 @@ export * from './cdk/list-view'; export * from './cdk/portal'; export * from './cdk/dialog'; export * from './cdk/tab-view'; -export * from './cdk/platform-filters'; +export * from './cdk/platform-filters/android-filter.component'; +export * from './cdk/platform-filters/ios-filter.component'; export * from './file-system'; export * from './nativescript-common.module'; export * from './loading.service';