Merge pull request #287 from NativeScript/update-sidedrawer-demo

elena-p · web-flow · commit cfac9dcdc417 · 2019-11-20T16:30:36.000+02:00
chore: update 'sidedrawer' demo for nativescript-ui-sidedrawer v8.0.0
diff --git a/sidedrawer/app/App_Resources/Android/src/main/AndroidManifest.xml b/sidedrawer/app/App_Resources/Android/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
 		<activity
 			android:name="com.tns.NativeScriptActivity"
 			android:label="@string/title_activity_kimera"
-			android:configChanges="keyboardHidden|orientation|screenSize"
+			android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
 			android:theme="@style/LaunchScreenTheme">
 
 			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
diff --git a/sidedrawer/app/App_Resources/Android/src/main/res/values/styles.xml b/sidedrawer/app/App_Resources/Android/src/main/res/values/styles.xml
@@ -21,6 +21,7 @@
 
     <!-- theme to use AFTER launch screen is loaded-->
     <style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:forceDarkAllowed">true</item>
         <item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
 
         <item name="colorPrimary">@color/ns_primary</item>
diff --git a/sidedrawer/app/examples/events/events.component.css b/sidedrawer/app/examples/events/events.component.css
@@ -3,12 +3,12 @@ button {
     horizontal-align: center;
 }
 
