Merge branch 'develop'

Author: AgustinBonilla

MaterialBottomSheet.md

@@ -55,6 +55,10 @@ Gets or sets the vertical options to the container's content. By default it has
 Gets or sets the container height. By default it has a **-1** and the height of the container adjusts to the container's content. This property should only be used if a fixed height is needed for the container.
 <br/>
 
+### Property ContainerRelativeHeight:
+Gets or sets the relative (proportional) container height. By default it has a **-1** and this property is not taken into account. This property should only be used if a relative (proportional) fixed height is needed for the container. This property allows values between 0 and 1.
+<br/>
+
 ### Property MaximumContainerHeightRequest:
 Gets or sets the maximum height to which the container can expand. It only works when the ContainerHeight property is not set and the container height is dynamic.
 <br/>

MaterialButtonControl.md

@@ -90,6 +90,10 @@ This property is to set the font size of the button text.
 This property is to set the font family of the button text.
 <br/>
 
+### Property IsTextUnderlined:
+This property is to set the underlined style to the button text. It only works with the ButtonType Text.
+<br/>
+
 ### Property ToUpper:
 This property is to make the text uppercase or lowercase, the default is false.
 <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.1.1</version>
+       <version>3.1.2</version>
        <title>MaterialDesignControls Plugin for Xamarin Forms</title>
        <authors>Horus</authors>
        <owners>AgustinBonillaHorus</owners>

MaterialSnackBar.md

@@ -62,6 +62,10 @@ This property is to the font size of the action button.
 This property is to the font family of the action button.
 <br/>
 
+### Property IsActionTextUnderlined:
+This property is to set the underlined style to the action button.
+<br/>
+
 ### Property ActionCommand:
 This property is to the command of the action button.
 <br/>

README.md

@@ -413,7 +413,7 @@ https://github.com/HorusSoftwareUY/MaterialDesignControlsPlugin/tree/master/exam
 
 
 ## Developed by
-<a href="http://horus.com.uy" ><img src="https://horus.com.uy/img/logo_horus.png" width="128"></a>
+<a href="http://horus.com.uy"><img src="https://assets-global.website-files.com/64a7016392b0b7da3a8604e3/64a7016392b0b7da3a8604ed_horus.svg" width="128"></a>
 
 
 ## Contributions

example/ExampleMaterialDesignControls/Pages/MaterialBottomSheetPage.xaml

@@ -55,6 +55,12 @@
                         ButtonType="Text"
                         Command="{Binding OpenBottomSheetCommand}"
                         CommandParameter="materialBottomSheet3"
+                        Text="Relative size" />
+
+                    <material3:MaterialButton
+                        ButtonType="Text"
+                        Command="{Binding OpenBottomSheetCommand}"
+                        CommandParameter="materialBottomSheet4"
                         Text="Dynamic size and MaximumContainerHeightRequest" />
 
                     <material3:MaterialDivider />
@@ -94,12 +100,12 @@
                 </material3:MaterialBottomSheet.Content>
             </material3:MaterialBottomSheet>
 
-            <!--Fixed size-->
+            <!--Fixed size with ContainerHeight-->
             <material3:MaterialBottomSheet
                 x:Name="materialBottomSheet2"
                 Grid.Row="1"
-                ContainerHeight="400"
-                ContentVerticalOptions="Center">
+                ContainerHeight="600"
+                ContentVerticalOptions="Start">
                 <material3:MaterialBottomSheet.Content>
                     <StackLayout
                         Spacing="10"
@@ -123,9 +129,37 @@
                 </material3:MaterialBottomSheet.Content>
             </material3:MaterialBottomSheet>
 
-            <!--Dynamic size with MaximumContainerHeightRequest-->
+            <!--Fixed relative size with ContainerRelativeHeight-->
             <material3:MaterialBottomSheet
                 x:Name="materialBottomSheet3"
