Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: expose base navigation and fab tabbaritem styles #1040

Merged
merged 1 commit into from
Feb 13, 2024
Merged

chore: expose base navigation and fab tabbaritem styles #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/controls-styles.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ Exposes visual states as attachable properties that lets you bind a string on a
| `utu:TabBar` | `TopTabBarStyle` | |
| `utu:TabBar` | `ColoredTopTabBarStyle` | |
| `utu:TabBar` | `VerticalTabBarStyle` | |
| `utu:TabBarItem` | `FabTabBarItemStyle` | |
| `utu:TabBarItem` | `NavigationTabBarItemStyle` | |
| `utu:TabBarItem` | `BottomFabTabBarItemStyle` | |
| `utu:TabBarItem` | `BottomTabBarItemStyle` | |
| `utu:TabBarItem` | `VerticalTabBarItemStyle` | |
Expand Down
21 changes: 15 additions & 6 deletions src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,14 +834,19 @@
</Setter>
</Style>

<Style
<Style
x:Key="MaterialNavigationTabBarItemStyle"
BasedOn="{StaticResource MaterialBaseNavigationTabBarItemStyle}"
TargetType="utu:TabBarItem" />

<Style
x:Key="MaterialVerticalTabBarItemStyle"
BasedOn="{StaticResource MaterialBaseNavigationTabBarItemStyle}"
BasedOn="{StaticResource MaterialNavigationTabBarItemStyle}"
TargetType="utu:TabBarItem" />

<Style
x:Key="MaterialBottomTabBarItemStyle"
BasedOn="{StaticResource MaterialBaseNavigationTabBarItemStyle}"
BasedOn="{StaticResource MaterialNavigationTabBarItemStyle}"
TargetType="utu:TabBarItem" />

<Style x:Key="MaterialTopTabBarItemStyle" TargetType="utu:TabBarItem">
Expand Down Expand Up @@ -1277,14 +1282,18 @@
</Setter>
</Style>

<Style
<Style x:Key="MaterialFabTabBarItemStyle"
BasedOn="{StaticResource MaterialBaseFabTabBarItemStyle}"
TargetType="utu:TabBarItem" />

<Style
x:Key="MaterialVerticalFabTabBarItemStyle"
BasedOn="{StaticResource MaterialBaseFabTabBarItemStyle}"
BasedOn="{StaticResource MaterialFabTabBarItemStyle}"
TargetType="utu:TabBarItem" />

<Style
x:Key="MaterialBottomFabTabBarItemStyle"
BasedOn="{StaticResource MaterialBaseFabTabBarItemStyle}"
BasedOn="{StaticResource MaterialFabTabBarItemStyle}"
TargetType="utu:TabBarItem">
<!-- KNOWN ISSUE: The part of the FAB that is translated outside of the TabBar bounds is not clickable -->
<!-- https://github.com/unoplatform/uno/issues/7393 -->
Expand Down
2 changes: 2 additions & 0 deletions src/library/Uno.Toolkit.Material/Styles/Controls/v2/_Common.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,6 @@
<StaticResource x:Key="ElevatedCardContentControlStyle" ResourceKey="MaterialElevatedCardContentControlStyle" />
<StaticResource x:Key="VerticalTabBarStyle" ResourceKey="MaterialVerticalTabBarStyle" />
<StaticResource x:Key="VerticalTabBarItemStyle" ResourceKey="MaterialVerticalTabBarItemStyle" />
<StaticResource x:Key="FabTabBarItemStyle" ResourceKey="MaterialFabTabBarItemStyle" />
<StaticResource x:Key="NavigationTabBarItemStyle" ResourceKey="MaterialNavigationTabBarItemStyle" />
</ResourceDictionary>
6 changes: 6 additions & 0 deletions src/library/Uno.Toolkit.WinUI.Markup/Theme/TabBarItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,11 +554,17 @@ public static partial class Styles
[ResourceKeyDefinition(typeof(Style), "ColoredTopTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
public static StaticResourceKey<Style> ColoredTop => new("ColoredTopTabBarItemStyle");

[ResourceKeyDefinition(typeof(Style), "FabTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
public static StaticResourceKey<Style> Fab => new("FabTabBarItemStyle");

[ResourceKeyDefinition(typeof(Style), "VerticalFabTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
public static StaticResourceKey<Style> VerticalFab => new("VerticalFabTabBarItemStyle");

[ResourceKeyDefinition(typeof(Style), "BottomFabTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
public static StaticResourceKey<Style> BottomFab => new("BottomFabTabBarItemStyle");

[ResourceKeyDefinition(typeof(Style), "NavigationTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
public static StaticResourceKey<Style> Navigation => new("NavigationTabBarItemStyle");
}
}
}
Loading