Merge pull request #115 from HorusSoftwareUY/feature/dot-net-10

pgonzalezmorelli · web-flow · commit eaf30b805941 · 2025-12-15T16:35:37.000-03:00
Feature/dot net 10
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
   <Import Project="nuget.props" />
 
   <PropertyGroup>
-    <NetVersion>net9.0</NetVersion>
+    <NetVersion>net10.0</NetVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
@@ -13,7 +13,7 @@
 
   <PropertyGroup Condition=" $(MSBuildProjectName.Contains('Maui')) ">
     <UseMaui>true</UseMaui>
-    <MauiVersion>9.0.80</MauiVersion>
+    <MauiVersion>10.0.10</MauiVersion>
     <XamlCompilationOptions>Compile</XamlCompilationOptions>
     <MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
   </PropertyGroup>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -9,11 +9,12 @@
     <PackageVersion Include="AdamE.Firebase.iOS.Analytics" Version="11.10.0" />
     <PackageVersion Include="AdamE.Firebase.iOS.Crashlytics" Version="11.10.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="Microsoft.Maui.Core" Version="10.0.10" />
     <PackageVersion Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
+    <PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData.Ktx" Version="2.9.4" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="NUnit" Version="4.0.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData.Ktx" Version="2.8.7.4" />
     <PackageVersion Include="Xamarin.Firebase.Analytics" Version="122.3.0.2" />
     <PackageVersion Include="Xamarin.Firebase.Crashlytics" Version="119.4.2.1" />
   </ItemGroup>
diff --git a/global.json b/global.json
@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "allowPrerelease": false
+    "allowPrerelease": false,
+    "version": "10.0.100"
   }
 }
diff --git a/nuget.props b/nuget.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup Condition=" $(MSBuildProjectName.Equals('HorusStudio.Maui.MaterialDesignControls')) ">
     <PackageId>HorusStudio.Maui.MaterialDesignControls</PackageId>
-    <Version>2.2.0</Version>
+    <Version>10.0.0</Version>
     <Authors>Horus Studio and contributors</Authors>
     <Company>Horus Studio</Company>
     <Title>Material Design Controls for .NET MAUI</Title>
@@ -15,11 +15,7 @@
     <PackageTags>dotnet-maui;dotnet;maui;cross-platform;android;ios;macos;maccatalyst;materialdesign;ui</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>
-- Fix Light and Dark themes support
-- Add AutomationId support
-- [iOS] [MaterialSlider] Fix inactive track color
-- [BREAKING CHANGE] [MaterialIconButton] Remove UseIconTintColor property
-- [BREAKING CHANGE] [MaterialNavigationDrawer] Remove InactiveIndicatorBackgroundColor property
+- Add net10.0 support
     </PackageReleaseNotes>
     <PackageOutputPath>$(MSBuildThisFileDirectory)Artifacts</PackageOutputPath>
     <EscapedCurrentDirectory>$([System.Text.RegularExpressions.Regex]::Escape('$(MSBuildThisFileDirectory)'))</EscapedCurrentDirectory>
diff --git a/samples/HorusStudio.Maui.MaterialDesignControls.Sample/Handlers/CustomMaterialTextFieldHandler.cs b/samples/HorusStudio.Maui.MaterialDesignControls.Sample/Handlers/CustomMaterialTextFieldHandler.cs
@@ -51,8 +51,8 @@ protected override void ConnectHandler(MauiTextField platformView)
         AndroidViews.View? floatingButton;
         AndroidViews.WindowManagerLayoutParams? layoutParams;
         AndroidViews.IWindowManager? windowManager;
-
-        protected override void ConnectHandler(AppCompatEditText platformView)
+        
+        protected override void ConnectHandler(MauiAppCompatEditText platformView)
         {
             base.ConnectHandler(platformView);
 
@@ -140,8 +140,8 @@ void RemoveFloatingButton()
                 windowManager?.RemoveView(floatingButton);
             }
         }
