Merge branch 'develop'

AgustinBonilla · AgustinBonilla · commit 4e63c5de4b80 · 2021-09-21T12:22:22.000-03:00
diff --git a/MaterialDesignControls.nuspec b/MaterialDesignControls.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata minClientVersion="2.8.1">
        <id>Plugin.MaterialDesignControls</id>
-       <version>1.10.7</version>
+       <version>1.10.8</version>
        <title>MaterialDesignControls Plugin for Xamarin Forms</title>
        <authors>Horus</authors>
        <owners>AgustinBonillaHorus</owners>
diff --git a/example/ExampleMaterialDesignControls.Android/Properties/AndroidManifest.xml b/example/ExampleMaterialDesignControls.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.materialdesigncontrols.example.MaterialDesignControls">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:label="ExampleMaterialDesignControls.Android"></application>
 </manifest>
diff --git a/example/ExampleMaterialDesignControls/Pages/MaterialEditorPage.xaml b/example/ExampleMaterialDesignControls/Pages/MaterialEditorPage.xaml
@@ -49,6 +49,7 @@
                     Placeholder="Enter your description"
                     LeadingIcon="email.png"
                     TabIndex="4"
+                    Text="Testing description"
                     IsEnabled="False" />
 
                 <material:MaterialEditor
diff --git a/example/ExampleMaterialDesignControls/Pages/MaterialEntryPage.xaml b/example/ExampleMaterialDesignControls/Pages/MaterialEntryPage.xaml
@@ -26,7 +26,16 @@
                                         ReturnType="Done" ReturnCommand="{Binding TapCommand}" />
                 <material:MaterialEntry Type="Filled" LabelText="Phone" Placeholder="Enter your phone" Keyboard="Telephone" TabIndex="5" ReturnType="Next"
                                         FocusedBorderColor="LightGreen" FocusedTextColor="Green" FocusedLabelTextColor="Green" HorizontalTextAlignment="Center" />
-                <material:MaterialEntry Type="Filled" LabelText="Phone" Placeholder="Enter your phone" Keyboard="Telephone" TabIndex="5" ReturnType="Next" IsEnabled="False" />
+
+                <material:MaterialEntry
+                    Type="Filled"
+                    LabelText="Phone"
+                    Placeholder="Enter your phone"
+                    Keyboard="Telephone"
+                    TabIndex="5"
+                    ReturnType="Next"
+                    Text="+598099123456"
+                    IsEnabled="False" />
 
                 <material:MaterialEntry Type="Filled" LabelText="Phone (SVG trailing icon)" Placeholder="Enter your phone" Keyboard="Telephone" TabIndex="5"
                                         TrailingIconCommand="{Binding HelpCommand}" TrailingIconCommandParameter="Enter your phone"
diff --git a/example/ExampleMaterialDesignControls/Pages/MaterialEntryPage.xaml.cs b/example/ExampleMaterialDesignControls/Pages/MaterialEntryPage.xaml.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Net.Mail;
-using System.Windows.Input;
-using ExampleMaterialDesignControls.ViewModels;
+﻿using ExampleMaterialDesignControls.ViewModels;
 using Xamarin.Forms;
 
 namespace ExampleMaterialDesignControls.Pages
@@ -29,4 +25,4 @@ private void TxtName_Focused(object sender, FocusEventArgs e)
             txtName.LabelText = "Name* - Focused";
         }
     }
-}
+}
diff --git a/src/MaterialDesignControls.Android/MaterialDesignControls.Android.csproj b/src/MaterialDesignControls.Android/MaterialDesignControls.Android.csproj
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Plugin.MaterialDesignControls.Android</RootNamespace>
     <AssemblyName>Plugin.MaterialDesignControls.Android</AssemblyName>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
diff --git a/src/MaterialDesignControls.Android/Renderers/MaterialEditorRenderer.cs b/src/MaterialDesignControls.Android/Renderers/MaterialEditorRenderer.cs
@@ -4,6 +4,7 @@
 using Plugin.MaterialDesignControls.Implementations;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
+using Android.Views.InputMethods;
 
 [assembly: ExportRenderer(typeof(CustomEditor), typeof(Plugin.MaterialDesignControls.Android.MaterialEditorRenderer))]
 
@@ -19,18 +20,20 @@ public MaterialEditorRenderer(Context context) : base(context)
         protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)
         {
             base.OnElementChanged(e);
-            if (this.Control != null)
+
+            if (Control != null)
             {
-                this.Control.Background = new ColorDrawable(AndroidGraphics.Color.Transparent);
-                this.Control.SetPadding(4, 0, 0, 0);
+                Control.Background = new ColorDrawable(AndroidGraphics.Color.Transparent);
+                Control.SetPadding(4, 0, 0, 0);
+                Control.ImeOptions = (ImeAction)ImeFlags.NoExtractUi;
             }
 
             if (e.NewElement != null)
             {
                 var element = e.NewElement as CustomEditor;
-                this.Control.Hint = element.Placeholder;
-                this.Control.SetHintTextColor(element.PlaceholderColor.ToAndroid());
+                Control.Hint = element.Placeholder;
+                Control.SetHintTextColor(element.PlaceholderColor.ToAndroid());
             }
         }
     }
