Skip to content

Commit a1b54ac

Browse files
nspluginsnsplugins
committed
chore: update 'calendar' demo for nativescript-ui-calendar v6.0.0
1 parent f9f8bb6 commit a1b54ac

File tree

14 files changed

+41
-39
lines changed

14 files changed

+41
-39
lines changed

‎calendar/app/App_Resources/Android/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" />

‎calendar/app/App_Resources/Android/values/styles.xml

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

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

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as observableModule from "tns-core-modules/data/observable";
22
import * as calendarModule from "nativescript-ui-calendar";
3-
import * as frameModule from "tns-core-modules/ui/frame";
3+
import { Frame } from "tns-core-modules/ui/frame";
44

55
export class ViewModel extends observableModule.Observable {
66
calendarEvents: Array<calendarModule.CalendarEvent>;
@@ -42,7 +42,7 @@ export class ViewModel extends observableModule.Observable {
4242
// << calendar-calendar-event-instance
4343

4444
public updateEventsViewMode() {
45-
let radCalendar: calendarModule.RadCalendar = <calendarModule.RadCalendar>(frameModule.topmost().getViewById("calendar"));
45+
let radCalendar: calendarModule.RadCalendar = <calendarModule.RadCalendar>(Frame.topmost().getViewById("calendar"));
4646
if (!radCalendar.ios) {
4747
return;
4848
}
@@ -73,6 +73,6 @@ export class ViewModel extends observableModule.Observable {
7373
animated: true
7474
};
7575

76-
frameModule.topmost().navigate(navigationEntry);
76+
Frame.topmost().navigate(navigationEntry);
7777
}
7878
}

‎calendar/app/calendar/calendar-localization/localization-page.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import * as frameModule from 'tns-core-modules/ui/frame';
1+
import { Frame } from 'tns-core-modules/ui/frame';
22
import { RadCalendar } from 'nativescript-ui-calendar';
33
import { Button } from 'tns-core-modules/ui/button';
44

55
export function btnChangeLocaleTap(args) {
6-
let topFrame = frameModule.topmost();
6+
let topFrame = Frame.topmost();
77
let calendar: RadCalendar = <RadCalendar>topFrame.getViewById('calendar');
88
if (calendar) {
99
calendar.locale = (<Button>args.object).text;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as calendarModule from "nativescript-ui-calendar";
22
import { Observable } from "tns-core-modules/data/observable";
3-
import * as frameModule from "tns-core-modules/ui/frame";
3+
import { Frame } from "tns-core-modules/ui/frame";
44
import { Color } from "tns-core-modules/color";
55

66
export class StylingViewModel extends Observable {
@@ -75,6 +75,6 @@ export class StylingViewModel extends Observable {
7575
animated: true
7676
};
7777

78-
frameModule.topmost().navigate(navigationEntry);
78+
Frame.topmost().navigate(navigationEntry);
7979
}
8080
}

‎calendar/app/calendar/populating-with-data/populating-with-data-model.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as calendarModule from "nativescript-ui-calendar";
22
import * as observableModule from "tns-core-modules/data/observable";
3-
import * as frameModule from "tns-core-modules/ui/frame";
3+
import { Frame } from "tns-core-modules/ui/frame";
44
import { Color } from "tns-core-modules/color";
55

66
export class ViewModel extends observableModule.Observable {
@@ -36,7 +36,7 @@ export class ViewModel extends observableModule.Observable {
3636

3737
public onDateSelected(args: calendarModule.CalendarSelectionEventData) {
3838
const date: Date = args.date;
39-
const calendar: calendarModule.RadCalendar = <calendarModule.RadCalendar><any>frameModule.topmost().getViewById("calendar");
39+
const calendar: calendarModule.RadCalendar = <calendarModule.RadCalendar><any>Frame.topmost().getViewById("calendar");
4040
const events: Array<calendarModule.CalendarEvent> = calendar.getEventsForDate(date);
4141
this.set("myItems", events);
4242
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as calendarModule from "nativescript-ui-calendar";
22
import * as observableModule from "tns-core-modules/data/observable";
3-
import * as frameModule from "tns-core-modules/ui/frame";
3+
import { Frame } from "tns-core-modules/ui/frame";
44

55
export class ViewModel extends observableModule.Observable {
66
private _selectionInfo;
@@ -39,7 +39,7 @@ export class ViewModel extends observableModule.Observable {
3939
}
4040

4141
public resetSelection() {
42-
const calendar: calendarModule.RadCalendar = <calendarModule.RadCalendar>(frameModule.topmost().getViewById("calendar"));
42+
const calendar: calendarModule.RadCalendar = <calendarModule.RadCalendar>(Frame.topmost().getViewById("calendar"));
4343
if (!calendar) {
4444
return;
4545
}
@@ -53,6 +53,6 @@ export class ViewModel extends observableModule.Observable {
5353
animated: true
5454
};
5555

56-
frameModule.topmost().navigate(navigationEntry);
56+
Frame.topmost().navigate(navigationEntry);
5757
}
5858
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as calendarModule from "nativescript-ui-calendar";
22
import * as observableModule from "tns-core-modules/data/observable";
3-
import * as frameModule from "tns-core-modules/ui/frame";
3+
import { Frame } from "tns-core-modules/ui/frame";
44

55
export class ViewModel extends observableModule.Observable {
66
private _transitionInfo;
@@ -56,7 +56,7 @@ export class ViewModel extends observableModule.Observable {
5656
animated: true
5757
};
5858

59-
frameModule.topmost().navigate(navigationEntry);
59+
Frame.topmost().navigate(navigationEntry);
6060
}
6161

6262
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as calendarModule from "nativescript-ui-calendar";
22
import * as observableModule from "tns-core-modules/data/observable";
3-
import * as frameModule from "tns-core-modules/ui/frame";
3+
import { Frame } from "tns-core-modules/ui/frame";
44

55
export class ViewModel extends observableModule.Observable {
66
private _selectionInfo;
@@ -47,6 +47,6 @@ export class ViewModel extends observableModule.Observable {
4747
animated: true
4848
};
4949

50-
frameModule.topmost().navigate(navigationEntry);
50+
Frame.topmost().navigate(navigationEntry);
5151
}
5252
}

‎calendar/app/navigation/categories-view-model.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Observable } from "tns-core-modules/data/observable";
2-
import { topmost } from "tns-core-modules/ui/frame";
2+
import { Frame } from "tns-core-modules/ui/frame";
33
import { isAndroid } from "tns-core-modules/platform/platform";
44

55
export class NavigationItem {
@@ -153,12 +153,12 @@ export class NavigationViewModel extends Observable {
153153
}
154154

155155
if (tappedItem.subItems.length > 0) {
156-
topmost().navigate({
156+
Frame.topmost().navigate({
157157
moduleName: "navigation/category-list-page"
158158
});
159159
} else {
160160
if (tappedItem.module) {
161-
topmost().navigate({
161+
Frame.topmost().navigate({
162162
moduleName: tappedItem.module,
163163
context: tappedItem
164164
});

‎calendar/app/navigation/category-list-page.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import * as categoriesViewModel from "./categories-view-model";
2-
import * as frameModule from "tns-core-modules/ui/frame";
2+
import { Frame } from "tns-core-modules/ui/frame";
33
import * as actionBarModule from "tns-core-modules/ui/action-bar";
44
import * as applicationModule from "tns-core-modules/application";
55
import * as utilsModule from "tns-core-modules/utils/utils";
66

77
let dataModel = categoriesViewModel.navigationModel;
88

99
export function pageLoaded(args) {
10-
if (frameModule.topmost().android) {
10+
if (Frame.topmost().android) {
1111
const page = args.object;
1212
const actionBar = page.actionBar === undefined ? new actionBarModule.ActionBar() : page.actionBar;
1313
actionBar.title = dataModel.currentParent.title;
@@ -17,7 +17,7 @@ export function pageLoaded(args) {
1717
if (page.content) {
1818
utilsModule.ad.dismissSoftInput(page.content.android);
1919
}
20-
frameModule.topmost().goBack();
20+
Frame.topmost().goBack();
2121
});
2222
if (dataModel.hasBackNavigation) {
2323
navigationButton.android.systemIcon = "ic_menu_back";
@@ -45,5 +45,5 @@ export function onPageNavigatingFrom(args) {
4545
}
4646

4747
export function onBackTap(args) {
48-
frameModule.topmost().goBack();
48+
Frame.topmost().goBack();
4949
}

‎calendar/app/navigation/example-page.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as pageModule from "tns-core-modules/ui/page";
22
import * as actionBarModule from "tns-core-modules/ui/action-bar";
33
import * as applicationModule from "tns-core-modules/application";
4-
import * as frameModule from "tns-core-modules/ui/frame";
4+
import { Frame } from "tns-core-modules/ui/frame";
55
import * as utilsModule from "tns-core-modules/utils/utils";
66

77
export class ExamplePage extends pageModule.Page {
@@ -32,7 +32,7 @@ export class ExamplePage extends pageModule.Page {
3232
if (this.content) {
3333
utilsModule.ad.dismissSoftInput(this.content.android);
3434
}
35-
frameModule.topmost().goBack();
35+
Frame.topmost().goBack();
3636
});
3737
navigationButton.android.systemIcon = "ic_menu_back";
3838
actionBar.navigationButton = navigationButton;

‎calendar/app/navigation/options-menu/options-page-model.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as observableModule from "tns-core-modules/data/observable";
22
import * as listViewModule from "tns-core-modules/ui/list-view";
3-
import * as frameModule from "tns-core-modules/ui/frame";
3+
import { Frame } from "tns-core-modules/ui/frame";
44

55
export class ViewModel extends observableModule.Observable {
66
private _info;
@@ -28,16 +28,16 @@ export class ViewModel extends observableModule.Observable {
2828
}
2929

3030
public selectRow(index) {
31-
const listView = <listViewModule.ListView>frameModule.topmost().getViewById("listView");
31+
const listView = <listViewModule.ListView>Frame.topmost().getViewById("listView");
3232
listView.ios.selectRowAtIndexPathAnimatedScrollPosition(NSIndexPath.indexPathForItemInSection(index, 0), false, 0);
3333
}
3434

3535
public onSelectedRow(row) {
3636
this._info.index = row.index;
37-
frameModule.topmost().goBack();
37+
Frame.topmost().goBack();
3838
}
3939

4040
public onBackTap(args) {
41-
frameModule.topmost().goBack();
41+
Frame.topmost().goBack();
4242
}
4343
}

‎calendar/package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,39 @@
66
"nativescript": {
77
"id": "org.nativescript.demo",
88
"tns-ios": {
9-
"version": "6.1.0"
9+
"version": "6.2.0"
1010
},
1111
"tns-android": {
12-
"version": "6.1.0"
12+
"version": "6.2.0"
1313
}
1414
},
1515
"dependencies": {
1616
"nativescript-theme-core": "^1.0.4",
1717
"nativescript-ui-calendar": "*",
1818
"nativescript-unit-test-runner": "0.7.0",
19-
"tns-core-modules": "^6.0.0"
19+
"tns-core-modules": "^6.2.0"
2020
},
2121
"devDependencies": {
2222
"@types/chai": "~4.1.3",
2323
"@types/mocha": "~5.2.1",
2424
"@types/node": "^7.0.5",
25+
"chai": "~4.2.0",
2526
"filewalker": "0.1.2",
2627
"jasmine-core": "^2.5.2",
2728
"karma": "4.1.0",
2829
"karma-jasmine": "2.0.1",
2930
"karma-nativescript-launcher": "^0.4.0",
3031
"karma-webpack": "3.0.5",
3132
"markdown-snippet-injector": "^0.2.2",
32-
"mocha": "^3.3.0",
33+
"mocha": "5.2.0",
3334
"mocha-junit-reporter": "^1.18.0",
34-
"mocha-multi": "1.1.0",
35+
"mocha-multi-reporters": "^1.1.0",
3536
"mochawesome": "^3.1.1",
3637
"nativescript-css-loader": "~0.26.0",
37-
"nativescript-dev-appium": "5.2.0",
38-
"nativescript-dev-webpack": "^1.0.0",
39-
"tns-platform-declarations": "^6.1.0",
38+
"nativescript-dev-appium": "^6.0.0",
39+
"nativescript-dev-webpack": "^1.3.0",
40+
"tns-platform-declarations": "^6.2.0",
4041
"tslint": "~5.11.0",
41-
"typescript": "~3.4.5"
42+
"typescript": "~3.5.3"
4243
}
4344
}

0 commit comments

Comments
 (0)