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

fix(CalendarView): Adjust Material CalendarView style #1241

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(CalendarView): Adjust Material CalendarView style #1241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e740da0
fix(CalendarView): Adjust Material CalendarView style
eriklimakc Oct 11, 2023
8fadf6e
chore: Update Calendar Today's foreground and background
eriklimakc Dec 7, 2023
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
50 changes: 10 additions & 40 deletions src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,25 @@
<Setter Property="CalendarItemBorderBrush"
Value="{ThemeResource CalendarViewCalendarItemRevealBorderBrush}" />
<Setter Property="TodayForeground"
Value="{StaticResource MaterialCalendarViewTodayForeground}" />
Value="{ThemeResource OnPrimaryContainerBrush}" />
<Setter Property="BlackoutForeground"
Value="{StaticResource MaterialCalendarViewBlackoutForeground}" />
<Setter Property="SelectedForeground"
Value="{ThemeResource OnPrimaryBrush}" />
<Setter Property="PressedForeground"
Value="{ThemeResource CalendarViewPressedForeground}" />
<Setter Property="OutOfScopeForeground"
Value="{ThemeResource CalendarViewOutOfScopeForeground}" />
Value="{ThemeResource OnSurfaceLowBrush}" />
<Setter Property="CalendarItemForeground"
Value="{ThemeResource CalendarViewCalendarItemForeground}" />
<Setter Property="OutOfScopeBackground"
Value="{ThemeResource CalendarViewOutOfScopeBackground}" />
Value="Transparent" />
<Setter Property="CalendarItemBackground"
Value="{ThemeResource CalendarViewCalendarItemRevealBackground}" />
<Setter Property="Foreground"
Value="{ThemeResource OnPrimaryBrush}" />
Value="{ThemeResource OnSurfaceVariantBrush}" />
<Setter Property="Background"
Value="{ThemeResource PrimaryBrush}" />
Value="{ThemeResource SurfaceBrush}" />
<Setter Property="BorderBrush"
Value="{ThemeResource SurfaceBrush}" />
<Setter Property="DayItemFontFamily"
Expand Down Expand Up @@ -99,7 +99,7 @@
<not_win:Setter Property="TodaySelectedBackground"
Value="{ThemeResource PrimaryBrush}" />
<not_win:Setter Property="TodayBackground"
Value="Transparent" />
Value="{ThemeResource PrimaryContainerBrush}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="CalendarView">
Expand Down Expand Up @@ -146,20 +146,8 @@
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="Text.BorderBrush"
Value="{ThemeResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
<Setter Target="Text.Foreground"
Value="{ThemeResource OnPrimaryMediumBrush}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Target="Text.Foreground"
Value="{ThemeResource OnPrimaryLowBrush}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="PointerOver" />
<VisualState x:Name="Pressed" />
<VisualState x:Name="Disabled" />
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
Expand Down Expand Up @@ -203,26 +191,8 @@
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />

<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="Text.BorderBrush"
Value="{ThemeResource CalendarViewNavigationButtonBorderBrushPointerOver}" />
<Setter Target="Text.Foreground"
Value="{ThemeResource OnPrimaryMediumBrush}" />
<Setter Target="DownArrowGlyph.Fill"
Value="{ThemeResource OnPrimaryMediumBrush}" />
</VisualState.Setters>
</VisualState>

<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Target="Text.Foreground"
Value="{ThemeResource OnPrimaryLowBrush}" />
<Setter Target="DownArrowGlyph.Fill"
Value="{ThemeResource OnPrimaryLowBrush}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="PointerOver" />
<VisualState x:Name="Pressed" />
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="DownArrowGlyph.Opacity"
Expand Down
Loading