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

example/ExampleMaterialDesignControls/Pages/MaterialPickerPage.xaml

@@ -33,9 +33,10 @@
                 <Label x:Name="lblSelectedIndexes" Text="SelectedIndexes: -" />
                 <material:MaterialButton Text="Save" Icon="save.png" Command="{Binding Tap2Command}" />
 
-                <material:MaterialDoublePicker Type="Filled" LabelText="Double Picker" Separator=" - "
+                <material:MaterialDoublePicker x:Name="pckDoubleWithFocus" Type="Filled" LabelText="Double Picker" Separator=" - "
                                                ItemsSource="{Binding ItemsSource}" SecondaryItemsSource="{Binding SecondaryItemsSource}"
                                                SelectedItem="{Binding SelectedItem}" SecondarySelectedItem="{Binding SecondarySelectedItem}" />
+                <material:MaterialButton Text="Focus" Command="{Binding Tap3Command}" />
             </StackLayout>
         </ScrollView>
     </ContentPage.Content>

example/ExampleMaterialDesignControls/Pages/MaterialPickerPage.xaml.cs

@@ -42,6 +42,8 @@ public MaterialPickerPage()
 
             this.Tap2Command = new Command<string>(OnTap2);
 
+            this.Tap3Command = new Command<string>(OnTap3);
+
             this.BindingContext = this;
         }
 
@@ -76,5 +78,12 @@ public async void OnTap2(object parameter)
         {
             await this.DisplayAlert("Saved", $"{SelectedItem} - {SecondarySelectedItem}", "Ok");
         }
+
+        public ICommand Tap3Command { get; set; }
+
+        public async void OnTap3(object parameter)
+        {
+            this.pckDoubleWithFocus.Focus();
+        }
     }
 }

src/MaterialDesignControls/Controls/MaterialDatePicker.xaml.cs

@@ -286,6 +286,11 @@ public Color PlaceholderColor
             set { SetValue(PlaceholderColorProperty, value); }
         }
 
+        public new bool IsFocused
+        {
+            get { return this.pckDate.IsFocused; }
+        }
+
         #endregion Properties
 
         #region Methods
@@ -437,6 +442,15 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
             }
         }
 
+        public new bool Focus()
+        {
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                this.pckDate.Focus();
+            });
+            return true;
+        }
+
         private void Handle_Focused(object sender, FocusEventArgs e)
         {
             this.lblLabel.TextColor = this.FocusedLabelTextColor;

src/MaterialDesignControls/Controls/MaterialDoublePicker.xaml.cs

@@ -344,6 +344,11 @@ public Color PlaceholderColor
             set { SetValue(PlaceholderColorProperty, value); }
         }
 
+        public new bool IsFocused
+        {
+            get { return this.pckOptions.IsFocused; }
+        }
+
         #endregion Properties
 
         #region Methods
@@ -565,6 +570,15 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
             }
         }
 
+        public new bool Focus()
+        {
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                this.pckOptions.Focus();
+            });
+            return true;
+        }
+
         private void Handle_Focused(object sender, FocusEventArgs e)
         {
             this.lblLabel.TextColor = this.FocusedLabelTextColor;

src/MaterialDesignControls/Controls/MaterialEditor.xaml.cs

@@ -294,6 +294,11 @@ public bool AnimateError
             set { SetValue(AnimateErrorProperty, value); }
         }
 
+        public new bool IsFocused
+        {
+            get { return this.txtEditor.IsFocused; }
+        }
+
         #endregion Properties
 
         #region Events
@@ -465,6 +470,15 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
             }
         }
 
+        public new bool Focus()
+        {
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                this.txtEditor.Focus();
+            });
+            return true;
+        }
+
         private void Handle_Focused(object sender, FocusEventArgs e)
         {
             this.lblLabel.TextColor = this.FocusedLabelTextColor;

src/MaterialDesignControls/Controls/MaterialEntry.xaml.cs

@@ -348,6 +348,11 @@ public bool AnimateError
             set { SetValue(AnimateErrorProperty, value); }
         }
 
+        public new bool IsFocused
+        {
+            get { return this.txtEntry.IsFocused; }
+        }
+
         #endregion Properties
 
         #region Events
@@ -538,6 +543,15 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
             }
         }
 
+        public new bool Focus()
+        {
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                this.txtEntry.Focus();
+            });
+            return true;
+        }
+
         private void Handle_Focused(object sender, FocusEventArgs e)
         {
             this.lblLabel.TextColor = this.FocusedLabelTextColor;

src/MaterialDesignControls/Controls/MaterialPicker.xaml.cs

@@ -296,6 +296,11 @@ public Color PlaceholderColor
             set { SetValue(PlaceholderColorProperty, value); }
         }
 
+        public new bool IsFocused
+        {
+            get { return this.pckOptions.IsFocused; }
+        }
+
         #endregion Properties
 
         #region Methods
@@ -471,6 +476,15 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
             }
         }
 
+        public new bool Focus()
+        {
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                this.pckOptions.Focus();
+            });
+            return true;
+        }
+
         private void Handle_Focused(object sender, FocusEventArgs e)
         {
             this.lblLabel.TextColor = this.FocusedLabelTextColor;

src/MaterialDesignControls/Controls/MaterialTimePicker.xaml.cs

@@ -268,6 +268,11 @@ public Color PlaceholderColor
             set { SetValue(PlaceholderColorProperty, value); }
         }
 
+        public new bool IsFocused
+        {
+            get { return this.pckTime.IsFocused; }
+        }
+
         #endregion Properties
 
         #region Methods
@@ -413,6 +418,15 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
             }
         }
 
+        public new bool Focus()
+        {
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                this.pckTime.Focus();
+            });
+            return true;
+        }
+
         private void Handle_Focused(object sender, FocusEventArgs e)
         {
             this.lblLabel.TextColor = this.FocusedLabelTextColor;