Skip to content

Commit bc5b2cf

Browse files
author
Alexander Mai
committed
Merge remote-tracking branch 'upstream/master' into feature/bottm-sheet-closeable
2 parents 37652d2 + 3b2989f commit bc5b2cf

File tree

99 files changed

+4998
-483
lines changed

Some content is hidden

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

99 files changed

+4998
-483
lines changed

‎.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github: [farfromrefug]

‎CHANGELOG.md

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,131 @@
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.2.2](https://github.com/Akylas/nativescript-material-components/compare/v3.2.1...v3.2.2) (2020-04-20)
7+
8+
9+
### Bug Fixes
10+
11+
* **dialogs:** missing return case ([630fd6d](https://github.com/Akylas/nativescript-material-components/commit/630fd6daa3dd9e3b6406c60ea77cd1139c947964))
12+
* **textview:** Editable prop now works ([fe05603](https://github.com/Akylas/nativescript-material-components/commit/fe05603eca0786cbfcf5bfc74bdc4985748a5a97))
13+
14+
15+
16+
17+
18+
## [3.2.1](https://github.com/Akylas/nativescript-material-components/compare/v3.2.0...v3.2.1) (2020-04-14)
19+
20+
**Note:** Version bump only for package nativescript-material-components
21+
22+
23+
24+
25+
26+
# [3.2.0](https://github.com/Akylas/nativescript-material-components/compare/v3.1.18...v3.2.0) (2020-04-14)
27+
28+
29+
### Features
30+
31+
* new tabs component to replace N one ([2ca1a71](https://github.com/Akylas/nativescript-material-components/commit/2ca1a7170b65a5203b9f5d8f83097f03fe850b8d))
32+
33+
34+
35+
36+
37+
## [3.1.18](https://github.com/Akylas/nativescript-material-components/compare/v3.1.17...v3.1.18) (2020-04-12)
38+
39+
40+
### Bug Fixes
41+
42+
* native class when possible. Will be faster ([a3e1964](https://github.com/Akylas/nativescript-material-components/commit/a3e1964182af43fd4bedae369d48b4ab67238b9a))
43+
44+
45+
46+
47+
48+
## [3.1.17](https://github.com/Akylas/nativescript-material-components/compare/v3.1.16...v3.1.17) (2020-04-09)
49+
50+
51+
### Bug Fixes
52+
53+
* **ios:** prevent dialogs not showing ([45488a0](https://github.com/Akylas/nativescript-material-components/commit/45488a0c3c1f6e3db3b135110b50d357808059e1))
54+
* rollback on keyboardType, added digits ([27cfbb5](https://github.com/Akylas/nativescript-material-components/commit/27cfbb5372e99134fd97ef4d392fdb583768007b))
55+
56+
57+
58+
59+
60+
## [3.1.16](https://github.com/Akylas/nativescript-material-components/compare/v3.1.15...v3.1.16) (2020-04-07)
61+
62+
63+
### Bug Fixes
64+
65+
* bottomsheet android is now handling dismissOnDraggingDownSheet correcly ([d07719f](https://github.com/Akylas/nativescript-material-components/commit/d07719f7504ce8046fdbc626a1a0989a5b81efed))
66+
* snackbar cleanup ([5133052](https://github.com/Akylas/nativescript-material-components/commit/5133052e7afb9098eec3900d63e8cb0d241491e1))
67+
* vue signature fi ([8f8570a](https://github.com/Akylas/nativescript-material-components/commit/8f8570aa581997b239b1a4ab7f798f4cb147d47d))
68+
69+
70+
### Features
71+
72+
* new keyboardTypes ([ed71f6a](https://github.com/Akylas/nativescript-material-components/commit/ed71f6addbfc35e82dce2164b78f607ee0d63e39))
73+
* setSelection on textfield/textview ([bc845b6](https://github.com/Akylas/nativescript-material-components/commit/bc845b615e10b7f7957b4e57436cfa165bfe02ab))
74+
75+
76+
77+
78+
79+
## [3.1.15](https://github.com/Akylas/nativescript-material-components/compare/v3.1.14...v3.1.15) (2020-03-24)
80+
81+
82+
### Bug Fixes
83+
84+
* prevent closecallback from beeing called twice ([d090ac8](https://github.com/Akylas/nativescript-material-components/commit/d090ac843d6d5a5a4865cf3edd47ef4b23d59692))
85+
* **ios:** textfield backgroundColor not rendered correctly ([26fbae6](https://github.com/Akylas/nativescript-material-components/commit/26fbae6d20487c26994808ecb957fdf06a857841))
86+
87+
88+
89+
90+
91+
## [3.1.14](https://github.com/Akylas/nativescript-material-components/compare/v3.1.13...v3.1.14) (2020-03-19)
92+
93+
94+
### Bug Fixes
95+
96+
* vue bottomsheet close callback args ([1c05736](https://github.com/Akylas/nativescript-material-components/commit/1c05736d752432986eac08ed12d2b0ce4f8cc865))
97+
* **ios:** edge case dialog custom view not being layed out ([b975d63](https://github.com/Akylas/nativescript-material-components/commit/b975d63dc53c03ff006c21233c10b1afcaf73b16))
98+
99+
100+
101+
102+
103+
## [3.1.13](https://github.com/Akylas/nativescript-material-components/compare/v3.1.12...v3.1.13) (2020-03-15)
104+
105+
106+
### Bug Fixes
107+
108+
* **android:** wrong button gradle dependencies ([b5b001f](https://github.com/Akylas/nativescript-material-components/commit/b5b001fde85ccb787379c432c3dc60990173d65f))
109+
110+
111+
112+
113+
114+
## [3.1.12](https://github.com/Akylas/nativescript-material-components/compare/v3.1.11...v3.1.12) (2020-03-13)
115+
116+
117+
### Bug Fixes
118+
119+
* **android:** prevent crash on closing ([0bbc552](https://github.com/Akylas/nativescript-material-components/commit/0bbc552da2be0d98494141935f1b92b5160fd2b2))
120+
* vue $closeBottomSheet support argiuments ([4337ac0](https://github.com/Akylas/nativescript-material-components/commit/4337ac0cc7d1a40bfb09c9ba5e74d1440a736ac6))
121+
122+
123+
### Features
124+
125+
* shouldResolveOnAction ([69c1d0d](https://github.com/Akylas/nativescript-material-components/commit/69c1d0d42127402bf197b2068e546a424d17b866))
126+
127+
128+
129+
130+
6131
## [3.1.11](https://github.com/Akylas/nativescript-material-components/compare/v3.1.10...v3.1.11) (2020-03-04)
7132

8133

‎demo-vue/app/App_Resources/Android/before-plugins.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
ext {
2-
// androidXMaterial = "1.2.0-alpha01"
2+
androidXMaterial = "1.2.0-alpha02"
33
}
44
// println 'demo vue before plugins set androidXMaterial ' + ext.androidXMaterial

‎demo-vue/app/app.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
@import '~@nativescript/theme/index';
22

3+
.mdi {
4+
font-family: "materialdesignicons-webfont", "Material Design Icons";
5+
}
36
mdbutton {
47
color: black;
58
.ns-dark & {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default Vue.extend({
3232
},
3333
methods: {
3434
onNavigationButtonTap() {
35-
frameModule.topmost().goBack();
35+
frameModule.Frame.topmost().goBack();
3636
}
3737
},
3838
created() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default Vue.extend({
3535
},
3636
methods: {
3737
onNavigationButtonTap() {
38-
frameModule.topmost().goBack();
38+
frameModule.Frame.topmost().goBack();
3939
},
4040
onbottomNavigationBarLoaded(args: EventData): void {
4141
const bottomNavigationBar = args.object as BottomNavigationBar;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default Vue.extend({
3535
},
3636
methods: {
3737
onNavigationButtonTap() {
38-
frameModule.topmost().goBack();
38+
frameModule.Frame.topmost().goBack();
3939
},
4040
onTap(args: EventData) {
4141
const obj = args.object as View;
@@ -44,9 +44,9 @@ export default Vue.extend({
4444
switch (objId) {
4545
case 'bottomsheet': {
4646
(this as NativeScriptVue).$showBottomSheet(BottomSheetInner, {
47-
// transparent:true,
48-
closeCallback: objId => {
49-
console.log('bottom sheet closed');
47+
transparent:true,
48+
closeCallback: (...args) => {
49+
console.log('bottom sheet closed', args);
5050
}
5151
});
5252
break;
@@ -55,8 +55,8 @@ export default Vue.extend({
5555
(this as NativeScriptVue).$showBottomSheet(BottomSheetInner, {
5656
ignoreTopSafeArea:false,
5757
// transparent:true,
58-
closeCallback: objId => {
59-
console.log('bottom sheet closed');
58+
closeCallback: (...args) => {
59+
console.log('bottom sheet closed', args);
6060
}
6161
});
6262
break;
@@ -65,8 +65,8 @@ export default Vue.extend({
6565
(this as NativeScriptVue).$showBottomSheet(BottomSheetInner, {
6666
// transparent:true,
6767
ignoreBottomSafeArea:true,
68-
closeCallback: objId => {
69-
console.log('bottom sheet closed');
68+
closeCallback: (...args) => {
69+
console.log('bottom sheet closed', args);
7070
}
7171
});
7272
break;
@@ -76,16 +76,16 @@ export default Vue.extend({
7676
// transparent:true,
7777
ignoreTopSafeArea:false,
7878
ignoreBottomSafeArea:true,
79-
closeCallback: objId => {
80-
console.log('bottom sheet closed');
79+
closeCallback: (...args) => {
80+
console.log('bottom sheet closed', args);
8181
}
8282
});
8383
break;
8484
}
8585
case 'bottomsheet-keyboard': {
8686
(this as NativeScriptVue).$showBottomSheet(BottomSheetInnerKeyboard, {
87-
closeCallback: objId => {
88-
console.log('bottom sheet closed');
87+
closeCallback: (...args) => {
88+
console.log('bottom sheet closed', args);
8989
}
9090
});
9191
break;

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<template>
2-
<!-- <Page iosOverflowSafeArea="true"> -->
3-
<MDCardView @shownInBottomSheet="onShownInBottomSheet" borderRadius="20" elevation="30" backgroundColor="transparent">
2+
<MDCardView @shownInBottomSheet="onShownInBottomSheet" borderRadius="20" elevation="30" backgroundColor="green">
43
<StackLayout>
5-
<MDButton id="test1" text="test1" borderRadius="20" margin="20" />
6-
<MDButton id="test2" text="test2" />
4+
<MDButton id="test1" text="test1" borderRadius="20" margin="20" @tap="onButtonTap"/>
5+
<MDButton id="test2" text="test2" @tap="onButtonTap"/>
76
</StackLayout>
87
</MDCardView>
9-
<!-- </Page> -->
108
</template>
119

1210
<script lang="ts">
@@ -18,6 +16,9 @@ export default Vue.extend({
1816
return {};
1917
},
2018
methods: {
19+
onButtonTap() {
20+
this.$closeBottomSheet(true);
21+
},
2122
onShownInBottomSheet(args) {
2223
console.log('onShownInBottomSheet');
2324
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default Vue.extend({
3939
},
4040
methods: {
4141
onNavigationButtonTap() {
42-
frameModule.topmost().goBack();
42+
frameModule.Frame.topmost().goBack();
4343
},
4444
onTap() {
4545
console.log('Button tapped');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default Vue.extend({
5757
},
5858
methods: {
5959
onNavigationButtonTap() {
60-
frameModule.topmost().goBack();
60+
frameModule.Frame.topmost().goBack();
6161
},
6262
onTap() {
6363
console.log('Button tapped');

0 commit comments

Comments
 (0)