Skip to content

Commit 135ea1e

Browse files
Merge pull request #207 from telerik/amiorkov/migratiin-4.0-rebase
Migrate to latest NativeScript and add "root" RadSideDrawer
2 parents f6e5b1b + 0d8f394 commit 135ea1e

27 files changed

+442
-383
lines changed

sdk/app/app.css

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
.title {
1+
@import '~nativescript-theme-core/css/core.light.css';
2+
3+
.title {
24
font-size: 30;
35
horizontal-align: center;
46
margin:20;
@@ -20,7 +22,7 @@ button {
2022
}
2123

2224
.drawerContent {
23-
background-color: gray;
25+
background-color: lightgray;
2426
}
2527

2628
.drawerContentText {
@@ -83,18 +85,6 @@ button {
8385
padding: 5;
8486
}
8587

86-
.titleLabel {
87-
margin: 16;
88-
vertical-align: center;
89-
}
90-
91-
.itemStackLayout {
92-
text-align: left;
93-
vertical-align: center;
94-
font-size: 16;
95-
color:#404040;
96-
}
97-
9888
.label {
9989
margin-left: 20;
10090
margin-top: 20;
@@ -107,7 +97,15 @@ button {
10797
font-weight: bold;
10898
}
10999

110-
.item-template-style{
100+
.item-template-style {
111101
border-width:1;
112102
border-color: gray;
113-
}
103+
}
104+
105+
.btn {
106+
margin: 0;
107+
}
108+
109+
/* .test {
110+
background-color: red;
111+
} */

sdk/app/app.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ declare module com {
2020

2121

2222
if (application.android) {
23+
require("./main-activity.android.ts");
2324
application.on("launch", (intent) => {
2425
fresco.initialize();
2526
});
2627
}
2728

28-
application.start("./navigation/category-list-page");
29+
application.run({ moduleName: "navigation/category-list-page" });

sdk/app/calendar/calendar-events/events-view-modes-model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class ViewModel extends observableModule.Observable {
6666

6767
public onOptionsTapped() {
6868
var navigationEntry = {
69-
moduleName: "./navigation/options-menu/options",
69+
moduleName: "navigation/options-menu/options",
7070
context: this._viewModesInfo,
7171
animated: true
7272
};

sdk/app/calendar/cell-styling/cell-styles-model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class StylingViewModel extends Observable {
7070

7171
public onOptionsTapped() {
7272
var navigationEntry = {
73-
moduleName: "./navigation/options-menu/options",
73+
moduleName: "navigation/options-menu/options",
7474
context: this._selectionInfo,
7575
animated: true
7676
};

sdk/app/calendar/events-view-modes/events-view-modes-model-page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class ViewModel extends observableModule.Observable {
7171

7272
public onOptionsTapped() {
7373
var navigationEntry = {
74-
moduleName: "./navigation/options-menu/options",
74+
moduleName: "navigation/options-menu/options",
7575
context: this._viewModesInfo,
7676
animated: true
7777
};

sdk/app/calendar/selection-modes/selection-modes-model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class ViewModel extends observableModule.Observable{
4848

4949
public onOptionsTapped() {
5050
var navigationEntry = {
51-
moduleName: "./navigation/options-menu/options",
51+
moduleName: "navigation/options-menu/options",
5252
context: this._selectionInfo,
5353
animated: true
5454
};

sdk/app/calendar/transition-modes/transition-modes-model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class ViewModel extends observableModule.Observable {
5151

5252
public onOptionsTapped() {
5353
var navigationEntry = {
54-
moduleName: "./navigation/options-menu/options",
54+
moduleName: "navigation/options-menu/options",
5555
context: this._transitionInfo,
5656
animated: true
5757
};

sdk/app/calendar/view-modes/view-modes-model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class ViewModel extends observableModule.Observable{
4242

4343
public onOptionsTapped() {
4444
var navigationEntry = {
45-
moduleName: "./navigation/options-menu/options",
45+
moduleName: "navigation/options-menu/options",
4646
context: this._selectionInfo,
4747
animated: true
4848
};

sdk/app/listview/scroll-to-index/scroll-to-index-model-horizontal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class ViewModel extends Observable {
5454
public onOptionsTapped(args: any) {
5555
if (frameModule.topmost().ios) {
5656
var navigationEntry = {
57-
moduleName: "./navigation/options-menu/options",
57+
moduleName: "navigation/options-menu/options",
5858
context: this._selectionInfo,
5959
animated: true
6060
};

sdk/app/listview/scroll-to-index/scroll-to-index-model-vertical.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class ViewModel extends Observable {
5454
public onOptionsTapped(args: any) {
5555
if (frameModule.topmost().ios) {
5656
var navigationEntry = {
57-
moduleName: "./navigation/options-menu/options",
57+
moduleName: "navigation/options-menu/options",
5858
context: this._selectionInfo,
5959
animated: true
6060
};

0 commit comments

Comments
 (0)