Skip to content

Commit

Permalink
Merge pull request #180 from farfromrefug/master
Browse files Browse the repository at this point in the history
N 7.0
  • Loading branch information
triniwiz authored Oct 6, 2020
2 parents e25ff5a + 8c423e5 commit f153dfa
Show file tree
Hide file tree
Showing 67 changed files with 17,836 additions and 1,314 deletions.
2 changes: 1 addition & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ letter.

- CLI: (run `tns --version` to fetch it)
- Cross-platform modules: (check the 'version' attribute in the
`node_modules/tns-core-modules/package.json` file in your project)
`node_modules/@nativescript/core/package.json` file in your project)
- Runtime(s): (look for the `"tns-android"` and `"tns-ios"` properties in the `package.json` file of your project)
- Plugin(s): (look for the version numbers in the `package.json` file of your
project and paste your dependencies and devDependencies here)
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

## Install

#### NativeScript 7x

- `tns plugin add @nativescript-community/ui-pager`

#### NativeScript 6x

- `tns plugin add nativescript-pager`
Expand Down
2 changes: 1 addition & 1 deletion demo-ng/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
import { NativeScriptModule } from '@nativescript/angular';
import { NativeScriptFormsModule } from '@nativescript/angular';

import { PagerModule } from 'nativescript-pager/angular';
import { PagerModule } from '@nativescript-community/ui-pager/angular';

import { AppRoutingModule } from './app.routing';
import { AppComponent } from './app.component';
Expand Down
2 changes: 1 addition & 1 deletion demo-ng/app/index-logger.directive.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Directive, OnInit, OnDestroy, Input, Host, Optional } from '@angular/core';
import { PagerComponent } from 'nativescript-pager/angular';
import { PagerComponent } from '@nativescript-community/ui-pager/angular';

let autoId = 0;

Expand Down
2 changes: 1 addition & 1 deletion demo-ng/app/static/static.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, ViewChildren, QueryList } from '@angular/core';
import { PagerItemDirective } from 'nativescript-pager/angular/pager-items-comp';
import { PagerItemDirective } from '@nativescript-community/ui-pager/angular/pager-items-comp';

@Component({
moduleId: module.id,
Expand Down
2 changes: 1 addition & 1 deletion demo-ng/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@nativescript/angular": "^8.21.0",
"@nativescript/core": "^6.4.1",
"nativescript-image-cache-it": "^5.0.0-beta.10",
"nativescript-pager": "../src",
"@nativescript-community/ui-pager": "../src",
"nativescript-theme-core": "^2.0.2",
"reflect-metadata": "~0.1.13",
"rxjs": "^6.4.0",
Expand Down
7 changes: 4 additions & 3 deletions demo-ng/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es5",
"module": "esnext",
"target": "es2017",
"moduleResolution": "node",
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"noEmitHelpers": true,
Expand All @@ -16,7 +17,7 @@
"baseUrl": ".",
"paths": {
"*": [
"./node_modules/tns-core-modules/*",
"./node_modules/@nativescript/core/*",
"./node_modules/*"
],
"~/*": [
Expand Down
2 changes: 1 addition & 1 deletion demo-react/app/AppContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Pager, PagerItem } from 'nativescript-pager/react';
import { Pager, PagerItem } from '@nativescript-community/ui-pager/react';
import { ObservableArray } from '@nativescript/core/data/observable-array';
import { Page, Frame } from '@nativescript/core';

Expand Down
2 changes: 1 addition & 1 deletion demo-react/app/StaticPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { ItemSpec } from '@nativescript/core/ui/layouts/grid-layout';
import { Color, Page } from '@nativescript/core';
import { NSVElement } from 'react-nativescript';
import { Pager, PagerItem } from './nativescript-pager/index';
import { Pager, PagerItem } from './@nativescript-community/ui-pager/index';
export class StaticPage extends React.Component<{ forwardedRef: React.RefObject<any> }> {
private selectedIndex: number = 3;

Expand Down
4 changes: 2 additions & 2 deletions demo-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"license": "SEE LICENSE IN <your-license-filename>",
"repository": "<fill-your-repository-here>",
"dependencies": {
"@nativescript/core": "^6.4.1",
"@nativescript/core": "rc",
"nativescript-image-cache-it": "^5.0.0-beta.10",
"nativescript-pager": "file:../publish/package/nativescript-pager-12.0.0-alpha.9.tgz",
"@nativescript-community/ui-pager": "file:../publish/package/@nativescript-community/ui-pager-12.0.0-alpha.9.tgz",
"nativescript-theme-core": "~1.0.6",
"react": "^16.8.6",
"react-nativescript": "~1.0.6"
Expand Down
Loading

0 comments on commit f153dfa

Please sign in to comment.