+                ContainerRelativeHeight="0.8"
+                Grid.Row="1">
+                <material3:MaterialBottomSheet.Content>
+                    <StackLayout
+                        Spacing="10"
+                        Padding="22,44,22,12">
+                        <material3:MaterialLabel
+                            FontFamily="{StaticResource BoldFont}"
+                            FontSize="{StaticResource H4FontSize}"
+                            Text="Material Design"
+                            TextColor="{StaticResource GradientColor1}" />
+                        <material3:MaterialLabel
+                            FontAttributes="Bold"
+                            FontFamily="{StaticResource SemiBoldFont}"
+                            FontSize="{StaticResource H5FontSize}"
+                            Text="Plugin for Xamarin Forms"
+                            TextColor="{StaticResource BlackColor}" />
+                        <material3:MaterialLabel
+                            FontSize="{StaticResource Body2FontSize}"
+                            Text="Material Design is an adaptable system of guidelines, components, and tools that support the best practices of user interface design. Backed by open-source code, Material Design streamlines collaboration between designers and developers, and helps teams quickly build beautiful products."
+                            TextColor="{StaticResource DarkGrayColor}" />
+                    </StackLayout>
+                </material3:MaterialBottomSheet.Content>
+            </material3:MaterialBottomSheet>
+
+            <!--Dynamic size with MaximumContainerHeightRequest-->
+            <material3:MaterialBottomSheet
+                x:Name="materialBottomSheet4"
                 Grid.Row="1"
                 MaximumContainerHeightRequest="300">
                 <material3:MaterialBottomSheet.Content>

example/ExampleMaterialDesignControls/Pages/MaterialSnackBarPage.xaml

@@ -50,7 +50,8 @@
                         LeadingIconCommand="{Binding LeadingIconTapCommand}"
                         TrailingIconCommand="{Binding TrailingIconTapCommand}"
                         ActionCommand="{Binding ActionCommand}"
-                        ActionText="Action">
+                        ActionText="Action"
+                        IsActionTextUnderlined="True">
                     </material3:MaterialSnackBar>
                     <material3:MaterialDivider Margin="0,10" />
 

src/MaterialDesignControls/ControlsMaterial3/MaterialBottomSheet.cs

@@ -49,6 +49,15 @@ public double ContainerHeight
             set { SetValue(ContainerHeightProperty, value); OnPropertyChanged(); }
         }
 
+        public static BindableProperty ContainerRelativeHeightProperty =
+            BindableProperty.Create(nameof(ContainerRelativeHeight), typeof(double), typeof(MaterialBottomSheet), defaultValue: -1.0, propertyChanged: OnContainerRelativeHeightChanged);
+
+        public double ContainerRelativeHeight
+        {
+            get { return (double)GetValue(ContainerRelativeHeightProperty); }
+            set { SetValue(ContainerRelativeHeightProperty, value); OnPropertyChanged(); }
+        }
+
         public static BindableProperty MaximumContainerHeightRequestProperty =
             BindableProperty.Create(nameof(MaximumContainerHeightRequest), typeof(double), typeof(MaterialBottomSheet), defaultValue: -1.0);
 
@@ -276,6 +285,12 @@ private static void OnContainerHeightChanged(BindableObject bindable, object old
             control.SetInitialState();
         }
 
