chore: Use InfoBadge for TabBarItem badge support #1142
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| using System; | ||
| using System.Windows.Input; | ||
| using MUXC = Microsoft.UI.Xaml.Controls; | ||
|
|
||
| #if IS_WINUI | ||
| using Microsoft.UI.Xaml; | ||
|
|
@@ -29,26 +28,64 @@ public IconElement? Icon | |
| DependencyProperty.Register(nameof(Icon), typeof(IconElement), typeof(TabBarItem), new PropertyMetadata(null, OnPropertyChanged)); | ||
| #endregion | ||
|
|
||
| // UNO TODO: Deprecate and remove BadgeVisibility and BadgeValue properties and use InfoBadge instead | ||
|
There was a problem hiding this comment. Do we have an issue to track in Toolkit to do this for the next major version bump? Do we have docs written in the migration section for this deprecation or recommendation to use InfoBadge explicitly? There was a problem hiding this comment. Thanks @kazo0, I will take a look 👍 |
||
| #region BadgeVisibility | ||
morning4coffe-dev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| [Obsolete("This property is deprecated. Use InfoBadge instead.", false)] | ||
| public Visibility BadgeVisibility | ||
| { | ||
| get => InfoBadge?.Visibility ?? (Visibility)GetValue(BadgeVisibilityProperty); | ||
| set | ||
| { | ||
| SetValue(BadgeVisibilityProperty, value); | ||
|
|
||
| InfoBadge ??= new MUXC.InfoBadge(); | ||
| InfoBadge.Visibility = value; | ||
| } | ||
| } | ||
|
|
||
| [Obsolete("This property is deprecated. Use InfoBadge instead.", false)] | ||
| public static readonly DependencyProperty BadgeVisibilityProperty = | ||
| DependencyProperty.Register(nameof(BadgeVisibility), typeof(Visibility), typeof(TabBarItem), new PropertyMetadata(Visibility.Collapsed, OnPropertyChanged)); | ||
| #endregion | ||
|
|
||
| #region BadgeValue | ||
| [Obsolete("This property is deprecated. Use InfoBadge instead.", false)] | ||
| public string? BadgeValue | ||
| { | ||
| get => (InfoBadge as MUXC.InfoBadge)?.Value.ToString() ?? (string)GetValue(BadgeValueProperty); | ||
| set | ||
| { | ||
| SetValue(BadgeValueProperty, value); | ||
|
|
||
| InfoBadge ??= new MUXC.InfoBadge(); | ||
|
|
||
| if (InfoBadge is MUXC.InfoBadge infoBadge) | ||
| { | ||
| if (int.TryParse(value, out int intValue)) | ||
| { | ||
| infoBadge.Value = intValue; | ||
| } | ||
| else | ||
| { | ||
| infoBadge.IconSource = new MUXC.FontIconSource { Glyph = value }; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| [Obsolete("This property is deprecated. Use InfoBadge instead.", false)] | ||
| public static readonly DependencyProperty BadgeValueProperty = | ||
| DependencyProperty.Register(nameof(BadgeValue), typeof(string), typeof(TabBarItem), new PropertyMetadata(default(string?), OnPropertyChanged)); | ||
| #endregion | ||
|
|
||
| #region InfoBadge | ||
MartinZikmund marked this conversation as resolved.
Show resolved
Hide resolved
morning4coffe-dev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| public Control InfoBadge | ||
| { | ||
| get => (Control)GetValue(InfoBadgeProperty); | ||
| set => SetValue(InfoBadgeProperty, value); | ||
| } | ||
|
|
||
| public static readonly DependencyProperty InfoBadgeProperty = | ||
| DependencyProperty.Register(nameof(InfoBadge), typeof(Control), typeof(TabBarItem), new PropertyMetadata(null, OnPropertyChanged)); | ||
morning4coffe-dev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| #endregion | ||
|
|
||
| #region IsSelectable | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:muxc="using:Microsoft.UI.Xaml.Controls" | ||
| mc:Ignorable="d"> | ||
|
|
||
| <!-- InfoBadge BottomTabBarItem Resources and Styles --> | ||
|
|
||
| <!-- Common --> | ||
| <StaticResource x:Key="MaterialInfoBadgeBottomTabBarItemBackground" | ||
| ResourceKey="ErrorBrush" /> | ||
| <StaticResource x:Key="MaterialInfoBadgeBottomTabBarItemForeground" | ||
| ResourceKey="OnErrorBrush" /> | ||
|
|
||
| <!-- Small InfoBadge--> | ||
| <x:Double x:Key="MaterialSmallInfoBadgeBottomTabBarItemHeight">6</x:Double> | ||
| <x:Double x:Key="MaterialSmallInfoBadgeBottomTabBarItemWidth">6</x:Double> | ||
| <Thickness x:Key="MaterialSmallInfoBadgeBottomTabBarItemMargin">0,4,20,0</Thickness> | ||
|
|
||
|
|
||
| <!-- Large InfoBadge--> | ||
| <x:Double x:Key="MaterialLargeInfoBadgeBottomTabBarItemHeight">16</x:Double> | ||
| <Thickness x:Key="MaterialLargeInfoBadgeBottomTabBarItemMargin">32,4,0,0</Thickness> | ||
| <CornerRadius x:Key="MaterialLargeInfoBadgeBottomTabBarItemCornerRadius">8</CornerRadius> | ||
|
Comment on lines
+11
to
+25
There was a problem hiding this comment. These need to be inside of ThemeDictionaries to be able to be overridden via lightweight styling |
||
|
|
||
| <Style x:Key="MaterialSmallInfoBadgeBottomTabBarItemStyle" | ||
| TargetType="muxc:InfoBadge"> | ||
| <Setter Property="Background" | ||
| Value="{ThemeResource MaterialInfoBadgeBottomTabBarItemBackground}" /> | ||
| <Setter Property="HorizontalAlignment" | ||
| Value="Right" /> | ||
| <Setter Property="VerticalAlignment" | ||
| Value="Top" /> | ||
| <Setter Property="Height" | ||
| Value="{ThemeResource MaterialSmallInfoBadgeBottomTabBarItemHeight}" /> | ||
| <Setter Property="Width" | ||
| Value="{ThemeResource MaterialSmallInfoBadgeBottomTabBarItemWidth}" /> | ||
| <Setter Property="Margin" | ||
| Value="{ThemeResource MaterialSmallInfoBadgeBottomTabBarItemMargin}" /> | ||
| </Style> | ||
|
|
||
| <Style x:Key="MaterialLargeInfoBadgeBottomTabBarItemStyle" | ||
| TargetType="muxc:InfoBadge"> | ||
| <Setter Property="Background" | ||
| Value="{ThemeResource MaterialInfoBadgeBottomTabBarItemBackground}" /> | ||
| <Setter Property="Foreground" | ||
| Value="{ThemeResource MaterialInfoBadgeBottomTabBarItemForeground}" /> | ||
| <Setter Property="HorizontalAlignment" | ||
| Value="Left" /> | ||
| <Setter Property="VerticalAlignment" | ||
| Value="Top" /> | ||
| <Setter Property="VerticalContentAlignment" | ||
| Value="Center" /> | ||
| <Setter Property="Height" | ||
| Value="{ThemeResource MaterialLargeInfoBadgeBottomTabBarItemHeight}" /> | ||
| <Setter Property="Margin" | ||
| Value="{ThemeResource MaterialLargeInfoBadgeBottomTabBarItemMargin}" /> | ||
| <Setter Property="CornerRadius" | ||
| Value="{ThemeResource MaterialLargeInfoBadgeBottomTabBarItemCornerRadius}" /> | ||
| <!-- Label ExtraSmall --> | ||
| <Setter Property="FontFamily" | ||
| Value="{StaticResource MaterialLabelSmallFontFamily}" /> | ||
| <Setter Property="FontWeight" | ||
| Value="{StaticResource MaterialLabelSmallFontWeight}" /> | ||
| <Setter Property="FontSize" | ||
| Value="{StaticResource MaterialLabelSmallFontSize}" /> | ||
| <Setter Property="CharacterSpacing" | ||
| Value="{StaticResource MaterialLabelSmallCharacterSpacing}" /> | ||
| </Style> | ||
|
|
||
| </ResourceDictionary> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.