Merge branch 'master' of github.com:nativescript-community/ui-material-components

farfromrefug · farfromrefug · commit fe27d1e33111 · 2024-01-16T14:59:33.000+01:00
diff --git a/demo-ng b/demo-ng
@@ -1 +1 @@
-Subproject commit 0fc237ea2760302a15fbbe0c9195c6925deff5ca
+Subproject commit d601143b85e9a34438e76bdf56d4b5d7a54cc291
diff --git a/demo-react b/demo-react
@@ -1 +1 @@
-Subproject commit 9f7d15025a3785938c5eb3a59c9f43263b2a74e2
+Subproject commit 03a29b1767312b1816063bb11cb5afaa27dfdb3b
diff --git a/demo-snippets/vue/TextFields.vue b/demo-snippets/vue/TextFields.vue
@@ -99,6 +99,7 @@
                     maxLength="10"
                     hint="fill this out..."
                     @focus="onFocus"
+                    placeholderColor="blue"
                     @blur="onBlur"
                     floating="false"
                     @textChange="onTextChange"
diff --git a/demo-svelte b/demo-svelte
@@ -1 +1 @@
-Subproject commit 564cffb2507a4d45f0a6239ffb1b858951c8fdbb
+Subproject commit bdac00814f7e97dfd7f5b0eb3ff528899145bbb8
diff --git a/demo-vue b/demo-vue
@@ -1 +1 @@
-Subproject commit d39854b2affb19ae6d5680b0810a7b301b289e57
+Subproject commit 9fef6c12ff6215d6a10890fa36bcbbebdd95da24
diff --git a/demo-vue3 b/demo-vue3
@@ -1 +1 @@
-Subproject commit 174001aa8956f6141a19c527cd9ffc228ac1fe1f
+Subproject commit 0d1b7b74c7e03b681eee9dd4ceca6d61182c5550
diff --git a/packages/bottomsheet/platforms/android/include.gradle b/packages/bottomsheet/platforms/android/include.gradle
@@ -1,6 +1,6 @@
 
 dependencies {
-	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.2.1"
+	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.10.0"
 	
 	implementation "com.google.android.material:material:$androidXMaterial"
 }
diff --git a/packages/button/platforms/android/include.gradle b/packages/button/platforms/android/include.gradle
@@ -1,5 +1,5 @@
 dependencies {
-	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.2.1"
+	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.10.0"
 
 	implementation "com.google.android.material:material:$androidXMaterial"
 }
