Merge branch 'develop'

Author: AgustinBonilla

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.3.0</version>
+       <version>1.3.1</version>
        <title>MaterialDesignControls Plugin for Xamarin Forms</title>
        <authors>Horus</authors>
        <owners>AgustinBonillaHorus</owners>

example/ExampleMaterialDesignControls/App.xaml

@@ -55,6 +55,7 @@
             <Setter Property="BorderColor" Value="#4c6277" />
             <Setter Property="DisabledBorderColor" Value="#c6c6c5" />
             <Setter Property="BusyColor" Value="#4c6277" />
+            <Setter Property="ToUpper" Value="False" />
         </Style>
 
         <!-- MaterialOutlineButton -->

example/ExampleMaterialDesignControls/Pages/MaterialButtonPage.xaml

@@ -7,7 +7,7 @@
     <ContentPage.Content>
         <ScrollView>
             <StackLayout Padding="16" Spacing="16">
-                <material:MaterialButton x:Name="btnSave" Text="Save" Icon="save.png" Command="{Binding TapCommand}" CommandParameter="Saved" />
+                <material:MaterialButton x:Name="btnSave" Text="Save" ToUpper="True" Icon="save.png" Command="{Binding TapCommand}" CommandParameter="Saved" />
                 <material:MaterialOutlineButton Text="Cancel" Command="{Binding TapCommand}" CommandParameter="Canceled" />
                 <material:MaterialFlatButton Text="Delete" Icon="delete.png" Command="{Binding TapCommand}" CommandParameter="Deleted" />
 

src/MaterialDesignControls.Android/MaterialDesignControls.Android.csproj

@@ -130,6 +130,7 @@
     <Compile Include="Renderers\MaterialTimePickerRenderer.cs" />
     <Compile Include="Renderers\MaterialEditorRenderer.cs" />
     <Compile Include="Renderers\MaterialLabelRenderer.cs" />
+    <Compile Include="Renderers\MaterialButtonRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />

src/MaterialDesignControls.Android/Renderers.cs

@@ -10,6 +10,7 @@ public static void Init()
             MaterialTimePickerRenderer.Init();
             MaterialEditorRenderer.Init();
             MaterialLabelRenderer.Init();
+            MaterialButtonRenderer.Init();
         }
     }
 }

src/MaterialDesignControls.Android/Renderers/MaterialButtonRenderer.cs

@@ -0,0 +1,27 @@
+using Android.Content;
+using Plugin.MaterialDesignControls.Android;
+using Plugin.MaterialDesignControls.Implementations;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(CustomButton), typeof(MaterialButtonRenderer))]
+
+namespace Plugin.MaterialDesignControls.Android
+{
+    public class MaterialButtonRenderer : ButtonRenderer
+    {
+        public static void Init() { }
+
+        public MaterialButtonRenderer(Context context) : base(context)
+        { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
+        {
+            base.OnElementChanged(e);
+            if (this.Control != null)
+            {
+                this.Control.SetAllCaps(false);
+            }
+        }
+    }
+}

src/MaterialDesignControls.Android/Renderers/MaterialEditorRenderer.cs

@@ -1,11 +1,9 @@
-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 System.ComponentModel;
 
 [assembly: ExportRenderer(typeof(CustomEditor), typeof(Plugin.MaterialDesignControls.Android.MaterialEditorRenderer))]
 

src/MaterialDesignControls/Controls/MaterialButton.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
+using Plugin.MaterialDesignControls.Implementations;
 using Xamarin.Forms;
 
 namespace Plugin.MaterialDesignControls
@@ -23,7 +24,7 @@ public MaterialButton()
 
         private bool initialized = false;
 
-        protected Button button;
+        protected CustomButton button;
 
         private Grid grid;
 
@@ -177,6 +178,15 @@ public string DisabledIcon
             set { SetValue(DisabledIconProperty, value); }
         }
 
+        public static readonly BindableProperty ToUpperProperty =
+            BindableProperty.Create(nameof(ToUpper), typeof(bool), typeof(MaterialButton), defaultValue: false);
+
+        public bool ToUpper
+        {
+            get { return (bool)GetValue(ToUpperProperty); }
+            set { SetValue(ToUpperProperty, value); }
+        }
+
         #endregion Properties
 
         #region Methods
@@ -203,7 +213,7 @@ private void Initialize()
             };
             this.grid.Children.Add(this.actIndicator, 0, 0);
 
-            this.button = new Button
+            this.button = new CustomButton
             {
                 CornerRadius = 4,
                 Padding = new Thickness(12, 0)
@@ -221,7 +231,8 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
             switch (propertyName)
             {
                 case nameof(this.Text):
-                    this.button.Text = this.Text;
+                case nameof(this.ToUpper):
+                    this.button.Text = this.ToUpper ? this.Text?.ToUpper() : this.Text;
                     break;
                 case nameof(this.TextColor):
                 case nameof(this.DisabledTextColor):

src/MaterialDesignControls/Implementations/CustomButton.cs

@@ -0,0 +1,18 @@
+using System.Runtime.CompilerServices;
+using Xamarin.Forms;
+
+namespace Plugin.MaterialDesignControls.Implementations
+{
+    public class CustomButton : Button
+    {
+        protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            base.OnPropertyChanged(propertyName);
+
+            if (propertyName.Equals(IsEnabledProperty.PropertyName) && !this.IsEnabled)
+            {
+                this.IsEnabled = true;
+            }
+        }
+    }
+}

src/MaterialDesignControls/MaterialDesignControls.csproj

@@ -96,6 +96,7 @@
     <Compile Include="Controls\MaterialButton.cs" />
     <Compile Include="Implementations\CustomImageButton.cs" />
     <Compile Include="Animations\ShakeAnimation.cs" />
+    <Compile Include="Implementations\CustomButton.cs" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">