Skip to content

Commit

Permalink
chore: wip (to rebase)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xiaoy312
Xiaoy312 committed Oct 10, 2023
1 parent d1d249d commit 511a58d
Show file tree
Hide file tree
Showing 21 changed files with 239 additions and 230 deletions.
55 changes: 28 additions & 27 deletions src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using Windows.UI;
using Microsoft.UI.Text;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
Expand All @@ -9,13 +10,13 @@ namespace Uno.Themes.Markup
{
public static partial class Theme
{
public static class Button
public static partial class Button
{
public static class Resources
public static partial class Resources
{
public static class Elevated
public static partial class Elevated
{
public static class Background
public static partial class Background
{
[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackground")]
public static ThemeResourceKey<Brush> Default => new("ElevatedButtonBackground");
Expand All @@ -35,7 +36,7 @@ public static class Background
[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBackgroundPressed")]
public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonBackgroundPressed");
}
public static class BorderBrush
public static partial class BorderBrush
{
[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrush")]
public static ThemeResourceKey<Brush> Default => new("ElevatedButtonBorderBrush");
Expand All @@ -55,15 +56,15 @@ public static class BorderBrush
[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonBorderBrushPressed")]
public static ThemeResourceKey<Brush> Pressed => new("ElevatedButtonBorderBrushPressed");
}
public static class Margin
public static partial class Margin
{
[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonMargin")]
public static ThemeResourceKey<Thickness> Default => new("ElevatedButtonMargin");

[ResourceKeyDefinition(typeof(Thickness), "ElevatedButtonDisabledMargin")]
public static ThemeResourceKey<Thickness> Disabled => new("ElevatedButtonDisabledMargin");
}
public static class StateLayerBackground
public static partial class StateLayerBackground
{
[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonStateLayerBackgroundFocused")]
public static ThemeResourceKey<Brush> Focused => new("ElevatedButtonStateLayerBackgroundFocused");
Expand All @@ -89,9 +90,9 @@ public static class StateLayerBackground
[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevationDisabled")]
public static ThemeResourceKey<double> ElevationDisabled => new("ElevatedButtonElevationDisabled");
}
public static class Filled
public static partial class Filled
{
public static class Background
public static partial class Background
{
[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackground")]
public static ThemeResourceKey<Brush> Default => new("FilledButtonBackground");
Expand All @@ -111,7 +112,7 @@ public static class Background
[ResourceKeyDefinition(typeof(Brush), "FilledButtonBackgroundPressed")]
public static ThemeResourceKey<Brush> Pressed => new("FilledButtonBackgroundPressed");
}
public static class BorderBrush
public static partial class BorderBrush
{
[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrush")]
public static ThemeResourceKey<Brush> Default => new("FilledButtonBorderBrush");
Expand All @@ -131,7 +132,7 @@ public static class BorderBrush
[ResourceKeyDefinition(typeof(Brush), "FilledButtonBorderBrushPressed")]
public static ThemeResourceKey<Brush> Pressed => new("FilledButtonBorderBrushPressed");
}
public static class StateLayerBackground
public static partial class StateLayerBackground
{
[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundFocused")]
public static ThemeResourceKey<Brush> Focused => new("FilledButtonStateLayerBackgroundFocused");
Expand All @@ -154,9 +155,9 @@ public static class StateLayerBackground
[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
}
public static class FilledTonal
public static partial class FilledTonal
{
public static class Background
public static partial class Background
{
[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackground")]
public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonBackground");
Expand All @@ -176,7 +177,7 @@ public static class Background
[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBackgroundPressed")]
public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonBackgroundPressed");
}
public static class BorderBrush
public static partial class BorderBrush
{
[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrush")]
public static ThemeResourceKey<Brush> Default => new("FilledTonalButtonBorderBrush");
Expand All @@ -196,7 +197,7 @@ public static class BorderBrush
[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonBorderBrushPressed")]
public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonBorderBrushPressed");
}
public static class StateLayerBackground
public static partial class StateLayerBackground
{
[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundFocused")]
public static ThemeResourceKey<Brush> Focused => new("FilledTonalButtonStateLayerBackgroundFocused");
Expand All @@ -219,17 +220,17 @@ public static class StateLayerBackground
[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
}
public static class Icon
public static partial class Icon
{
public static class Ellipse
public static partial class Ellipse
{
[ResourceKeyDefinition(typeof(string), "IconButtonEllipseHorizontalAlignment")]
public static StaticResourceKey<string> HorizontalAlignment => new("IconButtonEllipseHorizontalAlignment");

[ResourceKeyDefinition(typeof(string), "IconButtonEllipseVerticalAlignment")]
public static StaticResourceKey<string> VerticalAlignment => new("IconButtonEllipseVerticalAlignment");
}
public static class OpacityHiddenState
public static partial class OpacityHiddenState
{
[ResourceKeyDefinition(typeof(double), "IconButtonOpacityHiddenState")]
public static ThemeResourceKey<double> Default => new("IconButtonOpacityHiddenState");
Expand All @@ -252,9 +253,9 @@ public static class OpacityHiddenState
[ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")]
public static ThemeResourceKey<Brush> ForegroundDisabled => new("IconButtonForegroundDisabled");
}
public static class Outlined
public static partial class Outlined
{
public static class Background
public static partial class Background
{
[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackground")]
public static ThemeResourceKey<Brush> Default => new("OutlinedButtonBackground");
Expand All @@ -271,7 +272,7 @@ public static class Background
[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBackgroundPressed")]
public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonBackgroundPressed");
}
public static class BorderBrush
public static partial class BorderBrush
{
[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrush")]
public static ThemeResourceKey<Brush> Default => new("OutlinedButtonBorderBrush");
Expand All @@ -291,7 +292,7 @@ public static class BorderBrush
[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonBorderBrushPressed")]
public static ThemeResourceKey<Brush> Pressed => new("OutlinedButtonBorderBrushPressed");
}
public static class StateLayerBackground
public static partial class StateLayerBackground
{
[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonStateLayerBackgroundFocused")]
public static ThemeResourceKey<Brush> Focused => new("OutlinedButtonStateLayerBackgroundFocused");
Expand All @@ -311,9 +312,9 @@ public static class StateLayerBackground
[ResourceKeyDefinition(typeof(Brush), "OutlinedButtonForeground")]
public static ThemeResourceKey<Brush> Foreground => new("OutlinedButtonForeground");
}
public static class Text
public static partial class Text
{
public static class Background
public static partial class Background
{
[ResourceKeyDefinition(typeof(Brush), "TextButtonBackground")]
public static ThemeResourceKey<Brush> Default => new("TextButtonBackground");
Expand All @@ -330,7 +331,7 @@ public static class Background
[ResourceKeyDefinition(typeof(Brush), "TextButtonBackgroundPressed")]
public static ThemeResourceKey<Brush> Pressed => new("TextButtonBackgroundPressed");
}
public static class BorderBrush
public static partial class BorderBrush
{
[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrush")]
public static ThemeResourceKey<Brush> Default => new("TextButtonBorderBrush");
Expand All @@ -350,7 +351,7 @@ public static class BorderBrush
[ResourceKeyDefinition(typeof(Brush), "TextButtonBorderBrushPressed")]
public static ThemeResourceKey<Brush> Pressed => new("TextButtonBorderBrushPressed");
}
public static class StateLayerBackground
public static partial class StateLayerBackground
{
[ResourceKeyDefinition(typeof(Brush), "TextButtonStateLayerBackgroundFocused")]
public static ThemeResourceKey<Brush> Focused => new("TextButtonStateLayerBackgroundFocused");
Expand Down Expand Up @@ -391,7 +392,7 @@ public static class StateLayerBackground
[ResourceKeyDefinition(typeof(string), "ButtonVerticalContentAlignment")]
public static StaticResourceKey<string> VerticalContentAlignment => new("ButtonVerticalContentAlignment");
}
public static class Styles
public static partial class Styles
{
[ResourceKeyDefinition(typeof(Style), "MaterialElevatedButtonStyle", TargetType = typeof(Style))]
public static StaticResourceKey<Style> Elevated => new("MaterialElevatedButtonStyle");
Expand Down
15 changes: 8 additions & 7 deletions src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using Windows.UI;
using Microsoft.UI.Text;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
Expand All @@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
{
public static partial class Theme
{
public static class CalendarDatePicker
public static partial class CalendarDatePicker
{
public static class Resources
public static partial class Resources
{
public static class Background
public static partial class Background
{
[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackground")]
public static ThemeResourceKey<Brush> Default => new("CalendarDatePickerBackground");
Expand All @@ -30,7 +31,7 @@ public static class Background
[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBackgroundPressed")]
public static ThemeResourceKey<Brush> Pressed => new("CalendarDatePickerBackgroundPressed");
}
public static class BorderBrush
public static partial class BorderBrush
{
[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrush")]
public static ThemeResourceKey<Brush> Default => new("CalendarDatePickerBorderBrush");
Expand All @@ -44,15 +45,15 @@ public static class BorderBrush
[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBorderBrushPressed")]
public static ThemeResourceKey<Brush> Pressed => new("CalendarDatePickerBorderBrushPressed");
}
public static class Header
public static partial class Header
{
[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForeground")]
public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerHeaderForeground");

[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerHeaderForegroundDisabled")]
public static ThemeResourceKey<Brush> ForegroundDisabled => new("CalendarDatePickerHeaderForegroundDisabled");
}
public static class TextForeground
public static partial class TextForeground
{
[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForeground")]
public static ThemeResourceKey<Brush> Default => new("CalendarDatePickerTextForeground");
Expand Down Expand Up @@ -90,7 +91,7 @@ public static class TextForeground
[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerCalendarGlyphForegroundDisabled")]
public static ThemeResourceKey<Brush> CalendarGlyphForegroundDisabled => new("CalendarDatePickerCalendarGlyphForegroundDisabled");
}
public static class Styles
public static partial class Styles
{
[ResourceKeyDefinition(typeof(Style), "MaterialCalendarDatePickerStyle", TargetType = typeof(Style))]
public static StaticResourceKey<Style> Default => new("MaterialCalendarDatePickerStyle");
Expand Down
7 changes: 4 additions & 3 deletions src/library/Uno.Themes.WinUI.Markup/Theme/CalendarView.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using Windows.UI;
using Microsoft.UI.Text;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
Expand All @@ -9,17 +10,17 @@ namespace Uno.Themes.Markup
{
public static partial class Theme
{
public static class CalendarView
public static partial class CalendarView
{
public static class Resources
public static partial class Resources
{
[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarBlackoutForeground")]
public static ThemeResourceKey<Brush> CalendarBlackoutForeground => new("MaterialCalendarBlackoutForeground");

[ResourceKeyDefinition(typeof(Brush), "MaterialCalendarTodayForeground")]
public static StaticResourceKey<Brush> CalendarTodayForeground => new("MaterialCalendarTodayForeground");
}
public static class Styles
public static partial class Styles
{
[ResourceKeyDefinition(typeof(Style), "MaterialCalendarViewStyle", TargetType = typeof(Style))]
public static StaticResourceKey<Style> Default => new("MaterialCalendarViewStyle");
Expand Down
19 changes: 10 additions & 9 deletions src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using Windows.UI;
using Microsoft.UI.Text;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
Expand All @@ -9,11 +10,11 @@ namespace Uno.Themes.Markup
{
public static partial class Theme
{
public static class CheckBox
public static partial class CheckBox
{
public static class Resources
public static partial class Resources
{
public static class CheckBackgroundFillUnchecked
public static partial class CheckBackgroundFillUnchecked
{
[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillCheckedDisabled")]
public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxCheckBackgroundFillCheckedDisabled");
Expand Down Expand Up @@ -51,7 +52,7 @@ public static class CheckBackgroundFillUnchecked
[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundFillUncheckedPressed")]
public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxCheckBackgroundFillUncheckedPressed");
}
public static class CheckBackgroundStrokeUnchecked
public static partial class CheckBackgroundStrokeUnchecked
{
[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeCheckedDisabled")]
public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxCheckBackgroundStrokeCheckedDisabled");
Expand Down Expand Up @@ -89,7 +90,7 @@ public static class CheckBackgroundStrokeUnchecked
[ResourceKeyDefinition(typeof(Brush), "CheckBoxCheckBackgroundStrokeUncheckedPressed")]
public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxCheckBackgroundStrokeUncheckedPressed");
}
public static class GlyphForegroundChecked
public static partial class GlyphForegroundChecked
{
[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundCheckedDisabled")]
public static ThemeResourceKey<Brush> CheckedDisabled => new("CheckBoxGlyphForegroundCheckedDisabled");
Expand All @@ -115,7 +116,7 @@ public static class GlyphForegroundChecked
[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundUncheckedPressed")]
public static ThemeResourceKey<Brush> UncheckedPressed => new("CheckBoxGlyphForegroundUncheckedPressed");
}
public static class GlyphForegroundIndeterminate
public static partial class GlyphForegroundIndeterminate
{
[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminate")]
public static ThemeResourceKey<Brush> Default => new("CheckBoxGlyphForegroundIndeterminate");
Expand All @@ -129,15 +130,15 @@ public static class GlyphForegroundIndeterminate
[ResourceKeyDefinition(typeof(Brush), "CheckBoxGlyphForegroundIndeterminatePressed")]
public static ThemeResourceKey<Brush> IndeterminatePressed => new("CheckBoxGlyphForegroundIndeterminatePressed");
}
public static class StateCircleFillChecked
public static partial class StateCircleFillChecked
{
[ResourceKeyDefinition(typeof(Brush), "CheckBoxStateCircleFillChecked")]
public static ThemeResourceKey<Brush> Default => new("CheckBoxStateCircleFillChecked");

[ResourceKeyDefinition(typeof(Brush), "CheckBoxStateCircleFillUnchecked")]
public static ThemeResourceKey<Brush> UncheckedPointerOver => new("CheckBoxStateCircleFillUnchecked");
}
public static class StateCircleOpacityPointerOver
public static partial class StateCircleOpacityPointerOver
{
[ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityPointerOver")]
public static ThemeResourceKey<double> UncheckedPointerOver => new("CheckBoxStateCircleOpacityPointerOver");
Expand Down Expand Up @@ -190,7 +191,7 @@ public static class StateCircleOpacityPointerOver
[ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")]
public static ThemeResourceKey<string> HyphenGlyphPathData => new("CheckBoxHyphenGlyphPathData");
}
public static class Styles
public static partial class Styles
{
[ResourceKeyDefinition(typeof(Style), "MaterialCheckBoxStyle", TargetType = typeof(Style))]
public static StaticResourceKey<Style> Default => new("MaterialCheckBoxStyle");
Expand Down
Loading

0 comments on commit 511a58d

Please sign in to comment.