Merge branch 'develop'

Author: AgustinBonilla

nuget.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup Condition=" $(MSBuildProjectName.Equals('HorusStudio.Maui.MaterialDesignControls')) ">
     <PackageId>HorusStudio.Maui.MaterialDesignControls</PackageId>
-    <Version>10.0.0</Version>
+    <Version>10.0.1</Version>
     <Authors>Horus Studio and contributors</Authors>
     <Company>Horus Studio</Company>
     <Title>Material Design Controls for .NET MAUI</Title>
@@ -15,7 +15,7 @@
     <PackageTags>dotnet-maui;dotnet;maui;cross-platform;android;ios;macos;maccatalyst;materialdesign;ui</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>
-- Add net10.0 support
+- Add independent LabelColor support for NavigationDrawer items
     </PackageReleaseNotes>
     <PackageOutputPath>$(MSBuildThisFileDirectory)Artifacts</PackageOutputPath>
     <EscapedCurrentDirectory>$([System.Text.RegularExpressions.Regex]::Escape('$(MSBuildThisFileDirectory)'))</EscapedCurrentDirectory>

samples/HorusStudio.Maui.MaterialDesignControls.Sample/ViewModels/NavigationDrawerViewModel.cs

@@ -99,6 +99,8 @@ private void LoadItems(bool includeAllItems)
                     SelectedLeadingIcon = "trash.png",
                     LeadingIcon = "trash.png",
                     Text = "Trash",
+                    LabelColor = Colors.Red,
+                    ActiveIndicatorLabelColor = Colors.Red
                 },
                 new()
                 {

src/HorusStudio.Maui.MaterialDesignControls/Controls/NavigationDrawer/MaterialNavigationDrawer.cs

@@ -1155,15 +1155,25 @@ private void SetLabelTextColorPropertyBindings(MaterialLabel label, MaterialNavi
                 new Binding(nameof(item.IsSelected), source: item),
                 new Binding(nameof(ActiveIndicatorLabelColor), source: this),
                 new Binding(nameof(LabelColor), source: this),
-                new Binding(nameof(DisabledLabelColor), source: this)
+                new Binding(nameof(DisabledLabelColor), source: this),
+                new Binding(nameof(item.LabelColor), source: item),
+                new Binding(nameof(item.ActiveIndicatorLabelColor), source: item)
             },
             Converter = new MultiValueConverter((values, targetType, parameter, culture) =>
             {
                 var isEnabled = (bool)values[0];
                 var isSelected = (bool)values[1];
-                var activeIndicatorLabelColor = (Color)values[2];
-                var labelColor = (Color)values[3];
+                var drawerActiveIndicatorLabelColor = (Color)values[2];
+                var drawerLabelColor = (Color)values[3];
                 var disabledLabelColor = (Color)values[4];
+                var itemLabelColor = (Color?)values[5];
+                var itemActiveIndicatorLabelColor = (Color?)values[6];
+
+                // If item has its own LabelColor, use it instead of drawer's LabelColor
+                var labelColor = itemLabelColor ?? drawerLabelColor;
+                
+                // If item has its own ActiveIndicatorLabelColor, use it instead of drawer's ActiveIndicatorLabelColor
+                var activeIndicatorLabelColor = itemActiveIndicatorLabelColor ?? drawerActiveIndicatorLabelColor;
 
                 return isEnabled ? (isSelected ? activeIndicatorLabelColor : labelColor) : disabledLabelColor;
             })
@@ -1177,16 +1187,30 @@ private void SetIconTintColorPropertyBindings(IconTintColorBehavior iconTintColo
             Bindings = new Collection<BindingBase>
             {
                 new Binding(nameof(item.IsEnabled), source: item),
+                new Binding(nameof(item.IsSelected), source: item),
+                new Binding(nameof(ActiveIndicatorLabelColor), source: this),
                 new Binding(nameof(LabelColor), source: this),
-                new Binding(nameof(DisabledLabelColor), source: this)
+                new Binding(nameof(DisabledLabelColor), source: this),
+                new Binding(nameof(item.LabelColor), source: item),
+                new Binding(nameof(item.ActiveIndicatorLabelColor), source: item)
             },
             Converter = new MultiValueConverter((values, targetType, parameter, culture) =>
             {
                 var isEnabled = (bool)values[0];
-                var labelColor = (Color)values[1];
-                var disabledLabelColor = (Color)values[2];
+                var isSelected = (bool)values[1];
+                var drawerActiveIndicatorLabelColor = (Color)values[2];
+                var drawerLabelColor = (Color)values[3];
+                var disabledLabelColor = (Color)values[4];
+                var itemLabelColor = (Color?)values[5];
+                var itemActiveIndicatorLabelColor = (Color?)values[6];
+
+                // If item has its own LabelColor, use it instead of drawer's LabelColor
+                var labelColor = itemLabelColor ?? drawerLabelColor;
+                
+                // If item has its own ActiveIndicatorLabelColor, use it instead of drawer's ActiveIndicatorLabelColor
+                var activeIndicatorLabelColor = itemActiveIndicatorLabelColor ?? drawerActiveIndicatorLabelColor;
 
-                return isEnabled ? labelColor : disabledLabelColor;
+                return isEnabled ? (isSelected ? activeIndicatorLabelColor : labelColor) : disabledLabelColor;
             })
         });
     }

src/HorusStudio.Maui.MaterialDesignControls/Controls/NavigationDrawer/MaterialNavigationDrawerItem.cs

@@ -22,6 +22,8 @@ public class MaterialNavigationDrawerItem : INotifyPropertyChanged
     private bool _isSelected;
     private bool _isEnabled = true;
     private string _automationId = null!;
+    private Color? _labelColor;
+    private Color? _activeIndicatorLabelColor;
 
     #endregion Attributes
 
@@ -149,6 +151,26 @@ public string AutomationId
         set => SetProperty(ref _automationId, value);
     }
 
+    /// <summary>
+    /// Gets or sets the label color for this item. If null, falls back to the MaterialNavigationDrawer's LabelColor.
+    /// This color is also applied to the leading and trailing icons when ApplyLeadingIconTintColor or ApplyTrailingIconTintColor is true.
+    /// </summary>
+    public Color? LabelColor
+    {
+        get => _labelColor;
+        set => SetProperty(ref _labelColor, value);
+    }
+    
+    /// <summary>
+    /// Gets or sets the active indicator label color for this item when selected. If null, falls back to the MaterialNavigationDrawer's ActiveIndicatorLabelColor.
+    /// This color is also applied to the leading and trailing icons when the item is selected and ApplyLeadingIconTintColor or ApplyTrailingIconTintColor is true.
+    /// </summary>
+    public Color? ActiveIndicatorLabelColor
+    {
+        get => _activeIndicatorLabelColor;
+        set => SetProperty(ref _activeIndicatorLabelColor, value);
+    }
+    
     /// <inheritdoc />
     public event PropertyChangedEventHandler? PropertyChanged;