-
-        protected override void DisconnectHandler(AppCompatEditText platformView)
+        
+        protected override void DisconnectHandler(MauiAppCompatEditText platformView)
         {
             RemoveFloatingButton();
             platformView.FocusChange -= OnFocusChanged;
diff --git a/samples/HorusStudio.Maui.MaterialDesignControls.Sample/HorusStudio.Maui.MaterialDesignControls.Sample.csproj b/samples/HorusStudio.Maui.MaterialDesignControls.Sample/HorusStudio.Maui.MaterialDesignControls.Sample.csproj
@@ -66,6 +66,7 @@
 		<PackageReference Include="Microsoft.Maui.Controls" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
+		<PackageReference Include="Microsoft.Maui.Core" />
 		<PackageReference Include="Microsoft.Toolkit.Mvvm" />
 	</ItemGroup>
 
diff --git a/samples/HorusStudio.Maui.MaterialDesignControls.Sample/Pages/TopAppBarPage.xaml b/samples/HorusStudio.Maui.MaterialDesignControls.Sample/Pages/TopAppBarPage.xaml
@@ -10,18 +10,24 @@
     x:TypeArguments="vm:TopAppBarViewModel"
     x:DataType="vm:TopAppBarViewModel"
     BackgroundColor="{AppThemeBinding Light={x:Static material:MaterialLightTheme.Surface}, Dark={x:Static material:MaterialDarkTheme.Surface}}">
-    <views:ControlPageWithTopAppBar>
+    <views:ControlPageWithTopAppBar
+        AnimateScrollView="True">
         <views:ControlPageWithTopAppBar.PageContent>
             <VerticalStackLayout Spacing="8">
 
                 <material:MaterialCard
                     Style="{StaticResource CardControlContainer}"
                     Padding="24"
                     Margin="0,24,0,0">
-                    <material:MaterialLabel
-                        Text="The MaterialTopAppBar above uses the ScrollViewName to bind the control to a ScrollView and run an animation when scrolling down."
-                        HorizontalOptions="Center"
-                        VerticalOptions="Center" />
+                    <VerticalStackLayout
+                        Spacing="16">
+                        <material:MaterialLabel
+                            Text="Top app bars display navigation, actions, and text at the top of a screen."
+                            Type="TitleMedium" />
+                        <material:MaterialLabel
+                            Text="The MaterialTopAppBar above uses the ScrollViewName to bind the control to a ScrollView and run an animation when scrolling down."
+                            Type="BodyMedium" />
+                    </VerticalStackLayout>
                 </material:MaterialCard>
                 
                 <material:MaterialLabel Style="{StaticResource SectionTitle}" Text="CenterAligned" />
diff --git a/samples/HorusStudio.Maui.MaterialDesignControls.Sample/ViewModels/TopAppBarViewModel.cs b/samples/HorusStudio.Maui.MaterialDesignControls.Sample/ViewModels/TopAppBarViewModel.cs
@@ -23,8 +23,6 @@ public partial class TopAppBarViewModel : BaseViewModel
 
         public TopAppBarViewModel()
         {
-            Subtitle = "Top app bars display navigation, actions, and text at the top of a screen.";
-
             ChangeTrailingIcons();
         }
 
diff --git a/samples/HorusStudio.Maui.MaterialDesignControls.Sample/Views/ControlPageWithTopAppBar.xaml b/samples/HorusStudio.Maui.MaterialDesignControls.Sample/Views/ControlPageWithTopAppBar.xaml
@@ -9,14 +9,14 @@
     <Grid
         RowDefinitions="Auto,*">
         <material:MaterialTopAppBar
+            x:Name="topAppBar"
             AutomationId="topAppBar"
             Headline="{Binding Title}"
             Description="{Binding Subtitle}"
             LeadingIconCommand="{Binding GoBackCommand}"
             LeadingIconIsBusy="{Binding Path=GoBackCommand.IsRunning}"
             LeadingIcon="ic_back.png"
             Type="Large"
-            ScrollViewName="MdcControlPageScroll"
             TrailingIcons="{Binding ContextualActions}" />
         <ScrollView
             Grid.Row="1"
diff --git a/samples/HorusStudio.Maui.MaterialDesignControls.Sample/Views/ControlPageWithTopAppBar.xaml.cs b/samples/HorusStudio.Maui.MaterialDesignControls.Sample/Views/ControlPageWithTopAppBar.xaml.cs
@@ -16,12 +16,26 @@ public partial class ControlPageWithTopAppBar : ContentView
         }
     });
     