+        private static void OnContainerRelativeHeightChanged(BindableObject bindable, object oldValue, object newValue)
+        {
+            var control = (MaterialBottomSheet)bindable;
+            control.SetInitialState();
+        }
+
         private static void OnContentChanged(BindableObject bindable, object oldValue, object newValue)
         {
             var control = (MaterialBottomSheet)bindable;
@@ -298,7 +313,23 @@ private static void OnContentChanged(BindableObject bindable, object oldValue, o
 
         private void ApplyContainerHeight(View containerContentView)
         {
-            if (ContainerHeight <= 0)
+            if (ContainerRelativeHeight != (double)ContainerRelativeHeightProperty.DefaultValue
+                && ContainerHeight == (double)ContainerHeightProperty.DefaultValue)
+            {
+                if (Height > 0)
+                {
+                    ContainerHeight = Height * ContainerRelativeHeight;
+                }
+                else
+                {
+                    SizeChanged += (s, e) =>
+                    {
+                        var totalHeight = ((View)s).Height;
+                        ContainerHeight = totalHeight * ContainerRelativeHeight;
+                    };
+                }
+            }
+            else if (ContainerHeight == (double)ContainerHeightProperty.DefaultValue)
             {
                 if (containerContentView.Height > 0)
                 {

src/MaterialDesignControls/ControlsMaterial3/MaterialButton.cs

@@ -5,6 +5,7 @@
 using Plugin.MaterialDesignControls.Material3.Implementations;
 using Plugin.MaterialDesignControls.Styles;
 using Xamarin.Forms;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace Plugin.MaterialDesignControls.Material3
 {
@@ -111,6 +112,15 @@ public string Text
             set { SetValue(TextProperty, value); }
         }
 
+        public static readonly BindableProperty IsTextUnderlinedProperty =
+            BindableProperty.Create(nameof(IsTextUnderlined), typeof(bool), typeof(MaterialButton), defaultValue: false);
+
+        public bool IsTextUnderlined
+        {
+            get { return (bool)GetValue(IsTextUnderlinedProperty); }
+            set { SetValue(IsTextUnderlinedProperty, value); }
+        }
+
         public static readonly BindableProperty CornerRadiusProperty =
             BindableProperty.Create(nameof(CornerRadius), typeof(double), typeof(MaterialButton), defaultValue: 20.0);
 
@@ -386,7 +396,8 @@ private void Initialize()
                 HorizontalOptions = ContentIsExpanded ? LayoutOptions.CenterAndExpand : LayoutOptions.Center,
                 Text = ToUpper ? Text?.ToUpper() : Text,
                 FontSize = FontSize,
-                FontFamily = FontFamily
+                FontFamily = FontFamily,
+                TextDecorations = IsTextUnderlined ? TextDecorations.Underline : TextDecorations.None
             };
             _stcLayout.Children.Add(_textLabel);
 
@@ -428,6 +439,7 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
                 case nameof(TextColor):
                 case nameof(BackgroundColor):
                 case nameof(BorderColor):
+                case nameof(IsTextUnderlined):
                     SetButtonType();
                     break;
                 case nameof(base.Opacity):
@@ -570,31 +582,36 @@ public void SetButtonType()
             {
                 case MaterialButtonType.Elevated:
                     _textLabel.TextColor = IsEnabled ? (TextColor != Color.Default ? TextColor : MaterialColor.Primary) : (DisabledTextColor != Color.Default ? DisabledTextColor : MaterialColor.Disable);
+                    _textLabel.TextDecorations = TextDecorations.None;
                     _frameLayout.BackgroundColor = BackgroundColor != Color.Default ? BackgroundColor : MaterialColor.OnPrimary;
                     _frameLayout.BorderColor = BackgroundColor != Color.Default ? BackgroundColor : MaterialColor.OnPrimary;
                     _frameLayout.HasShadow = true;
                     break;
                 case MaterialButtonType.Filled:
                     _textLabel.TextColor = IsEnabled ? (TextColor != Color.Default ? TextColor : MaterialColor.OnPrimary) : (DisabledTextColor != Color.Default ? DisabledTextColor : MaterialColor.OnPrimary);
+                    _textLabel.TextDecorations = TextDecorations.None;
                     _frameLayout.BackgroundColor = IsEnabled ? (BackgroundColor != Color.Default ? BackgroundColor : MaterialColor.Primary) : (DisabledBackgroundColor != Color.Default ? DisabledBackgroundColor : MaterialColor.Disable);
                     _frameLayout.BorderColor = Color.Transparent;
                     _frameLayout.HasShadow = false;
                     break;
                 case MaterialButtonType.Tonal:
                     _textLabel.TextColor = IsEnabled ? (TextColor != Color.Default ? TextColor : MaterialColor.Primary) : (DisabledTextColor != Color.Default ? DisabledTextColor : MaterialColor.Disable);
+                    _textLabel.TextDecorations = TextDecorations.None;
                     var defaultBackgroundColor = Color.FromRgba(MaterialColor.Primary.R, MaterialColor.Primary.G, MaterialColor.Primary.B, 0.4);
                     _frameLayout.BackgroundColor = IsEnabled ? defaultBackgroundColor : (DisabledBackgroundColor != Color.Default ? DisabledBackgroundColor : MaterialColor.Disable);
                     _frameLayout.BorderColor = Color.Transparent;
                     _frameLayout.HasShadow = false;
                     break;
                 case MaterialButtonType.Outlined:
                     _textLabel.TextColor = IsEnabled ? (TextColor != Color.Default ? TextColor : MaterialColor.Primary) : (DisabledTextColor != Color.Default ? DisabledTextColor : MaterialColor.Disable);
+                    _textLabel.TextDecorations = TextDecorations.None;
                     _frameLayout.BackgroundColor = BackgroundColor != Color.Default ? BackgroundColor : MaterialColor.OnPrimary;
                     _frameLayout.BorderColor = IsEnabled ? (BorderColor != Color.Default ? BorderColor : MaterialColor.Primary) : (DisabledBorderColor != Color.Default ? DisabledBorderColor : MaterialColor.Disable);
                     _frameLayout.HasShadow = false;
                     break;
                 case MaterialButtonType.Text:
                     _textLabel.TextColor = IsEnabled ? (TextColor != Color.Default ? TextColor : MaterialColor.Primary) : (DisabledTextColor != Color.Default ? DisabledTextColor : MaterialColor.Disable);
+                    _textLabel.TextDecorations = IsTextUnderlined ? TextDecorations.Underline : TextDecorations.None;
                     _frameLayout.BackgroundColor = Color.Transparent;
                     _frameLayout.BorderColor = Color.Transparent;
                     _frameLayout.HasShadow = false;