-}
+}
diff --git a/src/MaterialDesignControls.Android/Renderers/MaterialEntryRenderer.cs b/src/MaterialDesignControls.Android/Renderers/MaterialEntryRenderer.cs
@@ -1,10 +1,10 @@
-﻿using System;
-using Android.Content;
+﻿using Android.Content;
 using Android.Graphics.Drawables;
 using AndroidGraphics = Android.Graphics;
 using Plugin.MaterialDesignControls.Implementations;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
+using Android.Views.InputMethods;
 
 [assembly: ExportRenderer(typeof(CustomEntry), typeof(Plugin.MaterialDesignControls.Android.MaterialEntryRenderer))]
 
@@ -20,11 +20,13 @@ public MaterialEntryRenderer(Context context) : base(context)
         protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
         {
             base.OnElementChanged(e);
-            if (this.Control != null)
+
+            if (Control != null)
             {
-                this.Control.Background = new ColorDrawable(AndroidGraphics.Color.Transparent);
-                this.Control.SetPadding(4, 0, 0, 0);
+                Control.Background = new ColorDrawable(AndroidGraphics.Color.Transparent);
+                Control.SetPadding(4, 0, 0, 0);
+                Control.ImeOptions = (ImeAction)ImeFlags.NoExtractUi;
             }
         }
     }
-}
+}
diff --git a/src/MaterialDesignControls/Controls/MaterialEditor.xaml.cs b/src/MaterialDesignControls/Controls/MaterialEditor.xaml.cs
@@ -1,9 +1,5 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
-using Plugin.MaterialDesignControls.Animations;
-using Plugin.MaterialDesignControls.Implementations;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
@@ -274,7 +270,13 @@ private void SetClearIconIsVisible()
 
         protected override void SetIsEnabled()
         {
-            txtEditor.IsEnabled = IsEnabled;
+            if (Device.RuntimePlatform == Device.iOS)
+                txtEditor.IsEnabled = IsEnabled;
+            else
+            {
+                // Workaround to a disabled text color issue in Android
+                txtEditor.IsReadOnly = !IsEnabled;
+            }
         }
 
         protected override void SetPadding()
@@ -354,4 +356,4 @@ private void TxtEntry_TextChanged(object sender, TextChangedEventArgs e)
 
         #endregion Methods
     }
-}
+}
diff --git a/src/MaterialDesignControls/Controls/MaterialEntry.xaml.cs b/src/MaterialDesignControls/Controls/MaterialEntry.xaml.cs
@@ -447,7 +447,13 @@ private void SetClearIconIsVisible()
 
         protected override void SetIsEnabled()
         {
-            txtEntry.IsEnabled = IsEnabled;
+            if (Device.RuntimePlatform == Device.iOS)
+                txtEntry.IsEnabled = IsEnabled;
+            else
+            {
+                // Workaround to a disabled text color issue in Android
+                txtEntry.IsReadOnly = !IsEnabled;
+            }
         }
 
         protected override void SetPadding()
@@ -549,13 +555,13 @@ private void FocusNextElement(int currentTabIndex)
                     var nextElement = this.FindNextElement(true, tabIndexes, ref currentTabIndex);
                     if (nextElement != null)
                     {
-                        if (nextElement is CustomEntry nextEntry && nextEntry.IsEnabled)
+                        if (nextElement is CustomEntry nextEntry && nextEntry.IsEnabled && !nextEntry.IsReadOnly)
                         {
                             nextEntry.Focus();
                             string textInsideInput = nextEntry.Text;
                             nextEntry.CursorPosition = string.IsNullOrEmpty(textInsideInput) ? 0 : textInsideInput.Length;
                         }
-                        else if (nextElement is CustomEditor nextEditor && nextEditor.IsEnabled)
+                        else if (nextElement is CustomEditor nextEditor && nextEditor.IsEnabled && !nextEditor.IsReadOnly)
                         {
                             nextEditor.Focus();
                         }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Net.Mail;`
`4`		`-using System.Windows.Input;`
`5`		`-using ExampleMaterialDesignControls.ViewModels;`
	`1`	`+using ExampleMaterialDesignControls.ViewModels;`
`6`	`2`	`using Xamarin.Forms;`
`7`	`3`
`8`	`4`	`namespace ExampleMaterialDesignControls.Pages`
`@@ -29,4 +25,4 @@ private void TxtName_Focused(object sender, FocusEventArgs e)`
`29`	`25`	`txtName.LabelText = "Name* - Focused";`
`30`	`26`	`}`
`31`	`27`	`}`
`32`		`-}`
	`28`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using Plugin.MaterialDesignControls.Implementations;`
`5`	`5`	`using Xamarin.Forms;`
`6`	`6`	`using Xamarin.Forms.Platform.Android;`
	`7`	`+using Android.Views.InputMethods;`