+    public static readonly BindableProperty AnimateScrollViewProperty = BindableProperty.Create(nameof(AnimateScrollView), typeof(bool), typeof(ControlPageWithTopAppBar), false, propertyChanged: (bindable, _, newValue) =>
+    {
+        if (bindable is ControlPageWithTopAppBar self && newValue is bool animateScrollView)
+        {
+            self.topAppBar.ScrollViewName = animateScrollView ? "MdcControlPageScroll" : null;
+        }
+    });
+    
     public View? PageContent
     {
         get => (View?)GetValue(PageContentProperty);
         set => SetValue(PageContentProperty, value);
     }
     
+    public bool AnimateScrollView
+    {
+        get => (bool)GetValue(AnimateScrollViewProperty);
+        set => SetValue(AnimateScrollViewProperty, value);
+    }
+    
     public ControlPageWithTopAppBar()
     {
         InitializeComponent();
diff --git a/src/HorusStudio.Maui.MaterialDesignControls/Controls/DatePicker/CustomDatePicker.cs b/src/HorusStudio.Maui.MaterialDesignControls/Controls/DatePicker/CustomDatePicker.cs
@@ -23,7 +23,7 @@ public DateTime? CustomDate
         }
     }
 
-    public DateTime InternalDateTime => base.Date;
+    public DateTime? InternalDateTime => base.Date;
 
     #endregion Attributes
 
diff --git a/src/HorusStudio.Maui.MaterialDesignControls/Controls/TimePicker/CustomTimePicker.cs b/src/HorusStudio.Maui.MaterialDesignControls/Controls/TimePicker/CustomTimePicker.cs
@@ -22,7 +22,7 @@ public TimeSpan? CustomTime
         }
     }
 
-    public TimeSpan InternalTime => base.Time;
+    public TimeSpan? InternalTime => base.Time;
 
     #endregion Attributes
 
diff --git a/src/HorusStudio.Maui.MaterialDesignControls/Controls/TopAppBar/MaterialTopAppBar.cs b/src/HorusStudio.Maui.MaterialDesignControls/Controls/TopAppBar/MaterialTopAppBar.cs
@@ -58,6 +58,7 @@ public enum MaterialTopAppBarType
     /// </example>
     /// <todoList>
     /// * [iOS] The scroll animation has lag by the headline size change