diff --git a/packages/core/platforms/android/include.gradle b/packages/core/platforms/android/include.gradle
@@ -1,6 +1,6 @@
 
 dependencies {
-	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.8.0"
+	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.10.0"
 	implementation "com.google.android.material:material:$androidXMaterial"
 
 	def androidxViewPager2Version =  project.hasProperty("androidxViewPager2Version") ? project.androidxViewPager2Version : "1.0.0"
diff --git a/packages/snackbar/platforms/android/include.gradle b/packages/snackbar/platforms/android/include.gradle
@@ -1,6 +1,6 @@
 
 dependencies {
-	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.2.1"
+	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.10.0"
 	
 	implementation "com.google.android.material:material:$androidXMaterial"
 }
diff --git a/packages/textfield/platforms/android/include.gradle b/packages/textfield/platforms/android/include.gradle
@@ -1,5 +1,5 @@
 
 dependencies {
-	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.2.1"
+	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.10.0"
 	implementation "com.google.android.material:material:$androidXMaterial"
 }
diff --git a/packages/textview/platforms/android/include.gradle b/packages/textview/platforms/android/include.gradle
@@ -1,6 +1,6 @@
 
 dependencies {
-	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.2.1"
+	def androidXMaterial =  project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.10.0"
 
 	implementation "com.google.android.material:material:$androidXMaterial"
 }
diff --git a/src/textfield/textfield.android.ts b/src/textfield/textfield.android.ts
@@ -196,7 +196,6 @@ export class TextField extends TextFieldBase {
         const nColor = getColorStateList(color);
         this.layoutView.setErrorTextColor(nColor);
         // TODO: find why it fails in cli build
-        //@ts-ignore
         this.layoutView.setBoxStrokeErrorColor(nColor);
     }
 
@@ -223,26 +222,19 @@ export class TextField extends TextFieldBase {
         this.layoutView.setHintEnabled(!!value);
     }
     [strokeWidthProperty.setNative](value: CoreTypes.LengthType) {
-        // TODO: find why it fails in cli build
-        //@ts-ignore
         this.layoutView.setBoxStrokeWidth(Length.toDevicePixels(value, 0));
     }
 
     [strokeWidthFocusedProperty.setNative](value: CoreTypes.LengthType) {
-        // TODO: find why it fails in cli build
-        //@ts-ignore
         this.layoutView.setBoxStrokeWidthFocused(Length.toDevicePixels(value, 0));
     }
 
     [strokeColorProperty.setNative](value: Color | string) {
         const color = value ? (value instanceof Color ? value.android : new Color(value).android) : null;
-        // TODO: find why it fails in cli build
-        //@ts-ignore
         if (this.layoutView.setBoxStrokeColorStateList) {
             const inactiveColor = this.strokeInactiveColor instanceof Color ? this.strokeInactiveColor.android : undefined;
             const disabledColor = this.strokeDisabledColor instanceof Color ? this.strokeDisabledColor.android : undefined;
             const colorStateList = getFullColorStateList(color, inactiveColor, disabledColor);
-            //@ts-ignore
             this.layoutView.setBoxStrokeColorStateList(colorStateList);
         } else {
             this.layoutView.setBoxStrokeColor(color);
@@ -251,27 +243,20 @@ export class TextField extends TextFieldBase {
 
     [strokeInactiveColorProperty.setNative](value: Color | string) {
         const color = value ? (value instanceof Color ? value.android : new Color(value).android) : null;
-
-        // TODO: find why it fails in cli build
-        //@ts-ignore
         if (this.layoutView.setBoxStrokeColorStateList) {
             const activeColor = this.strokeColor instanceof Color ? this.strokeColor.android : this.layoutView.getBoxStrokeColor();
             const disabledColor = this.strokeDisabledColor instanceof Color ? this.strokeDisabledColor.android : undefined;
             const colorStateList = getFullColorStateList(activeColor, color, disabledColor);
-            //@ts-ignore
             this.layoutView.setBoxStrokeColorStateList(colorStateList);
         }
     }
 
     [strokeDisabledColorProperty.setNative](value: Color | string) {
         const color = value ? (value instanceof Color ? value.android : new Color(value).android) : null;
-        // TODO: find why it fails in cli build
-        //@ts-ignore
         if (this.layoutView.setBoxStrokeColorStateList) {
             const activeColor = this.strokeColor instanceof Color ? this.strokeColor.android : this.layoutView.getBoxStrokeColor();
             const inactiveColor = this.strokeInactiveColor instanceof Color ? this.strokeInactiveColor.android : undefined;
             const colorStateList = getFullColorStateList(activeColor, inactiveColor, color);
-            //@ts-ignore
             this.layoutView.setBoxStrokeColorStateList(colorStateList);
         }
     }
diff --git a/src/textview/textview.android.ts b/src/textview/textview.android.ts
@@ -217,42 +217,33 @@ export class TextView extends TextViewBase {
     [strokeInactiveColorProperty.setNative](value: Color) {
         const color = value instanceof Color ? value.android : value;
         const layoutView = this.layoutView;
-        // TODO: find why it fails in cli build
-        //@ts-ignore
         if (layoutView.setBoxStrokeColorStateList) {
             const activeColor = this.strokeColor instanceof Color ? this.strokeColor.android : layoutView.getBoxStrokeColor();
             const disabledColor = this.strokeDisabledColor instanceof Color ? this.strokeDisabledColor.android : undefined;
             const colorStateList = getFullColorStateList(activeColor, color, disabledColor);
-            //@ts-ignore
             layoutView.setBoxStrokeColorStateList(colorStateList);
         }
     }
 
     [strokeDisabledColorProperty.setNative](value: Color) {
         const color = value instanceof Color ? value.android : value;
         const layoutView = this.layoutView;
-        // TODO: find why it fails in cli build
-        //@ts-ignore
         if (layoutView.setBoxStrokeColorStateList) {
             const activeColor = this.strokeColor instanceof Color ? this.strokeColor.android : layoutView.getBoxStrokeColor();
             const inactiveColor = this.strokeInactiveColor instanceof Color ? this.strokeInactiveColor.android : undefined;
             const colorStateList = getFullColorStateList(activeColor, inactiveColor, color);
-            //@ts-ignore
             layoutView.setBoxStrokeColorStateList(colorStateList);
         }
     }
 
     [strokeColorProperty.setNative](value: Color) {
         const color = value instanceof Color ? value.android : value;
         const layoutView = this.layoutView;
-        // TODO: find why it fails in cli build
-        //@ts-ignore
         if (layoutView.setBoxStrokeColorStateList) {
             const inactiveColor = this.strokeInactiveColor instanceof Color ? this.strokeInactiveColor.android : undefined;
             const disabledColor = this.strokeDisabledColor instanceof Color ? this.strokeDisabledColor.android : undefined;
             const colorStateList = getFullColorStateList(color, inactiveColor, disabledColor);
             if (colorStateList) {
-                //@ts-ignore
                 layoutView.setBoxStrokeColorStateList(colorStateList);
             }
         } else {
diff --git a/tools b/tools
@@ -1 +1 @@
-Subproject commit 6c7dcd1494279c06cead1cb8159b1740618978fa
+Subproject commit 3878eb0bfe80b348b295e74650bff9417e4203b2

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`dependencies {`
`3`		`- def androidXMaterial = project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.2.1"`
	`3`	`+ def androidXMaterial = project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.10.0"`
`4`	`4`
`5`	`5`	`implementation "com.google.android.material:material:$androidXMaterial"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dependencies {`
`2`		`- def androidXMaterial = project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.2.1"`
	`2`	`+ def androidXMaterial = project.hasProperty("androidXMaterial") ? project.androidXMaterial : "1.10.0"`
`3`	`3`
`4`	`4`	`implementation "com.google.android.material:material:$androidXMaterial"`
`5`	`5`	`}`