Skip to content

Commit 89a2321

Browse files
author
Alexander Mai
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/bottomsheet/bottomsheet-common.ts
2 parents 52c4886 + 76b387d commit 89a2321

File tree

62 files changed

+776
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+776
-311
lines changed

‎.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
}
1414
],
1515
"editor.snippetSuggestions": "top",
16-
"NE.enable.snippets": true
16+
"NE.enable.snippets": true,
17+
"java.configuration.updateBuildConfiguration": "disabled"
1718
}

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,28 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [3.1.9](https://github.com/Akylas/nativescript-material-components/compare/v3.1.8...v3.1.9) (2020-02-24)
7+
8+
9+
### Bug Fixes
10+
11+
* dark mode support ([2ed3d87](https://github.com/Akylas/nativescript-material-components/commit/2ed3d870bdce10e66fa2bcda4d936da499690f39))
12+
13+
14+
15+
16+
17+
## [3.1.8](https://github.com/Akylas/nativescript-material-components/compare/v3.1.7...v3.1.8) (2020-02-20)
18+
19+
20+
### Bug Fixes
21+
22+
* **ios:** should fix bottomsheet and safearea ([9d7f21e](https://github.com/Akylas/nativescript-material-components/commit/9d7f21e56f3ecde732155636588c288f8a3bad05))
23+
24+
25+
26+
27+
628
## [3.1.7](https://github.com/Akylas/nativescript-material-components/compare/v3.1.6...v3.1.7) (2020-02-18)
729

830

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ Build beautiful, usable products using Material Components for NativeScript.
88

99
- [Button](./packages/nativescript-material-button/README.md)
1010
- [Floating Action Button](./packages/nativescript-material-floatingactionbutton/README.md)
11-
- [Textfield](./packages/nativescript-material-textfield/README.md)
11+
- [TextField](./packages/nativescript-material-textfield/README.md)
12+
- [TextView](./packages/nativescript-material-textview/README.md)
1213
- [CardView](./packages/nativescript-material-cardview/README.md)
1314
- [Slider](./packages/nativescript-material-slider/README.md)
1415
- [Progress](./packages/nativescript-material-progress/README.md)

‎demo-ng/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"nativescript-material-slider": "file:../packages/nativescript-material-slider",
3232
"nativescript-material-snackbar": "file:../packages/nativescript-material-snackbar",
3333
"nativescript-material-textfield": "file:../packages/nativescript-material-textfield",
34-
"nativescript-theme-core": "~2.0.24",
34+
"@nativescript/theme": "~2.3.2",
3535
"reflect-metadata": "~0.1.13",
3636
"rxjs": "~6.5.3",
3737
"tns-core-modules": "~6.1.2",

‎demo-ng/src/app.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import '~nativescript-theme-core/css/core.light.css';
1+
@import '~@nativescript/theme/index';

‎demo-vue/app/app.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
mdbutton {
1+
@import '~@nativescript/theme/index';
2+
3+
mdbutton {
4+
color: black;
5+
.ns-dark & {
6+
color: white;
7+
}
28
}
39
button {
4-
elevation:2
10+
elevation: 2;
511
}
612

713
.falseFAb {

‎demo-vue/app/examples/BottomSheet.vue

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
</ActionBar>
66
<StackLayout>
77
<MDButton id="bottomsheet" text="bottomsheet" @tap="onTap" />
8+
<MDButton id="dont_ignore_top_safe_area" text="dont_ignore_top_safe_area" @tap="onTap" />
9+
<MDButton id="ignore_bottom_safe_area" text="ignore_bottom_safe_area" @tap="onTap" />
10+
<MDButton id="dont_ignore_top_ignore_bottom_safe_area" text="dont_ignore_top_ignore_bottom_safe_area" @tap="onTap" />
811
<MDButton id="bottomsheet-keyboard" text="bottomsheet-keyboard" @tap="onTap" />
912
</StackLayout>
1013
</Page>
@@ -48,6 +51,37 @@ export default Vue.extend({
4851
});
4952
break;
5053
}
54+
case 'dont_ignore_top_safe_area': {
55+
(this as NativeScriptVue).$showBottomSheet(BottomSheetInner, {
56+
ignoreTopSafeArea:false,
57+
// transparent:true,
58+
closeCallback: objId => {
59+
console.log('bottom sheet closed');
60+
}
61+
});
62+
break;
63+
}
64+
case 'ignore_bottom_safe_area': {
65+
(this as NativeScriptVue).$showBottomSheet(BottomSheetInner, {
66+
// transparent:true,
67+
ignoreBottomSafeArea:true,
68+
closeCallback: objId => {
69+
console.log('bottom sheet closed');
70+
}
71+
});
72+
break;
73+
}
74+
case 'dont_ignore_top_ignore_bottom_safe_area': {
75+
(this as NativeScriptVue).$showBottomSheet(BottomSheetInner, {
76+
// transparent:true,
77+
ignoreTopSafeArea:false,
78+
ignoreBottomSafeArea:true,
79+
closeCallback: objId => {
80+
console.log('bottom sheet closed');
81+
}
82+
});
83+
break;
84+
}
5185
case 'bottomsheet-keyboard': {
5286
(this as NativeScriptVue).$showBottomSheet(BottomSheetInnerKeyboard, {
5387
closeCallback: objId => {

‎demo-vue/app/examples/BottomSheetInner.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<template>
2-
<MDCardView backgroundColor="green" @shownInBottomSheet="onShownInBottomSheet" borderRadius="20" elevation="30">
2+
<!-- <Page iosOverflowSafeArea="true"> -->
3+
<MDCardView @shownInBottomSheet="onShownInBottomSheet" borderRadius="20" elevation="30" backgroundColor="transparent">
34
<StackLayout>
45
<MDButton id="test1" text="test1" borderRadius="20" margin="20" />
56
<MDButton id="test2" text="test2" />
67
</StackLayout>
78
</MDCardView>
9+
<!-- </Page> -->
810
</template>
911

1012
<script lang="ts">

‎demo-vue/app/main.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ if (isIOS) {
7171
}
7272

7373
// import { getExamples } from './examples';
74-
import * as views from './views';
74+
import * as views from './views';
7575

7676
// for (let item of getExamples()) {
7777
// Vue.component(item.component.name, item.component);
7878
// }
7979

8080
Vue.component(views.Home.name, views.Home);
8181

82-
Vue.config.silent = false;
82+
Vue.config.silent = true;
8383

8484
Vue.config.errorHandler = (e, vm, info) => {
8585
console.log('vue error', e, e.stack);

‎demo-vue/app/views/Home.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ export default {
88
</ActionBar>
99
<ListView ref="listView" rowHeight="50" for="example in examples">
1010
<v-template>
11-
<MDRipple rippleColor="red" @tap="{goToExample(example)}" @longPress="{goToModalExample(example)}" >
12-
<StackLayout class="item" orientation="horizontal" height="40">
11+
<MDRipple rippleColor="red" @tap="{goToExample(example)}" @longPress="{goToModalExample(example)}" >
1312
<Label paddingLeft="10" :text="example.title" class="title" verticalAlignment="center"/>
14-
</StackLayout>
1513
</MDRipple>
16-
</v-template>
14+
</v-template>
1715
</ListView>
1816
</Page>
1917
`,

0 commit comments

Comments
 (0)