Merge branch 'develop'

HorusSoftwareUY · Apr 25, 2024 · ffb05b0 · ffb05b0
2 parents 0311f74 + 31bef94
commit ffb05b0
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 5 deletions.
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>3.1.6</version>
+       <version>3.1.7</version>
        <title>MaterialDesignControls Plugin for Xamarin Forms</title>
        <authors>Horus</authors>
        <owners>AgustinBonillaHorus</owners>

diff --git a/example/ExampleMaterialDesignControls/Pages/MaterialDialogPage.xaml b/example/ExampleMaterialDesignControls/Pages/MaterialDialogPage.xaml
@@ -23,7 +23,7 @@
                 <StackLayout Padding="20,0,20,20"
                              Spacing="20">
 
-                    <contentViews:InfoIndicatorView Message="MaterialSnackBar follows the latest guidelines of Material Design 3. Currently, it doesn't provide the popup/alert behavior, you could resolve it with Rg.Plugins.Popup or with a similar implementation." />
+                    <contentViews:InfoIndicatorView Message="MaterialDialog follows the latest guidelines of Material Design 3. Currently, it doesn't provide the popup/alert behavior, you could resolve it with Rg.Plugins.Popup or with a similar implementation." />
 
                     <material3:MaterialDialog
                         HeadlineText="Basic dialog"
@@ -44,6 +44,30 @@
 
                     <material3:MaterialDivider Margin="0,10" />
 
+                    <material3:MaterialDialog
+                        HeadlineText="Basic dialog with CustomContent"
+                        SupportingText="Basic dialog with a CustomContent, an accept button and cancel button."
+                        AcceptText="Accept"
+                        AcceptCommand="{Binding AcceptWithCustomContentCommand}"
+                        CancelText="Cancel"
+                        CancelCommand="{Binding CancelCommand}"
+                        CancelIsTextUnderlined="True"
+                        AcceptCornerRadius="4">
+                        <material3:MaterialDialog.CustomContent>
+                            <material3:MaterialEntry
+                                Text="{Binding InputText}"
+                                Keyboard="Telephone"
+                                LabelText="Phone number"
+                                Placeholder="Enter your phone number"
+                                ReturnType="Done"
+                                HasBorder="True"
+                                CornerRadius="10"
+                                BorderWidth="1" />
+                        </material3:MaterialDialog.CustomContent>
+                    </material3:MaterialDialog>
+
+                    <material3:MaterialDivider Margin="0,10" />
+
                     <material3:MaterialDialog
                         HeadlineText="Quick selection dialog"
                         SupportingText="Quick selection dialog with a list of items."

diff --git a/example/ExampleMaterialDesignControls/ViewModels/MaterialDialogViewModel.cs b/example/ExampleMaterialDesignControls/ViewModels/MaterialDialogViewModel.cs
@@ -4,9 +4,6 @@
 using System.Collections.Generic;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Plugin.MaterialDesignControls.Material3;
-using System.ComponentModel;
-using Xamarin.Forms.PlatformConfiguration;
-using Xamarin.Forms.Shapes;
 using System.Linq;
 
 namespace ExampleMaterialDesignControls.ViewModels
@@ -18,6 +15,9 @@ public partial class MaterialDialogViewModel : BaseViewModel
         [ObservableProperty]
         private ObservableCollection<MaterialDialogItem> _itemsSourceColors;
 
+        [ObservableProperty]
+        private string _inputText;
+
         public MaterialDialogViewModel()
         {
             ItemsSourceColors = new ObservableCollection<MaterialDialogItem>
@@ -109,6 +109,12 @@ private async Task AcceptTask()
             await this.DisplayAlert(_controlTitle, "Accept button was tapped", "Ok");
         }
 
+        [ICommand]
+        private async Task AcceptWithCustomContent()
+        {
+            await this.DisplayAlert(_controlTitle, $"Accept button was tapped: {InputText}", "Ok");
+        }
+
         [ICommand]
         private async Task Cancel()
         {

diff --git a/src/MaterialDesignControls/ControlsMaterial3/MaterialDialog.cs b/src/MaterialDesignControls/ControlsMaterial3/MaterialDialog.cs
@@ -39,6 +39,8 @@ public class MaterialDialog : ContentView
 
         private StackLayout _optionsContainer;
 
+        private ContentView _customContentContainer;
+
         #endregion Attributes
 
         #region Properties
@@ -126,6 +128,15 @@ public LayoutOptions ButtonsAlignment
             set { SetValue(ButtonsAlignmentProperty, value); }
         }
 
+        public static readonly BindableProperty CustomContentProperty =
+            BindableProperty.Create(nameof(CustomContent), typeof(View), typeof(MaterialDialog), defaultValue: null, propertyChanged: OnCustomContentChanged);
+
+        public View CustomContent
+        {
+            get { return (View)GetValue(CustomContentProperty); }
+            set { SetValue(CustomContentProperty, value); }
+        }
+
         #endregion Properties
 
         #region Headline
@@ -340,6 +351,15 @@ public float CancelCornerRadius
             set { SetValue(CancelCornerRadiusProperty, value); }
         }
 
+        public static readonly BindableProperty CancelIsTextUnderlinedProperty =
+            BindableProperty.Create(nameof(CancelIsTextUnderlined), typeof(bool), typeof(MaterialDialog), defaultValue: false);
+
+        public bool CancelIsTextUnderlined
+        {
+            get { return (bool)GetValue(CancelIsTextUnderlinedProperty); }
+            set { SetValue(CancelIsTextUnderlinedProperty, value); }
+        }
+
         #endregion CancelButton
 
         #region AcceptButton
@@ -753,6 +773,10 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
                     _cancelBtn.CornerRadius = CancelCornerRadius;
                     break;
 
+                case nameof(CancelIsTextUnderlined):
+                    _cancelBtn.IsTextUnderlined = CancelIsTextUnderlined;
+                    break;
+
                 case nameof(AcceptText):
                     _acceptBtn.Text = AcceptText;
                     break;
@@ -892,6 +916,12 @@ private void Initialize()
                 };
                 container.Children.Add(_supportingLbl);
 
+                _customContentContainer = new ContentView
+                {
+                    IsVisible = false
+                };
+                container.Children.Add(_customContentContainer);
+
                 var stackLayoutOptions = new StackLayout
                 {
                     Spacing = 0,
@@ -1102,6 +1132,13 @@ private void OnSearchCommand()
             });
         }
 
+        private static void OnCustomContentChanged(BindableObject bindable, object oldValue, object newValue)
+        {
+            var control = (MaterialDialog)bindable;
+            control._customContentContainer.Content = (View)newValue;
+            control._customContentContainer.IsVisible = true;
+        }
+
         #endregion Methods
     }
 }