Skip to content

Commit 6e781d2

Browse files
committed
A bit of housekeeping.
1 parent 6d9deef commit 6e781d2

7 files changed

Lines changed: 262 additions & 271 deletions

File tree

app/actionBar/actionBar.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { Observable } from 'tns-core-modules/data/observable';
2-
import { topmost } from 'tns-core-modules/ui/frame';
31
import { EventData } from "tns-core-modules/data/observable";
42
import { Page } from "tns-core-modules/ui/page";
53
import { Label } from 'tns-core-modules/ui/label';
@@ -12,4 +10,4 @@ export function onLoad(args: EventData) {
1210
let page = <ICustomActionBar>args.object;
1311
let actionBarTitle = <Label>page.getViewById("actionBarTitle");
1412
actionBarTitle.text = page.ActionBarTitle;
15-
}
13+
}

app/main-page.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import { EventData } from "tns-core-modules/data/observable";
32
import { Page } from "tns-core-modules/ui/page";
43
import { isIOS } from 'tns-core-modules/platform';
@@ -14,4 +13,4 @@ export function navigatingTo(args: EventData) {
1413
let navigationBar = controller.navigationBar;
1514
navigationBar.barStyle = 0;
1615
}
17-
}
16+
}

app/navigation-vm.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { topmost } from 'tns-core-modules/ui/frame';
22
import { BaseModel } from './pages/base';
33

44
export class NavigationViewModel extends BaseModel {
5-
65
public viewPage(args) {
76
let pageName = args.object.pageName;
87
let path = pageName === 'main-page' ? pageName : `pages/${pageName}`;
@@ -12,4 +11,5 @@ export class NavigationViewModel extends BaseModel {
1211
};
1312
topmost().navigate(navigationEntry);
1413
}
15-
}
14+
}
15+

app/sidedrawer/sidedrawer.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import {Observable} from 'tns-core-modules/data/observable';
2-
import {topmost} from 'tns-core-modules/ui/frame';
31
import { EventData } from "tns-core-modules/data/observable";
42
import { Page } from "tns-core-modules/ui/page";
53
import { NavigationViewModel } from '../navigation-vm';
@@ -30,4 +28,4 @@ export class SideDrawerViewModel extends NavigationViewModel {
3028
super(page);
3129
SideDrawerViewModel.activeComponent = activeComponent;
3230
}
33-
}
31+
}

nativescript-theme-core.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

package.json

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"name": "nativescript-theme-core",
3-
"version": "1.0.6",
3+
"version": "2.0.0-alpha",
44
"description": "Telerik NativeScript Core Theme",
5+
"author": "Telerik <support@telerik.com>",
56
"homepage": "https://www.nativescript.org",
67
"license": "Apache-2.0",
78
"repository": {
@@ -11,31 +12,28 @@
1112
"nativescript": {
1213
"id": "org.nativescript.theme",
1314
"tns-android": {
14-
"version": "5.4.0-2019-05-09-111319-03"
15+
"version": "5.1.0"
1516
},
1617
"tns-ios": {
17-
"version": "5.4.0-2019-05-07-181332-01"
18+
"version": "5.1.0"
1819
}
1920
},
2021
"dependencies": {
21-
"bootstrap": "~4.3.0",
22-
"nativescript-dom": "~2.0.0",
23-
"nativescript-fonticon": "~2.0.0",
24-
"nativescript-themes": "~2.0.0",
25-
"nativescript-ui-sidedrawer": "~6.0.0",
26-
"tns-core-modules": "next"
22+
"bootstrap": "^4.2.1",
23+
"nativescript-dom": "^2.0.2",
24+
"nativescript-fonticon": "^1.1.1",
25+
"nativescript-ui-sidedrawer": "^5.1.0",
26+
"nativescript-themes": "^1.9.9",
27+
"tns-core-modules": "~5.1.1"
2728
},
2829
"devDependencies": {
29-
"babel-traverse": "6.26.0",
30-
"babel-types": "6.26.0",
31-
"babylon": "6.18.0",
32-
"glob": "~7.1.4",
30+
"glob": "^7.1.3",
3331
"lazy": "1.0.11",
34-
"nativescript-dev-sass": "~1.7.0",
35-
"nativescript-dev-typescript": "~0.9.0",
36-
"node-sass": "~4.12.0",
37-
"sass-lint": "~1.13.0",
38-
"typescript": "~3.4.0"
32+
"nativescript-dev-sass": "~1.6.0",
33+
"nativescript-dev-typescript": "~0.7.8",
34+
"node-sass": "~4.11.0",
35+
"sass-lint": "^1.12.1",
36+
"typescript": "~3.2.2"
3937
},
4038
"scripts": {
4139
"builder": "node scripts/builder.js"

0 commit comments

Comments
 (0)