-.drawerContentText {
+RadSideDrawer .drawerContentText {
     font-size: 13;
     padding: 10;
 }
 
-.drawerContentButton {
+RadSideDrawer .drawerContentButton {
     margin: 10;
     horizontal-align: left;
 }
diff --git a/sidedrawer/app/examples/getting-started/getting-started.component.css b/sidedrawer/app/examples/getting-started/getting-started.component.css
@@ -4,12 +4,12 @@ button {
     horizontal-align: center;
 }
 
-.drawerContentText {
+RadSideDrawer .drawerContentText {
     font-size: 13;
     padding: 10;
 }
 
-.drawerContentButton {
+RadSideDrawer .drawerContentButton {
     margin: 10;
     horizontal-align: left;
 }
diff --git a/sidedrawer/app/examples/position/position.component.css b/sidedrawer/app/examples/position/position.component.css
@@ -3,16 +3,12 @@ button {
     horizontal-align: center;
 }
 
-.drawerContentText {
+RadSideDrawer .drawerContentText {
     font-size: 13;
     padding: 10;
 }
 
-.mainContent{
-    background-color: white;
-}
-
-.drawerContentButton {
+RadSideDrawer .drawerContentButton {
     margin: 10;
     horizontal-align: left;
 }
diff --git a/sidedrawer/app/examples/position/position.component.html b/sidedrawer/app/examples/position/position.component.html
@@ -20,7 +20,7 @@
             </StackLayout>
         </ScrollView>
     </GridLayout>
-    <ScrollView tkMainContent class="mainContent">
+    <ScrollView tkMainContent>
         <StackLayout>
             <Label
                 text="SideDrawer for NativeScript is shown from the left side of the app window by default.You can change this behavior by setting the drawerLocation property to Left, Top, Right or Bottom."
diff --git a/sidedrawer/app/examples/shadow/shadow.component.css b/sidedrawer/app/examples/shadow/shadow.component.css
@@ -3,16 +3,12 @@ button {
     horizontal-align: center;
 }
 
-.drawerContentText {
+RadSideDrawer .drawerContentText {
     font-size: 13;
     padding: 10;
 }
 
-.mainContent{
-    background-color: white;
-}
-
-.drawerContentButton {
+RadSideDrawer .drawerContentButton {
     margin: 10;
     horizontal-align: left;
 }
diff --git a/sidedrawer/app/examples/shadow/shadow.component.html b/sidedrawer/app/examples/shadow/shadow.component.html
@@ -20,7 +20,7 @@
             </StackLayout>
         </ScrollView>
     </GridLayout>
-    <ScrollView tkMainContent class="mainContent">
+    <ScrollView tkMainContent>
         <StackLayout>
             <Label
                 text="SideDrawer for NativeScript is shown from the left side of the app window by default.You can change this behavior by setting the drawerLocation property to Left, Top, Right or Bottom."
diff --git a/sidedrawer/app/examples/transitions/transitions.component.css b/sidedrawer/app/examples/transitions/transitions.component.css
@@ -7,12 +7,12 @@ button {
     background-color: white;
 }
 
-.drawerContentButton {
+RadSideDrawer .drawerContentButton {
     margin: 10;
     horizontal-align: left;
 }
 
-.mainContentlabel {
+RadSideDrawer .mainContentlabel {
     margin: 10;
 }
 
diff --git a/sidedrawer/app/navigation/examples-list/examples-list.component.css b/sidedrawer/app/navigation/examples-list/examples-list.component.css
@@ -7,5 +7,4 @@
     text-align: left;
     vertical-align: center;
     font-size: 16;
-    color:#404040;
 }
diff --git a/sidedrawer/app/navigation/examples-list/examples-list.component.ts b/sidedrawer/app/navigation/examples-list/examples-list.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy, AfterViewInit } from "@angular/core";
 import { ExampleItem } from "../exampleItem";
 import { ExampleItemService } from "../exampleItemService.service";
-import * as frameModule from "tns-core-modules/ui/frame";
+import { Frame } from "tns-core-modules/ui/frame";
 import { ActivatedRoute, Router } from '@angular/router';
 import { RadSideDrawer, FadeTransition, PushTransition, RevealTransition, ReverseSlideOutTransition, ScaleDownPusherTransition, ScaleUpTransition, SlideAlongTransition, SlideInOnTopTransition } from "nativescript-ui-sidedrawer";
 import { getRootView } from "tns-core-modules/application";
@@ -111,7 +111,7 @@ export class ExamplesListDepth1Component implements OnInit, AfterViewInit, OnDes
     }
 
     public onNavigationButtonTap() {
-        frameModule.topmost().goBack();
+        Frame.topmost().goBack();
     }
 }
 
@@ -177,7 +177,7 @@ export class ExamplesListDepth2Component implements OnInit, AfterViewInit, OnDes
     }
 
     public onNavigationButtonTap() {
-        frameModule.topmost().goBack();
+        Frame.topmost().goBack();
     }
 
 
@@ -278,7 +278,7 @@ export class ExamplesListDepth3Component implements OnInit, AfterViewInit, OnDes
     }
 
     public onNavigationButtonTap() {
-        frameModule.topmost().goBack();
+        Frame.topmost().goBack();
     }
 
 
diff --git a/sidedrawer/app/navigation/options/options.component.ts b/sidedrawer/app/navigation/options/options.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy, Injectable, ViewChild } from "@angular/core";
 import { ObservableArray } from "tns-core-modules/data/observable-array";
 import { ActivatedRoute } from '@angular/router';
-import * as frameModule from "tns-core-modules/ui/frame";
+import { Frame } from "tns-core-modules/ui/frame";
 import { Page } from "tns-core-modules/ui/page";
 import { OptionsService } from "../../navigation/options/options.service";
 
@@ -47,6 +47,6 @@ export class OptionsComponent implements OnInit, OnDestroy {
 
     public onItemTap(args) {
         this._optionsService.paramValue = args.index;
-        frameModule.topmost().goBack();
+        Frame.topmost().goBack();
     }
 }
diff --git a/sidedrawer/package.json b/sidedrawer/package.json
@@ -6,10 +6,10 @@
   "nativescript": {
     "id": "org.nativescript.demoangular",
     "tns-ios": {
-      "version": "6.1.0"
+      "version": "6.2.0"
     },
     "tns-android": {
-      "version": "6.1.0"
+      "version": "6.2.0"
     }
   },
   "dependencies": {
@@ -21,17 +21,18 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "nativescript-angular": "~8.2.0",
+    "nativescript-angular": "~8.20.0",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-ui-sidedrawer": "*",
     "rxjs": "^6.4.0",
-    "tns-core-modules": "^6.0.0",
+    "tns-core-modules": "^6.2.0",
     "zone.js": "^0.9.1"
   },
   "devDependencies": {
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",
+    "chai": "~4.2.0",
     "codelyzer": "^4.5.0",
     "karma": "^1.6.0",
     "karma-chai": "^0.1.0",
@@ -44,8 +45,8 @@
     "mochawesome": "3.1.1",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-appium": "^6.0.0",
-    "nativescript-dev-webpack": "^1.0.0",
-    "tns-platform-declarations": "^6.1.1",
+    "nativescript-dev-webpack": "^1.3.0",
+    "tns-platform-declarations": "^6.2.0",
     "tslint": "~5.11.0",
     "typescript": "~3.5.3"
   }

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@ button {`
`3`	`3`	`horizontal-align: center;`
`4`	`4`	`}`
`5`	`5`
`6`		`-.drawerContentText {`
	`6`	`+RadSideDrawer .drawerContentText {`
`7`	`7`	`font-size: 13;`
`8`	`8`	`padding: 10;`
`9`	`9`	`}`
`10`	`10`
`11`		`-.drawerContentButton {`
	`11`	`+RadSideDrawer .drawerContentButton {`
`12`	`12`	`margin: 10;`
`13`	`13`	`horizontal-align: left;`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ button {`
`4`	`4`	`horizontal-align: center;`
`5`	`5`	`}`
`6`	`6`
`7`		`-.drawerContentText {`
	`7`	`+RadSideDrawer .drawerContentText {`
`8`	`8`	`font-size: 13;`
`9`	`9`	`padding: 10;`
`10`	`10`	`}`
`11`	`11`
`12`		`-.drawerContentButton {`
	`12`	`+RadSideDrawer .drawerContentButton {`
`13`	`13`	`margin: 10;`
`14`	`14`	`horizontal-align: left;`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,12 @@ button {`
`3`	`3`	`horizontal-align: center;`
`4`	`4`	`}`
`5`	`5`
`6`		`-.drawerContentText {`
	`6`	`+RadSideDrawer .drawerContentText {`
`7`	`7`	`font-size: 13;`
`8`	`8`	`padding: 10;`
`9`	`9`	`}`
`10`	`10`
`11`		`-.mainContent{`
`12`		`- background-color: white;`
`13`		`-}`
`14`		`-`
`15`		`-.drawerContentButton {`
	`11`	`+RadSideDrawer .drawerContentButton {`
`16`	`12`	`margin: 10;`
`17`	`13`	`horizontal-align: left;`
`18`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ button {`
`7`	`7`	`background-color: white;`
`8`	`8`	`}`
`9`	`9`
`10`		`-.drawerContentButton {`
	`10`	`+RadSideDrawer .drawerContentButton {`
`11`	`11`	`margin: 10;`
`12`	`12`	`horizontal-align: left;`
`13`	`13`	`}`
`14`	`14`
`15`		`-.mainContentlabel {`
	`15`	`+RadSideDrawer .mainContentlabel {`
`16`	`16`	`margin: 10;`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@`
`7`	`7`	`text-align: left;`
`8`	`8`	`vertical-align: center;`
`9`	`9`	`font-size: 16;`
`10`		`- color:#404040;`
`11`	`10`	`}`