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

README.md

@@ -172,6 +172,9 @@ public class MyControl : ContentView, ITouchAndPressEffectConsumer
 
 ## Demo
 https://github.com/HorusSoftwareUY/MaterialDesignControlsPlugin/tree/master/example
+ 
+## Developed by
+<a href="http://horus.com.uy" ><img src="https://horus.com.uy/img/logo_horus.png" width="128"></a>
 
 ## Contributions
 Contributions are welcome! If you find a bug want a feature added please report it.

example/ExampleMaterialDesignControls/Pages/MaterialPickerPage.xaml

@@ -10,6 +10,7 @@
                 <material:MaterialPicker x:Name="pckColors" Type="Filled" LabelText="Color" AnimateError="True" />
                 <material:MaterialPicker x:Name="pckSizes" SelectedItem="{Binding SelectedSizes}" Type="Outlined" LabelText="Size" />
                 <material:MaterialPicker x:Name="pckModels" Type="Lined" LabelText="Model" LeadingIcon="color.png" />
+                <Label x:Name="lblSelectedIndex" Text="SelectedIndex: -" />
                 <material:MaterialButton Text="Save" Icon="save.png" Command="{Binding TapCommand}" />
             </StackLayout>
         </ScrollView>

example/ExampleMaterialDesignControls/Pages/MaterialPickerPage.xaml.cs

@@ -15,7 +15,9 @@ public MaterialPickerPage()
 
             this.pckColors.ItemsSource = new List<string> { "Red", "Blue", "Green" };
             this.pckSizes.ItemsSource = new List<string> { "P", "M", "X", "XL" };
+
             this.pckModels.ItemsSource = new List<string> { "Model A", "Model B", "Model C", "Model D" };
+            this.pckModels.SelectedIndexChanged += PckModels_SelectedIndexChanged;
 
             this.SelectedSizes = "M";
 
@@ -24,6 +26,11 @@ public MaterialPickerPage()
             this.BindingContext = this;
         }
 
+        private void PckModels_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.lblSelectedIndex.Text = $"SelectedIndex: {this.pckModels.SelectedIndex}";
+        }
+
         public ICommand TapCommand { get; set; }
 
         public async void OnTap(object parameter)

src/MaterialDesignControls/Controls/MaterialChips.xaml

@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentView xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:controls="clr-namespace:Plugin.MaterialDesignControls;assembly=Plugin.MaterialDesignControls" x:Class="Plugin.MaterialDesignControls.MaterialChips">
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:controls="clr-namespace:Plugin.MaterialDesignControls;assembly=Plugin.MaterialDesignControls" xmlns:custom="clr-namespace:Plugin.MaterialDesignControls.Implementations;assembly=Plugin.MaterialDesignControls" x:Class="Plugin.MaterialDesignControls.MaterialChips">
     <ContentView.Content>
         <Frame x:Name="frmContainer" HasShadow="false" CornerRadius="16" Padding="12,0" MinimumHeightRequest="32" HeightRequest="32">
             <StackLayout VerticalOptions="Center" Spacing="0" HorizontalOptions="Center" Orientation="Horizontal">
-                <Grid x:Name="imgLeadingContainer" IsVisible="false" VerticalOptions="Center" HorizontalOptions="CenterAndExpand" WidthRequest="24" HeightRequest="26">
-                    <Image x:Name="imgLeading" HorizontalOptions="Start" VerticalOptions="CenterAndExpand" Aspect="AspectFit" WidthRequest="18" HeightRequest="18" />
-                </Grid>
+                <custom:CustomImageButton x:Name="imgLeadingIcon" IsVisible="false" HorizontalOptions="Start" Padding="0,0,4,0" ImageWidthRequest="18" ImageHeightRequest="18" />
                 <controls:MaterialLabel x:Name="lblText" HorizontalOptions="CenterAndExpand" LineBreakMode="NoWrap" VerticalOptions="Center" VerticalTextAlignment="Center" HorizontalTextAlignment="Center" />
-                <Grid x:Name="imgTrailingContainer" IsVisible="false" VerticalOptions="Center" HorizontalOptions="CenterAndExpand" WidthRequest="24" HeightRequest="26">
-                    <Image x:Name="imgTrailing" HorizontalOptions="End" VerticalOptions="CenterAndExpand" Aspect="AspectFit" WidthRequest="18" HeightRequest="18" />
-                </Grid>
+                <custom:CustomImageButton x:Name="imgTrailingIcon" IsVisible="false" HorizontalOptions="End" Padding="4,0,0,0" ImageWidthRequest="18" ImageHeightRequest="18" />
             </StackLayout>
         </Frame>
     </ContentView.Content>

src/MaterialDesignControls/Controls/MaterialChips.xaml.cs

@@ -298,12 +298,12 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
                     this.ApplyIsSelected();
                     break;
                 case nameof(this.TrailingIcon):
-                    this.imgTrailing.Source = this.TrailingIcon;
-                    this.imgTrailingContainer.IsVisible = true;
+                    this.imgTrailingIcon.Image.Source = this.TrailingIcon;
+                    this.imgTrailingIcon.IsVisible = true;
                     break;
                 case nameof(this.LeadingIcon):
