Merge branch 'develop'

MaterialDatePickerControl.md

@@ -278,7 +278,7 @@ This property is to set the Supporting LineBreakMode.
 <br/>
 <br/>
 
-
-
-
-
+### Property Padding:
+This property is to set the padding of the control. By default uses (16, 8).
+<br/>
+<br/>

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

MaterialDialog.md

@@ -133,6 +133,10 @@ This property is to the font size of the cancel button.
 This property is to the font family of the cancel button.
 <br/>
 
+### Property CancelCornerRadius:
+This property is to set the corner radius of cancel button.
+<br/>
+
 ### Property CancelCommand:
 This property is to the command of the cancel button.
 <br/>
@@ -165,6 +169,10 @@ This property is to the font size of the accept button.
 This property is to the font family of the accept button.
 <br/>
 
+### Property AcceptCornerRadius:
+This property is to set the corner radius of accept button.
+<br/>
+
 ### Property AcceptCommand:
 This property is to the command of the accept button.
 <br/>
@@ -264,4 +272,8 @@ This property is to set the icon when is unchecked. It is a DataTemplate propert
 
 ### Property ItemCheckboxSize
 This property is to set the size of the checkbox.
+<br/>
+
+### Property ItemCheckboxSpacing
+This property is to set the spacing of the checkbox.
 <br/>

MaterialDoublePickerControl.md

@@ -291,5 +291,7 @@ This property is to set the Supporting LineBreakMode.
 <br/>
 <br/>
 
-
-
+### Property Padding:
+This property is to set the padding of the control. By default uses (16, 8).
+<br/>
+<br/>

MaterialEditorControl.md

@@ -321,4 +321,7 @@ This property is to set autosize editor.
 <br/>
 <br/>
 
-
+### Property Padding:
+This property is to set the padding of the control. By default uses (16, 8).
+<br/>
+<br/>

MaterialEntryControl.md

@@ -354,4 +354,9 @@ This property is to set the Supporting LineBreakMode.
 - TailTruncation,
 - MiddleTruncation
 <br/>
+<br/>
+
+### Property Padding:
+This property is to set the padding of the control. By default uses (16, 8).
+<br/>
 <br/>

MaterialPickerControl.md

@@ -270,3 +270,7 @@ This property is to get the selected index
 <br/>
 <br/>
 
+### Property Padding:
+This property is to set the padding of the control. By default uses (16, 8).
+<br/>
+<br/>

MaterialSearch.md

@@ -248,4 +248,9 @@ This property is to set the Supporting LineBreakMode.
 - TailTruncation,
 - MiddleTruncation
 <br/>
+<br/>
+
+### Property Padding:
+This property is to set the padding of the control. By default uses (16, 8).
+<br/>
 <br/>

MaterialSegmentedControl.md

@@ -139,6 +139,16 @@ This propperty is to set the fontfamily of the segment text.
 <br/>
 <br/>
 
+### Property SelectedFontSize:
+This property is to set the fontsize of the selected segment text.
+<br/>
+<br/>
+
+### Property SelectedFontFamily
+This propperty is to set the fontfamily of the selected segment text.
+<br/>
+<br/>
+
 ### Property IsEnabled
 This property is to set if the control is enabled or not. By default is True.
 <br/>

MaterialSelectionControl.md

@@ -253,3 +253,8 @@ This property is to set the command.
 This property is to set the command parameter.
 <br/>
 <br/>
+
+### Property Padding:
+This property is to set the padding of the control. By default uses (16, 8).
+<br/>
+<br/>

MaterialTimePickerControl.md

@@ -217,3 +217,8 @@ This property is to set Time.
 This property is to set time Format.
 <br/>
 <br/>
+
+### Property Padding:
+This property is to set the padding of the control. By default uses (16, 8).
+<br/>
+<br/>

README.md

@@ -12,7 +12,7 @@ We're developing the next version of the plugin for .NET MAUI, bringing you exci
 
 ## Demo
 
