Merge pull request #207 from telerik/amiorkov/migratiin-4.0-rebase

Migrate to latest NativeScript and add "root" RadSideDrawer
ProgressNS · Apr 16, 2018 · 135ea1e · 135ea1e
2 parents f6e5b1b + 0d8f394
commit 135ea1e
Show file tree

Hide file tree

Showing 27 changed files with 442 additions and 383 deletions.
diff --git a/sdk/app/app.css b/sdk/app/app.css
@@ -1,4 +1,6 @@
-.title {
+@import '~nativescript-theme-core/css/core.light.css';
+
+.title {
     font-size: 30;
     horizontal-align: center;
     margin:20;
@@ -20,7 +22,7 @@ button {
 }
 
 .drawerContent {
-    background-color: gray;
+    background-color: lightgray;
 }
 
 .drawerContentText {
@@ -83,18 +85,6 @@ button {
     padding: 5;
 }
 
-.titleLabel {
-    margin: 16;
-    vertical-align: center;
-}
-
-.itemStackLayout {
-    text-align: left;
-    vertical-align: center;
-    font-size: 16;
-    color:#404040;
-}
-
 .label {
     margin-left: 20;
     margin-top: 20;
@@ -107,7 +97,15 @@ button {
     font-weight: bold;
 }
 
-.item-template-style{
+.item-template-style {
     border-width:1;
     border-color: gray;
-}
+}
+
+.btn {
+    margin: 0;
+}
+
+/* .test {
+    background-color: red;
+} */
diff --git a/sdk/app/app.ts b/sdk/app/app.ts
@@ -20,9 +20,10 @@ declare module com {
 
 
 if (application.android) {
+    require("./main-activity.android.ts");
     application.on("launch", (intent) => {
         fresco.initialize();
     });
 }
 
-application.start("./navigation/category-list-page");
+application.run({ moduleName: "navigation/category-list-page" });
diff --git a/sdk/app/calendar/calendar-events/events-view-modes-model.ts b/sdk/app/calendar/calendar-events/events-view-modes-model.ts
@@ -66,7 +66,7 @@ export class ViewModel extends observableModule.Observable {
 
     public onOptionsTapped() {
         var navigationEntry = {
-            moduleName: "./navigation/options-menu/options",
+            moduleName: "navigation/options-menu/options",
             context: this._viewModesInfo,
             animated: true
         };

diff --git a/sdk/app/calendar/cell-styling/cell-styles-model.ts b/sdk/app/calendar/cell-styling/cell-styles-model.ts
@@ -70,7 +70,7 @@ export class StylingViewModel extends Observable {
 
     public onOptionsTapped() {
         var navigationEntry = {
-            moduleName: "./navigation/options-menu/options",
+            moduleName: "navigation/options-menu/options",
             context: this._selectionInfo,
             animated: true
         };

diff --git a/sdk/app/calendar/events-view-modes/events-view-modes-model-page.ts b/sdk/app/calendar/events-view-modes/events-view-modes-model-page.ts
@@ -71,7 +71,7 @@ export class ViewModel extends observableModule.Observable {
 
     public onOptionsTapped() {
         var navigationEntry = {
-            moduleName: "./navigation/options-menu/options",
+            moduleName: "navigation/options-menu/options",
             context: this._viewModesInfo,
             animated: true
         };

diff --git a/sdk/app/calendar/selection-modes/selection-modes-model.ts b/sdk/app/calendar/selection-modes/selection-modes-model.ts
@@ -48,7 +48,7 @@ export class ViewModel extends observableModule.Observable{
 
     public onOptionsTapped() {
         var navigationEntry = {
-            moduleName: "./navigation/options-menu/options",
+            moduleName: "navigation/options-menu/options",
             context: this._selectionInfo,
             animated: true
         };

diff --git a/sdk/app/calendar/transition-modes/transition-modes-model.ts b/sdk/app/calendar/transition-modes/transition-modes-model.ts
@@ -51,7 +51,7 @@ export class ViewModel extends observableModule.Observable {
 
     public onOptionsTapped() {
         var navigationEntry = {
-            moduleName: "./navigation/options-menu/options",
+            moduleName: "navigation/options-menu/options",
             context: this._transitionInfo,
             animated: true
         };

diff --git a/sdk/app/calendar/view-modes/view-modes-model.ts b/sdk/app/calendar/view-modes/view-modes-model.ts
@@ -42,7 +42,7 @@ export class ViewModel extends observableModule.Observable{
 
     public onOptionsTapped() {
         var navigationEntry = {
-            moduleName: "./navigation/options-menu/options",
+            moduleName: "navigation/options-menu/options",
             context: this._selectionInfo,
             animated: true
         };

diff --git a/sdk/app/listview/scroll-to-index/scroll-to-index-model-horizontal.ts b/sdk/app/listview/scroll-to-index/scroll-to-index-model-horizontal.ts
@@ -54,7 +54,7 @@ export class ViewModel extends Observable {
     public onOptionsTapped(args: any) {
         if (frameModule.topmost().ios) {
             var navigationEntry = {
-                moduleName: "./navigation/options-menu/options",
+                moduleName: "navigation/options-menu/options",
                 context: this._selectionInfo,
                 animated: true
             };

diff --git a/sdk/app/listview/scroll-to-index/scroll-to-index-model-vertical.ts b/sdk/app/listview/scroll-to-index/scroll-to-index-model-vertical.ts
@@ -54,7 +54,7 @@ export class ViewModel extends Observable {
     public onOptionsTapped(args: any) {
         if (frameModule.topmost().ios) {
             var navigationEntry = {
-                moduleName: "./navigation/options-menu/options",
+                moduleName: "navigation/options-menu/options",
                 context: this._selectionInfo,
                 animated: true
             };