Skip to content

Commit ed12b79

Browse files
authored
Merge pull request #284 from NativeScript/update-dataform-demo
chore: update 'dataform' demo for nativescript-ui-dataform v6.0.0
2 parents 0081f81 + 32c0dfd commit ed12b79

6 files changed

Lines changed: 18 additions & 17 deletions

File tree

dataform/app/App_Resources/Android/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<activity
2929
android:name="com.tns.NativeScriptActivity"
3030
android:label="@string/title_activity_kimera"
31-
android:configChanges="keyboardHidden|orientation|screenSize"
31+
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode"
3232
android:theme="@style/LaunchScreenTheme">
3333

3434
<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />

dataform/app/App_Resources/Android/src/main/res/values/styles.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
<!-- theme to use AFTER launch screen is loaded-->
2222
<style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
23+
<item name="android:forceDarkAllowed">true</item>
2324
<item name="toolbarStyle">@style/NativeScriptToolbarStyle</item>
2425

2526
<item name="colorPrimary">@color/ns_primary</item>

dataform/app/navigation/examples-list/examples-list.component.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, OnInit, OnDestroy } from "@angular/core";
22
import { ExampleItem } from "../exampleItem";
33
import { ExampleItemService } from "../exampleItemService.service";
4-
import { topmost } from "tns-core-modules/ui/frame";
4+
import { Frame } from "tns-core-modules/ui/frame";
55
import { ActivatedRoute, Router } from '@angular/router';
66

77
@Component({
@@ -59,7 +59,7 @@ export class ExamplesListDepth1Component implements OnInit, OnDestroy {
5959
}
6060

6161
public onNavigationButtonTap() {
62-
topmost().goBack();
62+
Frame.topmost().goBack();
6363
}
6464
}
6565

@@ -120,7 +120,7 @@ export class ExamplesListDepth2Component implements OnInit, OnDestroy {
120120
}
121121

122122
public onNavigationButtonTap() {
123-
topmost().goBack();
123+
Frame.topmost().goBack();
124124
}
125125
}
126126

@@ -176,7 +176,7 @@ export class ExamplesListDepth3Component implements OnInit, OnDestroy {
176176
}
177177

178178
public onNavigationButtonTap() {
179-
topmost().goBack();
179+
Frame.topmost().goBack();
180180
}
181181
}
182182

dataform/app/navigation/options/options.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, OnInit, OnDestroy, Injectable, ViewChild } from "@angular/core";
22
import { ObservableArray } from "tns-core-modules/data/observable-array";
33
import { ActivatedRoute } from '@angular/router';
4-
import { topmost } from "tns-core-modules/ui/frame";
4+
import { Frame } from "tns-core-modules/ui/frame";
55
import { Page } from "tns-core-modules/ui/page";
66
import { OptionsService } from "../../navigation/options/options.service";
77

@@ -59,6 +59,6 @@ export class OptionsComponent implements OnInit, OnDestroy {
5959
public onItemTap(args) {
6060
const selectedItems = this._listView.nativeElement.getSelectedItems() as Array<string>;
6161
this._optionsService.paramValue = selectedItems[0];
62-
topmost().goBack();
62+
Frame.topmost().goBack();
6363
}
6464
}

dataform/app/options-example-base.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { topmost } from "tns-core-modules/ui/frame";
1+
import { Frame } from "tns-core-modules/ui/frame";
22
import { Router } from '@angular/router';
33
import { Observable } from "tns-core-modules/data/observable";
44

@@ -14,6 +14,6 @@ export class OptionsExampleBase extends Observable {
1414
}
1515

1616
public onNavigationButtonTap() {
17-
topmost().goBack();
17+
Frame.topmost().goBack();
1818
}
1919
}

dataform/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"nativescript": {
77
"id": "org.nativescript.demoangular",
88
"tns-android": {
9-
"version": "6.1.0"
9+
"version": "6.2.0"
1010
},
1111
"tns-ios": {
12-
"version": "6.1.0"
12+
"version": "6.2.0"
1313
}
1414
},
1515
"dependencies": {
@@ -21,11 +21,11 @@
2121
"@angular/platform-browser": "~8.2.0",
2222
"@angular/platform-browser-dynamic": "~8.2.0",
2323
"@angular/router": "~8.2.0",
24-
"nativescript-angular": "~8.2.0",
24+
"nativescript-angular": "~8.20.0",
2525
"nativescript-theme-core": "~1.0.4",
2626
"nativescript-ui-dataform": "*",
2727
"rxjs": "^6.4.0",
28-
"tns-core-modules": "^6.0.0",
28+
"tns-core-modules": "^6.2.0",
2929
"zone.js": "^0.9.1"
3030
},
3131
"devDependencies": {
@@ -43,12 +43,12 @@
4343
"markdown-snippet-injector": "^0.2.4",
4444
"mocha": "5.2.0",
4545
"mocha-junit-reporter": "^1.18.0",
46-
"mocha-multi": "1.1.0",
46+
"mocha-multi-reporters": "^1.1.0",
4747
"mochawesome": "^3.1.1",
4848
"nativescript-css-loader": "~0.26.0",
49-
"nativescript-dev-appium": "next",
50-
"nativescript-dev-webpack": "^1.0.0",
51-
"tns-platform-declarations": "^6.1.1",
49+
"nativescript-dev-appium": "^6.0.0",
50+
"nativescript-dev-webpack": "^1.3.0",
51+
"tns-platform-declarations": "^6.2.0",
5252
"tslint": "~5.11.0",
5353
"typescript": "~3.5.3"
5454
}

0 commit comments

Comments
 (0)