Skip to content

Commit 37951f5

Browse files
authored
Merge branch 'master' into master
2 parents 34fed39 + cc55c21 commit 37951f5

File tree

359 files changed

+259683
-4279
lines changed

Some content is hidden

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

359 files changed

+259683
-4279
lines changed

.classpath

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="bin/main" path="packages/core/platforms/android/java">
4+
<attributes>
5+
<attribute name="gradle_scope" value="main"/>
6+
<attribute name="gradle_used_by_scope" value="main,test"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
10+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
11+
<classpathentry kind="output" path="bin/default"/>
12+
</classpath>

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ node_modules
5454
platforms
5555
!plugin/platforms
5656
lib
57-
*.css
5857
!webpack.*.js
5958
report
6059
*.log
@@ -80,3 +79,5 @@ pnpm-lock.yaml
8079
hooks
8180
!src/core/hooks
8281
/tempAngular
82+
/.gradle
83+
/.settings

.project

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>nativescript-material</name>
4+
<comment>Project nativescript-material created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1604680591551</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
34+
</projectDescription>

CHANGELOG.md

Lines changed: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,243 @@
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+
## [5.2.6](https://github.com/Akylas/nativescript-material-components/compare/v5.2.5...v5.2.6) (2021-02-10)
7+
8+
9+
### Bug Fixes
10+
11+
* **android:** fix keyboard not hiding on back button ([0e6e51a](https://github.com/Akylas/nativescript-material-components/commit/0e6e51aee2ce046bd9168ecf4989de54fcb2acd0))
12+
13+
14+
15+
16+
17+
## [5.2.5](https://github.com/Akylas/nativescript-material-components/compare/v5.2.4...v5.2.5) (2021-02-04)
18+
19+
**Note:** Version bump only for package @nativescript-community/ui-material-components
20+
21+
22+
23+
24+
25+
## [5.2.4](https://github.com/Akylas/nativescript-material-components/compare/v5.2.3...v5.2.4) (2021-02-04)
26+
27+
28+
### Bug Fixes
29+
30+
* **bottomsheet:** ios ensure view is loaded before the first viewDidLayoutSubviews call ([f34e418](https://github.com/Akylas/nativescript-material-components/commit/f34e418d29881db5f48dd419ae1e686a8af2f956))
31+
* **dialogs:** typings fix for alert with custom view ([c8467e1](https://github.com/Akylas/nativescript-material-components/commit/c8467e1d413c5dc332db1e3463b7d0b2fda31bcb))
32+
* **textfield:** ios allow textfield auto size ([826252e](https://github.com/Akylas/nativescript-material-components/commit/826252e77bbbae65733bbdd00bfade97376b4f61))
33+
34+
35+
36+
37+
38+
## [5.2.3](https://github.com/Akylas/nativescript-material-components/compare/v5.2.2...v5.2.3) (2021-01-23)
39+
40+
41+
### Bug Fixes
42+
43+
* **cardview:** ios fix for elevation+borderRadius ([cf16772](https://github.com/Akylas/nativescript-material-components/commit/cf167724a9775ffdefd5231d8bcddc3a1b61b34c))
44+
45+
46+
47+
48+
49+
## [5.2.2](https://github.com/Akylas/nativescript-material-components/compare/v5.2.1...v5.2.2) (2021-01-20)
50+
51+
52+
### Features
53+
54+
* **bottom-navigation:** iosCustomPositioning to allow positioning within layouts ([d420159](https://github.com/Akylas/nativescript-material-components/commit/d420159cb03d0d3b7e5a235205cc27281e635e6f))
55+
56+
57+
58+
59+
60+
## [5.2.1](https://github.com/Akylas/nativescript-material-components/compare/v5.2.0...v5.2.1) (2021-01-19)
61+
62+
63+
### Bug Fixes
64+
65+
* **dialogs:** android alert not resolving ([e1e2f4b](https://github.com/Akylas/nativescript-material-components/commit/e1e2f4b52ade7becf8ebd080744eff66cf3bb0b5))
66+
67+
68+
69+
70+
71+
# [5.2.0](https://github.com/Akylas/nativescript-material-components/compare/v5.1.16...v5.2.0) (2021-01-18)
72+
73+
74+
### Bug Fixes
75+
76+
* fixes for bottom-navigation and tabs ([89fb903](https://github.com/Akylas/nativescript-material-components/commit/89fb90354dcac33979035f255e3839c2da08c15b))
77+
* **bottom-navigation:** port of N fix https://github.com/NativeScript/NativeScript/commit/4690162384c731d6d652d90a9347cae06c0a0e0c ([ef7dece](https://github.com/Akylas/nativescript-material-components/commit/ef7dece2edf53c6cb53ecb1fd197d9a149b2661e))
78+
79+
80+
### Features
81+
82+
* **bottomnavigation:** new N bottom-navigation replace component ([5e48adf](https://github.com/Akylas/nativescript-material-components/commit/5e48adf9eeb2713bd4e0ceab67d37cae60639c90))
83+
84+
85+
86+
87+
88+
## [5.1.16](https://github.com/Akylas/nativescript-material-components/compare/v5.1.15...v5.1.16) (2020-12-14)
89+
90+
91+
### Bug Fixes
92+
93+
* **textfield:** android fix stroke colors ([74726a8](https://github.com/Akylas/nativescript-material-components/commit/74726a8d59c67335436a64bff2dcfeb2c7cd8e4f))
94+
* **textview:** android stroke color fixes ([d1ea1f4](https://github.com/Akylas/nativescript-material-components/commit/d1ea1f4fea2cc6d9d63a515af36f04a22ae70f64))
95+
96+
97+
98+
99+
100+
## [5.1.15](https://github.com/Akylas/nativescript-material-components/compare/v5.1.14...v5.1.15) (2020-12-13)
101+
102+
103+
### Bug Fixes
104+
105+
* **textfield:** android font no applied to both floating and inner textfield ([4ec6140](https://github.com/Akylas/nativescript-material-components/commit/4ec61400a7b5f51df6601735392ffefd56b1583c))
106+
* **textview:** android font no applied to both floating and inner textfield ([9fb4860](https://github.com/Akylas/nativescript-material-components/commit/9fb4860b52e4745c08a3bbbce1737d699e9e81ec))
107+
108+
109+
110+
111+
112+
## [5.1.14](https://github.com/Akylas/nativescript-material-components/compare/v5.1.13...v5.1.14) (2020-12-10)
113+
114+
115+
### Bug Fixes
116+
117+
* **cardview:** borderRadius regression after shape addition ([3d0d9f2](https://github.com/Akylas/nativescript-material-components/commit/3d0d9f2280b9f9f601085fc052371d18574ce9a2))
118+
119+
120+
121+
122+
123+
## [5.1.13](https://github.com/Akylas/nativescript-material-components/compare/v5.1.12...v5.1.13) (2020-12-07)
124+
125+
126+
### Bug Fixes
127+
128+
* **tabs:** ported N fix ([85cc042](https://github.com/Akylas/nativescript-material-components/commit/85cc042e8f53594ef964c4079e343dccf2c677fa))
129+
* **textfield:** add missing text dependency ([7d957ef](https://github.com/Akylas/nativescript-material-components/commit/7d957ef6fabca87ef4309116feeb93ab505ba7cd))
130+
* **textfield:** ios resolve pod issue ([3ee9e62](https://github.com/Akylas/nativescript-material-components/commit/3ee9e6218234c0950fc13630c2f5e17388902201))
131+
* **textview:** add missing text dependency ([366ef1e](https://github.com/Akylas/nativescript-material-components/commit/366ef1ef1fcdb37cba7c3360c522d0c21a71abeb))
132+
133+
134+
135+
136+
137+
## [5.1.12](https://github.com/Akylas/nativescript-material-components/compare/v5.1.11...v5.1.12) (2020-12-04)
138+
139+
140+
### Bug Fixes
141+
142+
* **dialogs:** ios buttonFont should be working again ([fd8b367](https://github.com/Akylas/nativescript-material-components/commit/fd8b367aa2f2d16425edef7f45078be4fdd6c481))
143+
144+
145+
146+
147+
148+
## [5.1.11](https://github.com/Akylas/nativescript-material-components/compare/v5.1.10...v5.1.11) (2020-12-04)
149+
150+
151+
### Bug Fixes
152+
153+
* **speeddial:** remove default borderRadius. Should be handled by shape or css ([72765f9](https://github.com/Akylas/nativescript-material-components/commit/72765f9c65906faa42b68f4c7a9953a84865090b))
154+
* **textfield:** ios none variant disable floating ([7fdebc1](https://github.com/Akylas/nativescript-material-components/commit/7fdebc1891a46778ba4dd1247a0d3e36ab19c5ba))
155+
156+
157+
### Features
158+
159+
* android shape suport ([065eadb](https://github.com/Akylas/nativescript-material-components/commit/065eadbba047a04151832830d032ea326a410a13))
160+
* ios basic shape support ([3638cce](https://github.com/Akylas/nativescript-material-components/commit/3638ccee1cb77b35c4fc450d557064da55b99dca))
161+
162+
163+
164+
165+
166+
## [5.1.10](https://github.com/Akylas/nativescript-material-components/compare/v5.1.9...v5.1.10) (2020-12-03)
167+
168+
169+
### Bug Fixes
170+
171+
* **button:** faster android button ([653775f](https://github.com/Akylas/nativescript-material-components/commit/653775f48601c6cf43a451f9fc57fe817aa54e25))
172+
* **slider:** faster android slider ([36f5803](https://github.com/Akylas/nativescript-material-components/commit/36f58030dacfd548fb6072dc0d1a76352b96c639))
173+
* android function not public ([b6f689c](https://github.com/Akylas/nativescript-material-components/commit/b6f689ca4a0786263b40610a10c86710674603e6))
174+
175+
176+
### Features
177+
178+
* **bottomsheet:** android disableDimBackground ([a5e791e](https://github.com/Akylas/nativescript-material-components/commit/a5e791e7c4a7461e21d5a2e5aa0291c72d7427fd))
179+
180+
181+
182+
183+
184+
## [5.1.9](https://github.com/Akylas/nativescript-material-components/compare/v5.1.8...v5.1.9) (2020-12-01)
185+
186+
187+
### Bug Fixes
188+
189+
* **speeddial:** closer to sepcs ([c0353e1](https://github.com/Akylas/nativescript-material-components/commit/c0353e16d96dfc3bf31313809e93d274c19df7e9))
190+
* android plugins should all be much faster ([1d36644](https://github.com/Akylas/nativescript-material-components/commit/1d3664401104a6482ca5bf5fa4d91aaf7cb55f8c))
191+
192+
193+
### Features
194+
195+
* global clearFocus and requestFocus ([1222d90](https://github.com/Akylas/nativescript-material-components/commit/1222d90ce7205c8d50b0dc1ee7376b70eb49d0f3))
196+
197+
198+
199+
200+
201+
## [5.1.8](https://github.com/Akylas/nativescript-material-components/compare/v5.1.7...v5.1.8) (2020-11-27)
202+
203+
204+
### Bug Fixes
205+
206+
* **dialogs:** action was not closing itself ([4e29840](https://github.com/Akylas/nativescript-material-components/commit/4e298408ec293dd770dc5cd370698e7b116d3fdc))
207+
208+
209+
210+
211+
212+
## [5.1.7](https://github.com/Akylas/nativescript-material-components/compare/v5.1.6...v5.1.7) (2020-11-26)
213+
214+
215+
### Bug Fixes
216+
217+
* **textfield:** some padding fixes to be the same on ios/android ([9629e28](https://github.com/Akylas/nativescript-material-components/commit/9629e28554e6e156fe55be9fecbfe2bed0997e0a))
218+
* **textview:** same padding fixes as textfield ([c287c69](https://github.com/Akylas/nativescript-material-components/commit/c287c6913a475e9cc53c670d4b61b0ea1b464245))
219+
220+
221+
222+
223+
224+
## [5.1.6](https://github.com/Akylas/nativescript-material-components/compare/v5.1.5...v5.1.6) (2020-11-23)
225+
226+
**Note:** Version bump only for package @nativescript-community/ui-material-components
227+
228+
229+
230+
231+
232+
## [5.1.5](https://github.com/Akylas/nativescript-material-components/compare/v5.1.4...v5.1.5) (2020-11-22)
233+
234+
235+
### Bug Fixes
236+
237+
* **speeddial:** svelte fix ([215f660](https://github.com/Akylas/nativescript-material-components/commit/215f660326d300c0094820b97ba7c8b6e0921f2b))
238+
239+
240+
241+
242+
6243
## [5.1.4](https://github.com/Akylas/nativescript-material-components/compare/v5.1.3...v5.1.4) (2020-11-13)
7244

8245

README.md

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,62 @@
11
# Nativescript Material Components
22

3-
[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)
3+
[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
44

55
Build beautiful, usable products using Material Components for NativeScript.
66

77
## Components
88

9-
- [Button](./packages/button/README.md)
10-
- [Floating Action Button](./packages/floatingactionbutton/README.md)
11-
- [TextField](./packages/textfield/README.md)
12-
- [TextView](./packages/textview/README.md)
13-
- [CardView](./packages/cardview/README.md)
14-
- [Slider](./packages/slider/README.md)
15-
- [Progress](./packages/progress/README.md)
16-
- [ActivityIndicator](./packages/activityindicator/README.md)
17-
- [Dialogs](./packages/dialogs/README.md)
18-
- [Bottom Sheets](./packages/bottomsheet/README.md)
19-
- [Ripple View](./packages/ripple/README.md)
20-
- [Snackbar](./packages/snackbar/README.md)
21-
- [Bottom Navigation Bar](./packages/bottomnavigationbar/README.md)
9+
| Name | README | npm | Material design |
10+
| :---: | :---: | :---: | :---: |
11+
| Circular progress indicator | [README.md](./packages/activityindicator/README.md) | [@nativescript-community/ui-material-activityindicator](https://www.npmjs.com/package/@nativescript-community/ui-material-activityindicator) | [Circular progress indicators](https://material.io/components/progress-indicators#circular-progress-indicators) |
12+
| Bottom navigation | [README.md](./packages/bottom-navigation/README.md) | [@nativescript-community/ui-material-bottom-navigation](https://www.npmjs.com/package/@nativescript-community/ui-material-bottom-navigation) | [Bottom navigation](https://material.io/components/bottom-navigation) |
13+
| Bottom navigation bar | [README.md](./packages/bottomnavigationbar/README.md) | [@nativescript-community/ui-material-bottomnavigationbar](https://www.npmjs.com/package/@nativescript-community/ui-material-bottomnavigationbar) | [Bottom navigation](https://material.io/components/bottom-navigation) |
14+
| Bottom sheet | [README.md](./packages/bottomsheet/README.md) | [@nativescript-community/ui-material-bottomsheet](https://www.npmjs.com/package/@nativescript-community/ui-material-bottomsheet) | [Sheets: bottom](https://material.io/components/sheets-bottom) |
15+
| Button | [README.md](./packages/button/README.md) | [@nativescript-community/ui-material-button](https://www.npmjs.com/package/@nativescript-community/ui-material-button) | [Buttons](https://material.io/components/buttons) |
16+
| Card | [README.md](./packages/cardview/README.md) | [@nativescript-community/ui-material-cardview](https://www.npmjs.com/package/@nativescript-community/ui-material-cardview) | [Cards](https://material.io/components/cards) |
17+
| Dialogs | [README.md](./packages/dialogs/README.md) | [@nativescript-community/ui-material-dialogs](https://www.npmjs.com/package/@nativescript-community/ui-material-dialogs) | [Dialogs](https://material.io/components/dialogs) |
18+
| Floating action button | [README.md](./packages/floatingactionbutton/README.md) | [@nativescript-community/ui-material-floatingactionbutton](https://www.npmjs.com/package/@nativescript-community/ui-material-floatingactionbutton) | [Buttons: floating action button](https://material.io/components/buttons-floating-action-button) |
19+
| Linear progress indicator | [README.md](./packages/progress/README.md) | [@nativescript-community/ui-material-progress](https://www.npmjs.com/package/@nativescript-community/ui-material-progress) | [Linear progress indicators](https://material.io/components/progress-indicators#linear-progress-indicators) |
20+
| Ripple | [README.md](./packages/ripple/README.md) | [@nativescript-community/ui-material-ripple](https://www.npmjs.com/package/@nativescript-community/ui-material-ripple) | [Ripple](https://material.io/design/interaction/states.html#pressed) |
21+
| Slider | [README.md](./packages/slider/README.md) | [@nativescript-community/ui-material-slider](https://www.npmjs.com/package/@nativescript-community/ui-material-slider) | [Sliders](https://material.io/components/sliders) |
22+
| Snackbar | [README.md](./packages/snackbar/README.md) | [@nativescript-community/ui-material-snackbar](https://www.npmjs.com/package/@nativescript-community/ui-material-snackbar) | [Snackbars](https://material.io/components/snackbars) |
23+
| Speed dial | [README.md](./packages/speeddial/README.md) | [@nativescript-community/ui-material-speeddial](https://www.npmjs.com/package/@nativescript-community/ui-material-speeddial) | [Speed dial](https://material.io/components/buttons-floating-action-button#types-of-transitions) |
24+
| Tabs | [README.md](./packages/tabs/README.md) | [@nativescript-community/ui-material-tabs](https://www.npmjs.com/package/@nativescript-community/ui-material-tabs) | [Tabs](https://material.io/components/tabs) |
25+
| Text field | [README.md](./packages/textfield/README.md) | [@nativescript-community/ui-material-textfield](https://www.npmjs.com/package/@nativescript-community/ui-material-textfield) | [Text fields](https://material.io/components/text-fields) |
26+
| Text view | [README.md](./packages/textview/README.md) | [@nativescript-community/ui-material-textview](https://www.npmjs.com/package/@nativescript-community/ui-material-textview) | [Material Text View](https://material.io/develop/android/components/material-text-view) |
27+
28+
## FAQ
29+
30+
**Question:** How to use the latest version of this plugin for iOS?
31+
32+
**Answer:** To get latest versions of Material Components for iOS (> 112.1) you will need to change Pod min version to 10.0
33+
To do that modify or create `App_Resources/iOS/Podfile` to add `platform :ios, '10.0'`.
34+
You can see an example in the demo-vue app.
2235

36+
##
2337

24-
## iOS latest versions
38+
**Q:** How to migrate to AndroidX with this plugin installed (Android only)?
2539

26-
To get latest versions of Material Components for iOS (> 112.1) you will need to change Pod min version to 10.0
27-
To do that modify or create `App_Resources/iOS/Podfile` to add `platform :ios, '10.0'`.
40+
**A:** For Material Components to work correctly with {N} 6 and AndroidX you need to update your android app theme.
41+
Inside ```App_resources/android/res/values/styles.xml``` replace all occurences of ```Theme.AppCompat``` with ```Theme.MaterialComponents```
2842
You can see an example in the demo-vue app.
2943

30-
## Android migration to AndroidX
44+
##
3145

32-
For Material Components to work correctly with {N} 6 and AndroidX you need to update your android app theme.
33-
inside ```App_resources/android/res/values/styles.xml``` replace all occurences of ```Theme.AppCompat``` with ```Theme.MaterialComponents```
34-
You can see an example in the demo-vue app.
46+
**Q:** What is the difference between Bottom Navigation and Bottom Navigation Bar component?
3547

36-
## Contribution
48+
**A:** The _Bottom Navigation Bar_ is a new component to draw a bottom navigation bar in material design.
49+
The _Bottom Navigation_ component is a simple extract of the [eponymous component from NativeScript](https://docs.nativescript.org/ui/components/bottom-navigation), which probably will be removed in the future so this one can be used for easy transition.
3750

51+
##
52+
53+
**Q:** How can I contribute?
54+
55+
**A:**
3856
```bash
3957
npm i
40-
npm run setup // this should happen for every typescript update
58+
npm run setup # this should happen for every typescript update
4159
npm run tsc
4260
npm run demo.ios
4361
npm run demo.android
4462
```
45-
46-

0 commit comments

Comments
 (0)