+    /// * [iOS] When using <c>ScrollViewName</c> for collapse/expand animation and setting a <c>Description</c> that wraps to more than one line, layout issues may occur. It is recommended to set <see cref="DescriptionLineBreakMode">DescriptionLineBreakMode</see> to <see cref="LineBreakMode.TailTruncation">LineBreakMode.TailTruncation</see> in this scenario.
     /// </todoList>
     public class MaterialTopAppBar : Grid
     {
@@ -76,6 +77,7 @@ public class MaterialTopAppBar : Grid
         private static readonly BindableProperty.CreateDefaultValueDelegate DefaultDescriptionFontFamily = _ => MaterialFontFamily.Default;
         private const FontAttributes DefaultDescriptionFontAttributes = FontAttributes.None;
         private static readonly Thickness DefaultDescriptionMarginAdjustment = new(DescriptionLateralMargin, 8, DescriptionLateralMargin, 16);
+        private static readonly LineBreakMode DefaultDescriptionLineBreakMode = LineBreakMode.WordWrap;
         private static readonly BindableProperty.CreateDefaultValueDelegate DefaultIconTintColorColor = _ => new AppThemeBindingExtension { Light = MaterialLightTheme.OnSurfaceVariant, Dark = MaterialDarkTheme.OnSurfaceVariant };
         private static readonly ImageSource? DefaultLeadingIcon = null;
         private static readonly ICommand? DefaultLeadingIconCommand = null;
@@ -183,6 +185,11 @@ public class MaterialTopAppBar : Grid
         /// The backing store for the <see cref="DescriptionMarginAdjustment">DescriptionMarginAdjustment</see> bindable property.
         /// </summary>
         public static readonly BindableProperty DescriptionMarginAdjustmentProperty = BindableProperty.Create(nameof(DescriptionMarginAdjustment), typeof(Thickness), typeof(MaterialTopAppBar), defaultValue: DefaultDescriptionMarginAdjustment, BindingMode.OneTime);
+        
+        /// <summary>
+        /// The backing store for the <see cref="DescriptionLineBreakMode">DescriptionLineBreakMode</see> bindable property.
+        /// </summary>
+        public static readonly BindableProperty DescriptionLineBreakModeProperty = BindableProperty.Create(nameof(DescriptionLineBreakMode), typeof(LineBreakMode), typeof(MaterialTopAppBar), defaultValue: DefaultDescriptionLineBreakMode, defaultBindingMode: BindingMode.OneTime);
 
         /// <summary>
         /// The backing store for the <see cref="LeadingIcon">LeadingIcon</see> bindable property.
@@ -471,6 +478,19 @@ public Thickness DescriptionMarginAdjustment
             get => (Thickness)GetValue(DescriptionMarginAdjustmentProperty);
             set => SetValue(DescriptionMarginAdjustmentProperty, value);
         }
+        
+        /// <summary>
+        /// Gets or sets the line break mode for the description text of this top app bar.
+        /// This is a bindable property.
+        /// </summary>
+        /// <default>
+        /// <see cref="LineBreakMode.WordWrap">LineBreakMode.WordWrap</see>
+        /// </default>
+        public LineBreakMode DescriptionLineBreakMode
+        {
+            get => (LineBreakMode)GetValue(DescriptionLineBreakModeProperty);
+            set => SetValue(DescriptionLineBreakModeProperty, value);
+        }
 
         /// <summary>
         /// Allows you to display an icon button on the left side of the top app bar. 
@@ -751,6 +771,7 @@ private void CreateLayout()
             _descriptionLabel.SetBinding(MaterialLabel.FontFamilyProperty, new Binding(nameof(DescriptionFontFamily), source: this));
             _descriptionLabel.SetBinding(MaterialLabel.FontAttributesProperty, new Binding(nameof(DescriptionFontAttributes), source: this));
             _descriptionLabel.SetBinding(MaterialLabel.MarginProperty, new Binding(nameof(DescriptionMarginAdjustment), source: this));
+            _descriptionLabel.SetBinding(MaterialLabel.LineBreakModeProperty, new Binding(nameof(DescriptionLineBreakMode), source: this));
             _descriptionLabel.SetBinding(MaterialLabel.AutomationIdProperty, new Binding(nameof(AutomationId), source: this, converter: new AutomationIdConverter(), converterParameter: "Description"));
             this.Add(_descriptionLabel, 0, 1);
             Grid.SetColumnSpan(_descriptionLabel, 3);
diff --git a/src/HorusStudio.Maui.MaterialDesignControls/Extensions/Alignment/TextAlignmentExtensions.Android.cs b/src/HorusStudio.Maui.MaterialDesignControls/Extensions/Alignment/TextAlignmentExtensions.Android.cs
@@ -1,26 +1,26 @@
-﻿using Android.Views;
+﻿using AndroidViews = Android.Views;
 
 namespace Microsoft.Maui;
 
 static class TextAlignmentExtensions
 {
-    public static GravityFlags ToGravityFlags(this TextAlignment textAlignment)
+    public static AndroidViews.GravityFlags ToGravityFlags(this TextAlignment textAlignment)
     {
         return textAlignment switch
         {
-            TextAlignment.Start => GravityFlags.Left,
-            TextAlignment.Center => GravityFlags.Center,
-            _ => GravityFlags.Right
+            TextAlignment.Start => AndroidViews.GravityFlags.Left,
+            TextAlignment.Center => AndroidViews.GravityFlags.Center,
+            _ => AndroidViews.GravityFlags.Right
         };
     }
 
-    public static Android.Views.TextAlignment ToAndroid(this TextAlignment textAlignment)
+    public static AndroidViews.TextAlignment ToAndroid(this TextAlignment textAlignment)
     {
         return textAlignment switch
         {
-            TextAlignment.Start => Android.Views.TextAlignment.TextStart,
-            TextAlignment.Center => Android.Views.TextAlignment.Center,
-            _ => Android.Views.TextAlignment.TextEnd
+            TextAlignment.Start => AndroidViews.TextAlignment.TextStart,
+            TextAlignment.Center => AndroidViews.TextAlignment.Center,
+            _ => AndroidViews.TextAlignment.TextEnd
         };
     }
 }