-<img src="screenshots/controls.gif" width="300">
+<img src="screenshots/Controls.gif" width="300">
 
 ## Content table
 - [Setup](#setup)

example/ExampleMaterialDesignControls/Pages/MaterialDialogPage.xaml

@@ -59,16 +59,17 @@
 
                     <material3:MaterialDialog
                         HeadlineText="Quick selection dialog"
-                        SupportingText="Quick selection dialog with a list of items and a Search."
+                        SupportingText="Quick multiple-selection dialog with a list of items and a Search."
                         AcceptText="Accept"
-                        AcceptCommand="{Binding AcceptSelectionCommand}"
+                        AcceptCommand="{Binding AcceptMultipleSelectionCommand}"
                         CancelText="Cancel"
                         CancelCommand="{Binding CancelCommand}"
                         ShowDivider="True"
                         ItemsSource="{Binding ItemsSourceColors}"
                         ShowSearch="True"
                         SearchPlaceholder="Write text to search"
-                        HeightRequest="500" />
+                        HeightRequest="500"
+                        AllowMultiselect="True" />
 
                     <material3:MaterialDivider Margin="0,10" />
 
@@ -100,15 +101,18 @@
                         DividerColor="DarkBlue"
                         CancelTextColor="DarkBlue"
                         CancelFontSize="12"
-                        AcceptTextColor="DarkBlue"
-                        AcceptBackgroundColor="Transparent"
+                        CancelCornerRadius="4"
+                        AcceptTextColor="LightSkyBlue"
+                        AcceptBackgroundColor="DarkBlue"
                         AcceptFontSize="16"
+                        AcceptCornerRadius="4"
                         SearchTextColor="DarkBlue"
                         SearchBackgroundColor="LightSkyBlue"
                         SearchTextAlignment="Center"
                         ItemTextFontSize="14"
                         ItemTextColor="DarkBlue"
-                        HeightRequest="500">
+                        HeightRequest="500"
+                        ItemCheckboxSpacing="0">
                         <material3:MaterialDialog.CustomIcon>
                             <ffimageloadingsvg:SvgCachedImage Source="resource://ExampleMaterialDesignControls.Resources.Svg.ic_dialog.svg" />
                         </material3:MaterialDialog.CustomIcon>

example/ExampleMaterialDesignControls/Pages/MaterialSegmentedPage.xaml

@@ -128,7 +128,11 @@
                                                  SelectedColor="{StaticResource GradientColor9}"
                                                  SelectedTextColor="Black"
                                                  UnselectedColor="#F5F5F5"
-                                                 UnselectedTextColor="{StaticResource GradientColor9}" />
+                                                 UnselectedTextColor="{StaticResource GradientColor9}"
+                                                 FontSize="13"
+                                                 SelectedFontSize="18"
+                                                 FontFamily="{StaticResource LightFont}"
+                                                 SelectedFontFamily="{StaticResource BoldFont}" />
                 </StackLayout>
             </ScrollView>
         </Grid>

src/MaterialDesignControls.Android/Effects.cs

@@ -13,6 +13,10 @@ public static class Effects
 
         public static void Init()
         {
+            // Prevent stripping by linker
+            new TouchAndPressEffect();
+            new TouchReleaseEffect();
+
             _allEffects = new List<PlatformEffect>(typeof(Effects).Assembly.GetTypes()
                 .Where(t => typeof(PlatformEffect).IsAssignableFrom(t))
                 .Select(t => (PlatformEffect)Activator.CreateInstance(t)));

src/MaterialDesignControls.iOS/Effects.cs

@@ -13,6 +13,9 @@ public static class Effects
 
         public static void Init()
         {
+            // Prevent stripping by linker
+            new TouchAndPressEffect();
+
             _allEffects = new List<PlatformEffect>(typeof(Effects).Assembly.GetTypes()
                 .Where(t => typeof(PlatformEffect).IsAssignableFrom(t))
                 .Select(t => (PlatformEffect)Activator.CreateInstance(t)));

src/MaterialDesignControls/ControlsMaterial3/BaseMaterialFieldControl.cs

@@ -77,6 +77,15 @@ public TextAlignment HorizontalTextAlignment
             set { SetValue(HorizontalTextAlignmentProperty, value); }
         }
 
+        public static readonly new BindableProperty PaddingProperty =
+            BindableProperty.Create(nameof(Padding), typeof(Thickness), typeof(BaseMaterialFieldControl), defaultValue: new Thickness(16, 8));
+
+        public new Thickness Padding
+        {
+            get { return (Thickness)GetValue(PaddingProperty); }
+            set { SetValue(PaddingProperty, value); }
+        }
+
         #endregion Properties
 
         #region Text
@@ -704,7 +713,7 @@ public void UpdateLayout(string propertyName)
                     this._lblLabel.Margin = LabelMargin;
                     break;
                 case nameof(Padding):
-                    _frmContainer.Padding = this.Padding;
+                    _frmContainer.Padding = Padding;
                     break;
                 case nameof(CornerRadius):
                     this._frmContainer.CornerRadius = CornerRadius;
@@ -823,7 +832,7 @@ protected virtual void Initialize()
             {
                 CornerRadius = new CornerRadius(10, 10, 0, 0),
                 HasShadow = false,
-                Padding = new Thickness(16, 8),
+                Padding = Padding,
                 Type = MaterialCardType.Custom
             };
 
@@ -833,14 +842,14 @@ protected virtual void Initialize()
                 RowSpacing = 0,
                 RowDefinitions = new RowDefinitionCollection()
                 {
-                    new RowDefinition(){ Height = 16 },
-                    new RowDefinition(){ Height = 24 }
+                    new RowDefinition { Height = 16 },
+                    new RowDefinition { Height = 24 }
                 },
                 ColumnDefinitions = new ColumnDefinitionCollection() 
                 {
-                    new ColumnDefinition(){Width = GridLength.Auto },
-                    new ColumnDefinition(){Width = GridLength.Star },
-                    new ColumnDefinition(){Width = GridLength.Auto }
+                    new ColumnDefinition { Width = GridLength.Auto },
+                    new ColumnDefinition { Width = GridLength.Star },
+                    new ColumnDefinition { Width = GridLength.Auto }
                 }
             };
 

src/MaterialDesignControls/ControlsMaterial3/MaterialCheckBox.cs

@@ -171,7 +171,9 @@ private void Initialize()
                 VerticalOptions = LayoutOptions.Center,
                 HorizontalOptions = LayoutOptions.Center,
                 WidthRequest = 40,
-                HeightRequest = 40
+                HeightRequest = 40,
+                MinimumWidthRequest = 40,
+                MinimumHeightRequest = 40
             };
 
             _chk = new CustomCheckBox()
@@ -204,6 +206,8 @@ private void Initialize()
                 HorizontalOptions = LayoutOptions.Center,
                 WidthRequest = 40,
                 HeightRequest = 40,
+                MinimumWidthRequest = 40,
+                MinimumHeightRequest = 40,
                 IsVisible = false
             };
 
@@ -232,6 +236,8 @@ private void Initialize()
                 HorizontalOptions = LayoutOptions.Center,
                 WidthRequest = 40,
                 HeightRequest = 40,
+                MinimumWidthRequest = 40,
+                MinimumHeightRequest = 40,
                 IsVisible = false
             };