-                    this.imgLeading.Source = this.LeadingIcon;
-                    this.imgLeadingContainer.IsVisible = true;
+                    this.imgTrailingIcon.Image.Source = this.LeadingIcon;
+                    this.imgTrailingIcon.IsVisible = true;
                     break;
                 case nameof(this.LeadingIconCommand):
                     AddIconTapGesture(false);
@@ -322,32 +322,26 @@ private void AddIconTapGesture(bool isTrailingIcon)
             if (this.frmContainer.GestureRecognizers.Count > 0)
                 this.frmContainer.GestureRecognizers.RemoveAt(0); //Remove main tap gesture
 
-            TapGestureRecognizer tapIconGestureRecognizer = new TapGestureRecognizer();
-            tapIconGestureRecognizer.Tapped += (s, e) =>
+            if (isTrailingIcon)
             {
-                if (this.IsEnabled)
+                this.imgTrailingIcon.Tapped = () =>
                 {
-                    if (isTrailingIcon)
+                    if (this.IsEnabled && this.TrailingIconCommand != null)
                     {
-                        if (this.TrailingIconCommand != null)
-                        {
-                            this.TrailingIconCommand.Execute(this.TrailingIconCommandParameter);
-                        }
+                        this.TrailingIconCommand.Execute(this.TrailingIconCommandParameter);
                     }
-                    else
+                };
+            }
+            else
+            {
+                this.imgLeadingIcon.Tapped = () =>
+                {
+                    if (this.IsEnabled && this.LeadingIconCommand != null)
                     {
-                        if (this.LeadingIconCommand != null)
-                        {
-                            this.LeadingIconCommand.Execute(this.LeadingIconCommandParameter);
-                        }
+                        this.LeadingIconCommand.Execute(this.LeadingIconCommandParameter);
                     }
-                }
-            };
-
-            if (isTrailingIcon)
-                imgTrailingContainer.GestureRecognizers.Add(tapIconGestureRecognizer);
-            else
-                imgLeadingContainer.GestureRecognizers.Add(tapIconGestureRecognizer);
+                };
+            }
         }
 
         private void ApplyIsSelected()

src/MaterialDesignControls/Controls/MaterialPicker.xaml.cs

@@ -41,6 +41,12 @@ public MaterialPicker()
 
         #endregion Attributes
 
+        #region Events
+
+        public event EventHandler SelectedIndexChanged;
+
+        #endregion Events
+
         #region Properties
 
         public static readonly BindableProperty TypeProperty =
@@ -233,6 +239,27 @@ public bool AnimateError
             set { SetValue(AnimateErrorProperty, value); }
         }
 
+        public int SelectedIndex
+        {
+            get
+            {
+                if (this.ItemsSource != null)
+                {
+                    var index = 0;
+                    foreach (var item in this.ItemsSource)
+                    {
+                        if (index.Equals(this.pckOptions.SelectedIndex))
+                        {
+                            return index;
+                        }
+                        index++;
+                    }
+                }
+
+                return -1;
+            }
+        }
+
         #endregion Properties
 
         #region Methods
@@ -432,6 +459,10 @@ private void PckOptions_SelectedIndexChanged(object sender, EventArgs e)
                     if (index.Equals(this.pckOptions.SelectedIndex))
                     {
                         this.SelectedItem = item.ToString();
+                        if (this.SelectedIndexChanged != null)
+                        {
+                            this.SelectedIndexChanged.Invoke(this, e);
+                        }
                         break;
                     }
                     index++;

src/MaterialDesignControls/Implementations/CustomImageButton.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.CompilerServices;
 using Xamarin.Forms;
 
 namespace Plugin.MaterialDesignControls.Implementations
@@ -33,6 +34,22 @@ public Action Tapped
 
         public Image Image { get; set; }
 
+        public static readonly BindableProperty ImageHeightRequestProperty = BindableProperty.Create(nameof(ImageHeightRequest), typeof(double), typeof(CustomImageButton), defaultValue: 24.0);
+
+        public double ImageHeightRequest
+        {
+            get { return (double)GetValue(ImageHeightRequestProperty); }
+            set { SetValue(ImageHeightRequestProperty, value); }
+        }
+
+        public static readonly BindableProperty ImageWidthRequestProperty = BindableProperty.Create(nameof(ImageWidthRequest), typeof(double), typeof(CustomImageButton), defaultValue: 24.0);
+
+        public double ImageWidthRequest
+        {
+            get { return (double)GetValue(ImageWidthRequestProperty); }
+            set { SetValue(ImageWidthRequestProperty, value); }
+        }
+
         public CustomImageButton()
         {
             this.Padding = 6;
@@ -41,11 +58,27 @@ public CustomImageButton()
             this.Image = new Image
             {
                 VerticalOptions = LayoutOptions.Center,
-                WidthRequest = 24,
-                HeightRequest = 24,
+                HorizontalOptions = LayoutOptions.Center,
+                WidthRequest = this.ImageWidthRequest,
+                HeightRequest = this.ImageHeightRequest,
             };
 
             this.Content = this.Image;
         }
+
+        protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            base.OnPropertyChanged(propertyName);
+
+            switch (propertyName)
+            {
+                case nameof(this.ImageWidthRequest):
+                    this.Image.WidthRequest = this.ImageWidthRequest;
+                    break;
+                case nameof(this.ImageHeightRequest):
+                    this.Image.HeightRequest = this.ImageHeightRequest;
+                    break;
+            }
+        }
     }
 }