`7`	`8`
`8`	`9`	`[assembly: ExportRenderer(typeof(CustomEditor), typeof(Plugin.MaterialDesignControls.Android.MaterialEditorRenderer))]`
`9`	`10`
`@@ -19,18 +20,20 @@ public MaterialEditorRenderer(Context context) : base(context)`
`19`	`20`	`protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)`
`20`	`21`	`{`
`21`	`22`	`base.OnElementChanged(e);`
`22`		`- if (this.Control != null)`
	`23`	`+`
	`24`	`+ if (Control != null)`
`23`	`25`	`{`
`24`		`- this.Control.Background = new ColorDrawable(AndroidGraphics.Color.Transparent);`
`25`		`- this.Control.SetPadding(4, 0, 0, 0);`
	`26`	`+ Control.Background = new ColorDrawable(AndroidGraphics.Color.Transparent);`
	`27`	`+ Control.SetPadding(4, 0, 0, 0);`
	`28`	`+ Control.ImeOptions = (ImeAction)ImeFlags.NoExtractUi;`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`if (e.NewElement != null)`
`29`	`32`	`{`
`30`	`33`	`var element = e.NewElement as CustomEditor;`
`31`		`- this.Control.Hint = element.Placeholder;`
`32`		`- this.Control.SetHintTextColor(element.PlaceholderColor.ToAndroid());`
	`34`	`+ Control.Hint = element.Placeholder;`
	`35`	`+ Control.SetHintTextColor(element.PlaceholderColor.ToAndroid());`
`33`	`36`	`}`
`34`	`37`	`}`
`35`	`38`	`}`
`36`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-using System;`
`2`		`-using Android.Content;`
	`1`	`+using Android.Content;`
`3`	`2`	`using Android.Graphics.Drawables;`
`4`	`3`	`using AndroidGraphics = Android.Graphics;`
`5`	`4`	`using Plugin.MaterialDesignControls.Implementations;`
`6`	`5`	`using Xamarin.Forms;`
`7`	`6`	`using Xamarin.Forms.Platform.Android;`
	`7`	`+using Android.Views.InputMethods;`
`8`	`8`
`9`	`9`	`[assembly: ExportRenderer(typeof(CustomEntry), typeof(Plugin.MaterialDesignControls.Android.MaterialEntryRenderer))]`
`10`	`10`
`@@ -20,11 +20,13 @@ public MaterialEntryRenderer(Context context) : base(context)`
`20`	`20`	`protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)`
`21`	`21`	`{`
`22`	`22`	`base.OnElementChanged(e);`
`23`		`- if (this.Control != null)`
	`23`	`+`
	`24`	`+ if (Control != null)`
`24`	`25`	`{`
`25`		`- this.Control.Background = new ColorDrawable(AndroidGraphics.Color.Transparent);`
`26`		`- this.Control.SetPadding(4, 0, 0, 0);`
	`26`	`+ Control.Background = new ColorDrawable(AndroidGraphics.Color.Transparent);`
	`27`	`+ Control.SetPadding(4, 0, 0, 0);`
	`28`	`+ Control.ImeOptions = (ImeAction)ImeFlags.NoExtractUi;`
`27`	`29`	`}`
`28`	`30`	`}`
`29`	`31`	`}`
`30`		`-}`
	`32`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,13 @@ private void SetClearIconIsVisible()`
`447`	`447`
`448`	`448`	`protected override void SetIsEnabled()`
`449`	`449`	`{`
`450`		`- txtEntry.IsEnabled = IsEnabled;`
	`450`	`+ if (Device.RuntimePlatform == Device.iOS)`
	`451`	`+ txtEntry.IsEnabled = IsEnabled;`
	`452`	`+ else`
	`453`	`+ {`
	`454`	`+ // Workaround to a disabled text color issue in Android`
	`455`	`+ txtEntry.IsReadOnly = !IsEnabled;`
	`456`	`+ }`
`451`	`457`	`}`
`452`	`458`
`453`	`459`	`protected override void SetPadding()`
`@@ -549,13 +555,13 @@ private void FocusNextElement(int currentTabIndex)`
`549`	`555`	`var nextElement = this.FindNextElement(true, tabIndexes, ref currentTabIndex);`
`550`	`556`	`if (nextElement != null)`
`551`	`557`	`{`
`552`		`- if (nextElement is CustomEntry nextEntry && nextEntry.IsEnabled)`
	`558`	`+ if (nextElement is CustomEntry nextEntry && nextEntry.IsEnabled && !nextEntry.IsReadOnly)`
`553`	`559`	`{`
`554`	`560`	`nextEntry.Focus();`
`555`	`561`	`string textInsideInput = nextEntry.Text;`
`556`	`562`	`nextEntry.CursorPosition = string.IsNullOrEmpty(textInsideInput) ? 0 : textInsideInput.Length;`
`557`	`563`	`}`
`558`		`- else if (nextElement is CustomEditor nextEditor && nextEditor.IsEnabled)`
	`564`	`+ else if (nextElement is CustomEditor nextEditor && nextEditor.IsEnabled && !nextEditor.IsReadOnly)`
`559`	`565`	`{`
`560`	`566`	`nextEditor.Focus();`
`561`	`567`	`}`