Skip to content

Commit 1d0cc57

Browse files
committed
Avoid the d.ts warning in app compile
Add .t-36 class Fix the dark DateTimePicker missing icons Fix a crash on orientation change Up the version Update CHANGELOG
1 parent cce0196 commit 1d0cc57

11 files changed

Lines changed: 61 additions & 47 deletions

File tree

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
<a name="2.0.16 beta"></a>
2+
## [2.0.16 beta](https://github.com/NativeScript/theme/compare/v2.0.15...v2.0.16) (2019-09-04)
3+
4+
### Features
5+
6+
* Add .t-36 class
7+
8+
### Fixes
9+
10+
* Fix the dark DateTimePicker's missing icons
11+
* Fix a crash on orientation change
12+
113
<a name="2.0.15 beta"></a>
214
## [2.0.15 beta](https://github.com/NativeScript/theme/compare/v2.0.14...v2.0.15) (2019-09-04)
315

app/pages/pickers.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@ import { BaseModel } from "./base";
22
import { TokenModel } from "nativescript-ui-autocomplete";
33
import { ObservableArray } from "tns-core-modules/data/observable-array";
44

5-
const countries = ["Australia", "Albania", "Austria", "Argentina", "Maldives", "Bulgaria", "Belgium", "Cyprus", "Italy", "Japan",
6-
"Denmark", "Finland", "France", "Germany", "Greece", "Hungary", "Ireland",
7-
"Latvia", "Luxembourg", "Macedonia", "Moldova", "Monaco", "Netherlands", "Norway",
8-
"Poland", "Romania", "Russia", "Sweden", "Slovenia", "Slovakia", "Turkey", "Ukraine",
9-
"Vatican City", "Chad", "China", "Chile"];
10-
115
export class PickersModel extends BaseModel {
126
constructor(page) {
137
super(page);
148

15-
this.items = ["Item 1", "Item 2", "Item 3"];
9+
this.countries = ["Australia", "Albania", "Austria", "Argentina", "Maldives", "Bulgaria", "Belgium", "Cyprus", "Italy", "Japan",
10+
"Denmark", "Finland", "France", "Germany", "Greece", "Hungary", "Ireland",
11+
"Latvia", "Luxembourg", "Macedonia", "Moldova", "Monaco", "Netherlands", "Norway",
12+
"Poland", "Romania", "Russia", "Sweden", "Slovenia", "Slovakia", "Turkey", "Ukraine",
13+
"Vatican City", "Chad", "China", "Chile"];
1614

1715
this.dataItems = new ObservableArray();
1816

19-
for (let i = 0; i < countries.length; i++) {
20-
this.dataItems.push(new TokenModel(countries[i]));
17+
for (let i = 0; i < this.countries.length; i++) {
18+
this.dataItems.push(new TokenModel(this.countries[i]));
2119
}
2220
}
2321
}

app/pages/pickers.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<actionBar:action-bar actionBarTitle="Pickers" />
88
<ScrollView>
99
<StackLayout class="nt-form">
10-
<p:PickerField hint="Pick an item" items="{{ items }}" modalAnimated="{{ true }}" />
10+
<p:PickerField hint="Pick an item" items="{{ countries }}" modalAnimated="{{ true }}" />
1111
<dt:DatePickerField hint="Pick a date" />
1212
<dt:TimePickerField hint="Choose time" />
1313
<dt:DateTimePickerFields hintDate="Choose date" hintTime="and time" />

app/pages/themes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export class ThemesModel extends BaseModel {
7373

7474
import(
7575
/* webpackMode: "lazy",
76-
webpackExclude: /\/scss\// */
76+
webpackExclude: /\/scss\/|index.d.ts/ */
7777
`nativescript-theme-core/${currentTheme.skin}`)
7878
.then((skinStyles) => this._applyStyles(skinStyles, `${currentTheme.skin}`));
7979
}

package-lock.json

Lines changed: 30 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-theme-core",
3-
"version": "2.0.15",
3+
"version": "2.0.16",
44
"description": "Telerik NativeScript Core Theme",
55
"author": "Telerik <support@telerik.com>",
66
"homepage": "https://www.nativescript.org",

src/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ function handleOrientation({ newValue: orientation }) {
105105
if (viewCommon._rootModalViews.length) {
106106
const classList = new ClassList(app.getRootView().className);
107107

108-
viewCommon._rootModalViews.forEach((view) => updateRootClasses(orientation, view, classList.list.concat("ns-modal")));
108+
viewCommon._rootModalViews.forEach((view) => updateRootClasses(orientation, view, classList.add("ns-modal").list));
109109
}
110110
}
111111

@@ -121,7 +121,7 @@ const rootModalTrap = {
121121
if (desc.value instanceof frame.Frame) {
122122
const classList = new ClassList(app.getRootView().className);
123123

124-
updateRootClasses(getOrientation(), desc.value, classList.list.concat("ns-modal"));
124+
updateRootClasses(getOrientation(), desc.value, classList.add("ns-modal").list);
125125
}
126126
}
127127

src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-theme-core",
3-
"version": "2.0.13",
3+
"version": "2.0.16",
44
"description": "Telerik NativeScript Core Theme",
55
"author": "Telerik <support@telerik.com>",
66
"main": "index",

src/scss/core/_colors.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $constants: (
44
black: $black,
55
white: $white,
66
grey: $grey,
7-
grey-background: $grey-background,
7+
grey-light: $grey-background,
88
charcoal: $charcoal,
99
transparent: transparent,
1010

src/scss/core/utilities/_text.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ $font-sizes: (
6060
),
6161
30: (
6262
size: $font-size + 20
63+
),
64+
36: (
65+
size: $font-size + 26
6366
)
6467
) !default;
6568

@@ -75,4 +78,4 @@ $font-sizes: (
7578
.t-#{$size} {
7679
font-size: $s;
7780
}
78-
}
81+
}

0 commit comments

Comments
 (0)