diff --git a/src/HorusStudio.Maui.MaterialDesignControls/Extensions/Image/ImageSourceExtensions.Android.cs b/src/HorusStudio.Maui.MaterialDesignControls/Extensions/Image/ImageSourceExtensions.Android.cs
@@ -1,4 +1,5 @@
 ﻿using Android.Graphics.Drawables;
+using AndroidGraphics = Android.Graphics;
 using Microsoft.Maui.Platform;
 
 namespace Microsoft.Maui.Controls;
@@ -11,13 +12,13 @@ static partial class ImageSourceExtensions
         
         var currentApp = Microsoft.Maui.ApplicationModel.Platform.AppContext;
         var imgId = currentApp.GetDrawableId(iconSource);
-        var bmp = Android.Graphics.BitmapFactory.DecodeResource(currentApp.Resources, imgId);
+        var bmp = AndroidGraphics.BitmapFactory.DecodeResource(currentApp.Resources, imgId);
         if (bmp == null) return null;
 
         if (size != null)
         {
             var iconSizeInDp = Convert.ToInt32(size).DpToPixels();
-            bmp = Android.Graphics.Bitmap.CreateScaledBitmap(bmp, iconSizeInDp, iconSizeInDp, true);    
+            bmp = AndroidGraphics.Bitmap.CreateScaledBitmap(bmp, iconSizeInDp, iconSizeInDp, true);    
         }
         
         var icon = new BitmapDrawable(currentApp.Resources, bmp);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "allowPrerelease": false`
	`3`	`+ "allowPrerelease": false,`
	`4`	`+ "version": "10.0.100"`
`4`	`5`	`}`
`5`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ protected override void ConnectHandler(MauiTextField platformView)`
`51`	`51`	`AndroidViews.View? floatingButton;`
`52`	`52`	`AndroidViews.WindowManagerLayoutParams? layoutParams;`
`53`	`53`	`AndroidViews.IWindowManager? windowManager;`
`54`		`-`
`55`		`- protected override void ConnectHandler(AppCompatEditText platformView)`
	`54`	`+`
	`55`	`+ protected override void ConnectHandler(MauiAppCompatEditText platformView)`
`56`	`56`	`{`
`57`	`57`	`base.ConnectHandler(platformView);`
`58`	`58`
`@@ -140,8 +140,8 @@ void RemoveFloatingButton()`
`140`	`140`	`windowManager?.RemoveView(floatingButton);`
`141`	`141`	`}`
`142`	`142`	`}`
`143`		`-`
`144`		`- protected override void DisconnectHandler(AppCompatEditText platformView)`
	`143`	`+`
	`144`	`+ protected override void DisconnectHandler(MauiAppCompatEditText platformView)`
`145`	`145`	`{`
`146`	`146`	`RemoveFloatingButton();`
`147`	`147`	`platformView.FocusChange -= OnFocusChanged;`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ public partial class TopAppBarViewModel : BaseViewModel`
`23`	`23`
`24`	`24`	`public TopAppBarViewModel()`
`25`	`25`	`{`
`26`		`- Subtitle = "Top app bars display navigation, actions, and text at the top of a screen.";`
`27`		`-`
`28`	`26`	`ChangeTrailingIcons();`
`29`	`27`	`}`
`30`	`28`