diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 23baab61f..ed99a9612 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -23,11 +23,17 @@ What kind of change does this PR introduce? Please check if your PR fulfills the following requirements: - Commits must be following the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/#summary) -- [ ] Tested UWP -- [ ] Tested iOS -- [ ] Tested Android -- [ ] Tested WASM -- [ ] Tested MacOS +- [ ] Tested the changes where applicable: + - [ ] UWP + - [ ] iOS + - [ ] Android + - [ ] WASM + - [ ] MacOS +- [ ] Updated the documentation as needed: + - [ ] [General Doc Update](https://github.com/unoplatform/Uno.Themes/tree/master/doc) + - [ ] [material-controls-styles.md](https://github.com/unoplatform/Uno.Themes/blob/master/doc/material-controls-styles.md) + - [ ] [cupertino-controls-styles.md](https://github.com/unoplatform/Uno.Themes/blob/master/doc/cupertino-controls-styles.md) + - [ ] [lightweight-styling.md (LightWeight Styling Resource Keys)](https://github.com/unoplatform/Uno.Themes/blob/master/doc/lightweight-styling.md) - [ ] Contains **No** breaking changes > If the pull request contains breaking changes, commit message must contain a detailed description of the action to take for the consumer of this library. As explained by the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/#summary) diff --git a/.github/workflows/azure-static-webapp.yml b/.github/workflows/azure-static-webapp.yml index e7ef761ba..be2e340b5 100644 --- a/.github/workflows/azure-static-webapp.yml +++ b/.github/workflows/azure-static-webapp.yml @@ -29,7 +29,7 @@ jobs: - name: Install GitVersion uses: gittools/actions/gitversion/setup@v0.9.7 with: - versionSpec: '5.x' + versionSpec: '5.10.3' - name: Determine Version id: gitversion diff --git a/.gitignore b/.gitignore index 2542034aa..50fb780db 100644 --- a/.gitignore +++ b/.gitignore @@ -340,3 +340,4 @@ src/library/Uno.Material/Generated/mergedpages.v2.xaml crosstargeting_override.props +.vscode/ diff --git a/Directory.Build.props b/Directory.Build.props index d0ed1ced4..402a08424 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,6 +8,7 @@ false + false diff --git a/PlatformItemGroups.props b/PlatformItemGroups.props index 00eb24ac2..b10675659 100644 --- a/PlatformItemGroups.props +++ b/PlatformItemGroups.props @@ -45,19 +45,23 @@ $(DefineConstants);IOS1_0;XAMARIN;XAMARIN_IOS;XAMARIN_IOS_UNIFIED 10.0 + 15.4 $(DefineConstants);XAMARIN 10.14 + 12.3 13.1 + 15.4 $(DefineConstants);__ANDROID__;XAMARIN;MONOANDROID5_0;XAMARIN_ANDROID 21.0 + 33.0 diff --git a/Uno.Themes.sln b/Uno.Themes.sln index e0df56a69..ef18fc5a2 100644 --- a/Uno.Themes.sln +++ b/Uno.Themes.sln @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.Themes.Samples.UWP", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Themes.Samples.Wasm", "src\samples\UWP\Uno.Themes.Samples.Wasm\Uno.Themes.Samples.Wasm.csproj", "{5D0F3763-F3BF-4478-B2D3-B47AB74205C9}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Themes.Samples.Mobile", "src\samples\UWP\Uno.Themes.Samples.Mobile\Uno.Themes.Samples.Mobile.csproj", "{D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F42C65EA-6E6A-43B9-9D9F-D8C6063AD309}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "library", "library", "{EB41D6CC-AEBE-40A8-B42C-D3F7FBA7001E}" @@ -191,6 +193,64 @@ Global {5D0F3763-F3BF-4478-B2D3-B47AB74205C9}.Release|WASM.Build.0 = Release|Any CPU {5D0F3763-F3BF-4478-B2D3-B47AB74205C9}.Release|x64.ActiveCfg = Release|Any CPU {5D0F3763-F3BF-4478-B2D3-B47AB74205C9}.Release|x64.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Android.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Android.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Android.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhone.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|macOS.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|macOS.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|macOS.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Packages_UWP.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Packages_WinUI.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Tests.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Tests.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|Tests.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|UWP_x64.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|UWP_x64.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|UWP_x64.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|WASM.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|WASM.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|WASM.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|x64.ActiveCfg = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|x64.Build.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Debug|x64.Deploy.0 = Debug|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Android.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Android.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Android.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Any CPU.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Any CPU.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhone.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhone.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhone.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|macOS.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|macOS.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|macOS.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Packages_UWP.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Packages_WinUI.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Tests.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Tests.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|Tests.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|UWP_x64.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|UWP_x64.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|UWP_x64.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|WASM.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|WASM.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|WASM.Deploy.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|x64.ActiveCfg = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|x64.Build.0 = Release|Any CPU + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E}.Release|x64.Deploy.0 = Release|Any CPU {290980EF-0A64-43A5-AEB4-E022D82BBF8B}.Debug|Android.ActiveCfg = Debug|Any CPU {290980EF-0A64-43A5-AEB4-E022D82BBF8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {290980EF-0A64-43A5-AEB4-E022D82BBF8B}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -340,6 +400,7 @@ Global {6279C845-92F8-4333-AB99-3D213163593C} = {F42C65EA-6E6A-43B9-9D9F-D8C6063AD309} {265517E4-AB14-453D-92DA-F32AA1D4007D} = {B402BF43-62D6-463C-A71F-941B8EFF463F} {5D0F3763-F3BF-4478-B2D3-B47AB74205C9} = {B402BF43-62D6-463C-A71F-941B8EFF463F} + {D45D0327-B421-48F5-98BC-7C9B1D6ABD9E} = {B402BF43-62D6-463C-A71F-941B8EFF463F} {1EB1EA7F-DD48-49C2-97B3-ADB8E86EF28D} = {464D0819-2E75-4DED-9F70-039580314AFA} {290980EF-0A64-43A5-AEB4-E022D82BBF8B} = {B402BF43-62D6-463C-A71F-941B8EFF463F} {98C1FDAC-C692-4C65-99E7-70FDD53B8F2E} = {EB41D6CC-AEBE-40A8-B42C-D3F7FBA7001E} @@ -356,5 +417,6 @@ Global src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{290980ef-0a64-43a5-aeb4-e022d82bbf8b}*SharedItemsImports = 5 src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{5d0f3763-f3bf-4478-b2d3-b47ab74205c9}*SharedItemsImports = 5 src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 + src\samples\UWP\Uno.Themes.Samples.Shared\Uno.Themes.Samples.Shared.projitems*{d45d0327-b421-48f5-98bc-7c9b1d6abd9e}*SharedItemsImports = 5 EndGlobalSection EndGlobal diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 79b070fdb..73da5ff92 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -79,6 +79,7 @@ jobs: # This SDK version is needed as long as `uap10.0` will be supported in Uno.Core - powershell: ./build/Install-WindowsSdkISO.ps1 19041 displayName: Install Windows SDK 19041 + condition: eq(variables['UseWinUI'], false) - template: build/stage-build.yml diff --git a/build/sign-package.ps1 b/build/sign-package.ps1 index 779f36e04..79c6ac916 100644 --- a/build/sign-package.ps1 +++ b/build/sign-package.ps1 @@ -16,6 +16,12 @@ $filesToSign = Get-ChildItem -Recurse $Env:ArtifactDirectory\* -Include *.nupkg, foreach ($fileToSign in $filesToSign) { Write-Host "Submitting $fileToSign for signing" .\SignClient 'sign' -c $appSettings -i $fileToSign -r $env:SignClientUser -s $env:SignClientSecret -n "$env:SignPackageName" -d "$env:SignPackageDescription" -u "$env:build_repository_uri" + + if($LASTEXITCODE -ne 0) + { + exit 1; + } + Write-Host "Finished signing $fileToSign" } diff --git a/build/templates/canary-updater.yml b/build/templates/canary-updater.yml index 3342606a1..a3fb25d48 100644 --- a/build/templates/canary-updater.yml +++ b/build/templates/canary-updater.yml @@ -26,6 +26,6 @@ mergeBranch: true branchToMerge: master nugetUpdaterVersion: 2.3.0-alpha.46 - packageAuthor: 'nventive,unoplatform,uno platform' + packageAuthor: 'nventive,Uno Platform' summaryFile: '$(Build.ArtifactStagingDirectory)/Canary.md' resultFile: '$(Build.ArtifactStagingDirectory)/Results.json' \ No newline at end of file diff --git a/crosstargeting_override.props.sample b/crosstargeting_override.props.sample index 71d6d8dfb..56adfd349 100644 --- a/crosstargeting_override.props.sample +++ b/crosstargeting_override.props.sample @@ -25,7 +25,7 @@ - net7.0;$(TargetFrameworkOverride) + net7.0;$(TargetFrameworkOverride) + + + + + + + + + + + + + 2 + + + + + + 2 + + + + + + + + +``` + +Notice the `ResourceDictionary.ThemeDictionaries` element. This is where you can override resources for each theme. In the example above, we are overriding the resources for both the Light and Default themes. The Light theme is used when the device is in Light mode, and the Default theme is used when the device is in Dark mode. Below is an example of the same `Button` using the `FilledButtonStyle` from Uno Material, but with the overrides from above applied to both the Light and Dark themes. + +![Material - Button lightweight styling themes](assets/lightweight-styling-theme-comparison.png) + +Placing these brush overrides at the `AppResources.xaml` level will alter every `Button` that is styled with `FilledButtonStyle` within the entire application. The overrides can be scoped to a specific page by placing them in the `Page.Resources` element of the page’s XAML. The following XAML shows how to override the same resources from above, but scoped to a specific page. + +```xml + + + + + + 2 + + + + + + 2 + + + + + + + +``` + +## Per-control styling + +In other cases, changing a single control on one page only to look a certain way, without altering any other versions of that control, can also be achieved. The provided XAML code and image depict a `Button` using the default `FilledButtonStyle` followed by a second `Button`, also with `FilledButtonStyle` applied, but now with specific resource keys overridden to customize its appearance. + +```xml + +``` + +![Material - Button lightweight styling](assets/material-lightweight-styling-anatomy.png) + +Lightweight Styling allows for fine-grained control over the look of your UI components across all visual states. All interactive controls have multiple states, such as **PointerOver** (mouse is hovered over), **Pressed** (control is pressed on), and **Disabled** (control is not interactable). These states are appended onto the endings of the resource keys: ButtonForeground*PointerOver*, ButtonForeground*Pressed*, and ButtonForeground*Disabled*. Combined with these, the CheckBox and RadioButton controls also have **Checked** and **Unchecked** states. This means that it is possible to customize the appearance of your Uno Material-styled controls across any visual state without the need to redefine the style. As an example, the XAML below defines three Buttons, all using FilledButtonStyle from Uno Material: + +1. A Default Button with no changes +2. A Button with several brush resources overridden for the **Normal** visual state +3. A Button that overrides resources that are used with FilledButtonStyle’s **PointerOver** visual state + +```xml + + + + + +``` + +With this XAML we are given the following visual result, notice the third Button has a new BorderThickness applied and takes on different colors while in the **PointerOver** state. + +![Material - Button lightweight styling](assets/material-button-pointerover-lightweight-styling.png) + +## Resource Keys + +For more information about the lightweight styling resource keys used in each control, check out the following links: + +- [Button](styles/Button.md) +- [CalendarDatePicker](styles/CalendarDatePicker.md) +- [CheckBox](styles/CheckBox.md) +- [ComboBox](styles/ComboBox.md) +- [DatePicker](styles/DatePicker.md) +- [FloatingActionButton](styles/FloatingActionButton.md) +- [HyperlinkButton](styles/HyperlinkButton.md) +- [NavigationView](styles/NavigationView.md) +- [PasswordBox](styles/PasswordBox.md) +- [PipsPager](styles/PipsPager.md) +- [ProgressBar](styles/ProgressBar.md) +- [ProgressRing](styles/ProgressRing.md) +- [RadioButton](styles/RadioButton.md) +- [RatingControl](styles/RatingControl.md) +- [Slider](styles/Slider.md) +- [TextBlock](styles/Typography.md) +- [TextBox](styles/TextBox.md) +- [ToggleButton](styles/ToggleButton.md) +- [ToggleSwitch](styles/ToggleSwitch.md) + +## Toolkit + +Toolkit also has controls that allow lightweight styling, check out [Lightweight Styling in Uno.Toolkit](xref:Toolkit.LightweightStyling). + +### Further Reading + +[Lightweight Styling (Windows Dev Docs)](https://learn.microsoft.com/windows/apps/design/style/xaml-styles#lightweight-styling) diff --git a/doc/material-controls-styles.md b/doc/material-controls-styles.md index cf3064baa..402ed6b5a 100644 --- a/doc/material-controls-styles.md +++ b/doc/material-controls-styles.md @@ -23,7 +23,6 @@ Button|TertiaryLargeFabStyle| CalendarDatePicker|CalendarDatePickerStyle|True CalendarView|CalendarViewStyle|True CheckBox|CheckBoxStyle|True -CheckBox|SecondaryCheckBoxStyle| ComboBox|ComboBoxStyle|True CommandBar|CommandBarStyle|True ContentDialog|ContentDialogStyle|True @@ -39,11 +38,12 @@ muxc:NavigationView|NavigationViewStyle|True muxc:NavigationViewItem|NavigationViewItemStyle|True muxc:ProgressBar|ProgressBarStyle|True muxc:ProgressRing|ProgressRingStyle|True -PasswordBox|FilledPasswordBoxStyle|True -PasswordBox|OutlinedPasswordBoxStyle| +PasswordBox|FilledPasswordBoxStyle| +PasswordBox|OutlinedPasswordBoxStyle|True muxc:PipsPager|PipsPagerStyle|True RadioButton|RadioButtonStyle|True -RadioButton|SecondaryRadioButtonStyle| +RatingControl|RatingControlStyle|True +RatingControl|SecondaryRatingControlStyle| Slider|SliderStyle|True TextBlock|DisplayLarge| TextBlock|DisplayMedium| diff --git a/doc/material-getting-started.md b/doc/material-getting-started.md index 3b1c08565..5d118177e 100644 --- a/doc/material-getting-started.md +++ b/doc/material-getting-started.md @@ -160,9 +160,11 @@ Use this when you want to specify MANUALLY each colors. #A5A0AC #313033 #F4EFF4 + #5946D2 #79747E + #C9C5D0 @@ -211,9 +213,11 @@ Use this when you want to specify MANUALLY each colors. #CAC4D0 #E6E1E5 #313033 + #C7BFFF #938F99 + #57545D diff --git a/doc/material-migration.md b/doc/material-migration.md index 5090d10fd..4eeb4bc5f 100644 --- a/doc/material-migration.md +++ b/doc/material-migration.md @@ -1,4 +1,344 @@ -# Updating to Uno.Material v2 +--- +uid: uno.themes.material.migration +--- + +# Updating to Uno.Material v3 + +Uno.Material v3 (not to be confused with [Material Design 3](https://m3.material.io/) from Google) introduces support for [Lightweight Styling](lightweight-styling.md) as well as some breaking changes to the default style keys for some controls. Refer to the tables below for the changes that have been made within Uno.Material. + +## Styles + +### Removed + +Key|TargetType +-|- +DefaultMaterialCalendarViewStyle|CalendarView +MaterialSecondaryCheckBoxStyle|CheckBox +MaterialSecondaryRadioButtonStyle|RadioButton + +### Added + +Key|Aliased Key|TargetType|Implicit Style +-|-|-|- +MaterialRatingControlStyle|RatingControlStyle|muxc:RatingControl|true +MaterialRippleStyle|RippleStyle|um:Ripple|true + +### Modified + +Key|Aliased Key|TargetType|Implicit Style +-|-|-|- +MaterialToggleMenuFlyoutItemStyle|ToggleMenuFlyoutItemStyle|ToggleMenuFlyoutItem|false -> true +MaterialMenuFlyoutSubItemStyle|MenuFlyoutSubItemStyle|MenuFlyoutSubItem|false -> true +MaterialMenuFlyoutSeparatorStyle|MenuFlyoutSeparatorStyle|MenuFlyoutSeparator|false -> true +MaterialFilledPasswordBoxStyle|FilledPasswordBoxStyle|PasswordBox|true -> false +MaterialOutlinedPasswordBoxStyle|OutlinedPasswordBoxStyle|PasswordBox|false -> true +MaterialFilledTextBoxStyle|FilledTextBoxStyle|TextBox|true -> false +MaterialOutlinedTextBoxStyle|OutlinedTextBoxStyle|TextBox|false -> true +MaterialTextToggleButtonStyle|TextToggleButtonStyle|ToggleButton|true -> false +MaterialIconToggleButtonStyle|IconToggleButtonStyle|ToggleButton|false -> true + +## Resources + +As a result of the Lightweight Styling support, many resource keys have been added as well as renamed. For a list of all the new resource keys, please refer to the [Lightweight Styling documentation](lightweight-styling.md#resource-keys). + +Along with the above list of new resource keys, below is a list of the resource keys that have been removed or renamed. + +> [!NOTE] +> Most resources, including those that have been added or renamed, have now been placed inside of a `ThemeDictionary`. This means that the resources should now be referenced using the `ThemeResource` markup extension instead of `StaticResource`. For more information on theme resources, please refer to the [XAML theme resources documentation](https://learn.microsoft.com/en-us/windows/apps/design/style/xaml-theme-resources). + +### Button + +Old Key|New Key|Value +-|-|- +MaterialButtonHorizontalContentAlignment|ButtonHorizontalContentAlignment|Center +MaterialButtonVerticalContentAlignment|ButtonVerticalContentAlignment|Center +MaterialButtonCornerRadius|**_REMOVED_**|20 +MaterialOutlinedButtonBorderThickness|**_REMOVED_**|1 +MaterialButtonBorderThickness|**_REMOVED_**|0 +MaterialTextButtonPadding|**_REMOVED_**|12,0 +MaterialButtonPadding|**_REMOVED_**|16,0 +MaterialButtonMinWidth|**_REMOVED_**|40 +MaterialButtonMinHeight|**_REMOVED_**|40 +MaterialOutlinedButtonBorderBrush|**_REMOVED_**|OutlineBrush +MaterialNullToTextButtonMarginConverter|NullToTextButtonMarginConverter| + +### CalendarDatePicker + +Old Key|New Key|Value +-|-|- +MaterialCalendarDatePickerBackground|**_REMOVED_**|OnSurfaceColor*0.12 + +### CheckBox + +Old Key|New Key|Value +-|-|- +CheckAreaCornerRadius|**_REMOVED_**|4 +CheckAreaSize|**_REMOVED_**|18 +FocusAreaSize|**_REMOVED_**|40 +CheckAreaLength|**_REMOVED_**|40 +CheckBoxCheckGlyphPathStyle|**_REMOVED_**|M28.718018,0L32,3.2819897 10.666016,24.616999 0,13.951997 3.2810059,10.670007 10.666016,18.055033z +CheckBoxHyphenGlyphPathStyle|**_REMOVED_**|M0,0L32,0 32,5.3 0,5.3z + +### ComboBox + +Old Key|New Key|Value +-|-|- +MaterialComboBoxPadding|**_REMOVED_**|16,0 +MaterialComboBoxOpenedBorderThickness|**_REMOVED_**|2 +MaterialComboBoxBorderThickness|**_REMOVED_**|1 +DownArrowPathData|ComboBoxDownArrowPathData|M0 0L5 5L10 0H0Z +UpArrowPathData|ComboBoxUpArrowPathData|M0 0L-5 -5L-10 0H0Z +MaterialComboBoxCornerRadius|**_REMOVED_**|4 + +### DatePicker + +Old Key|New Key|Value +-|-|- +MaterialDatePickerBackgroundColorBrush|**_REMOVED_**|OnSurfaceColor*0.12 +MaterialDatePickerFlyoutPresenterSpacerFill|**_REMOVED_**|OnSurfaceFocusedBrush +MaterialDatePickerFlyoutElevation|**_REMOVED_**|8 +MaterialDatePickerFlyoutPresenterHighlightFill|**_REMOVED_**|PrimaryColor*0.2 +MaterialDatePickerFlyoutPresenterBorderBrush|**_REMOVED_**|OnSurfaceFocusedBrush +MaterialDatePickerHostPadding|**_REMOVED_**|24,24,8,8 +MaterialDatePickerFlyoutPresenterBackgroundBrush|**_REMOVED_**|SurfaceBrush +MaterialDatePickerHeight|**_REMOVED_**|53 +MaterialDatePickerSpacerThemeWidth|**_REMOVED_**|1 +MaterialDateTimeFlyoutBorderThickness|**_REMOVED_**|1 + +### FloatingActionButton + +Old Key|New Key|Value +-|-|- +MaterialFabIconTextPadding|**_REMOVED_**|12 +MaterialLargeFabCornerRadius|**_REMOVED_**|28 +MaterialLargeFabContentWidthOrHeight|**_REMOVED_**|24 +MaterialLargeFabPadding|**_REMOVED_**|36 +MaterialSmallFabCornerRadius|**_REMOVED_**|12 +MaterialSmallFabContentWidthOrHeight|**_REMOVED_**|16 +MaterialSmallFabPadding|**_REMOVED_**|12 +MaterialFabCornerRadius|**_REMOVED_**|16 +MaterialFabContentWidthOrHeight|**_REMOVED_**|16 +MaterialFabPadding|**_REMOVED_**|20 +MaterialTertiaryFabDisabledStateOverlay|**_REMOVED_**|OnSurfaceDisabledLowBrush +MaterialTertiaryFabPressedStateOverlay|**_REMOVED_**|OnTertiaryContainerFocusedBrush +MaterialTertiaryFabFocusedStateOverlay|**_REMOVED_**|OnTertiaryContainerFocusedBrush +MaterialTertiaryFabPointerOverStateOverlay|**_REMOVED_**|OnTertiaryContainerHoverBrush +MaterialTertiaryFabDisabledForeground|**_REMOVED_**|OnSurfaceDisabledBrush +MaterialTertiaryFabDisabledBackground|**_REMOVED_**|SystemControlTransparentBrush +MaterialTertiaryFabBackground|**_REMOVED_**|TertiaryContainerBrush +MaterialTertiaryFabForeground|**_REMOVED_**|OnTertiaryContainerBrush +MaterialSecondaryFabDisabledStateOverlay|**_REMOVED_**|OnSurfaceDisabledLowBrush +MaterialSecondaryFabPressedStateOverlay|**_REMOVED_**|OnSecondaryContainerPressedBrush +MaterialSecondaryFabFocusedStateOverlay|**_REMOVED_**|OnSecondaryContainerFocusedBrush +MaterialSecondaryFabPointerOverStateOverlay|**_REMOVED_**|OnSecondaryContainerHoverBrush +MaterialSecondaryFabDisabledForeground|**_REMOVED_**|OnSurfaceDisabledBrush +MaterialSecondaryFabDisabledBackground|**_REMOVED_**|SystemControlTransparentBrush +MaterialSecondaryFabBackground|**_REMOVED_**|SecondaryContainerBrush +MaterialSecondaryFabForeground|**_REMOVED_**|OnSecondaryContainerBrush +MaterialSurfaceFabDisabledStateOverlay|**_REMOVED_**|OnSurfaceDisabledLowBrush +MaterialSurfaceFabDisabledBackground|**_REMOVED_**|SystemControlTransparentBrush +MaterialSurfaceFabPressedStateOverlay|**_REMOVED_**|PrimaryPressedBrush +MaterialSurfaceFabFocusedStateOverlay|**_REMOVED_**|PrimaryFocusedBrush +MaterialSurfaceFabPointerOverStateOverlay|**_REMOVED_**|PrimaryHoverBrush +MaterialSurfaceFabDisabledForeground|**_REMOVED_**|OnSurfaceDisabledBrush +MaterialSurfaceFabBackground|**_REMOVED_**|SurfaceBrush +MaterialSurfaceFabForeground|**_REMOVED_**|PrimaryBrush +MaterialFabDisabledStateOverlay|**_REMOVED_**|OnSurfaceDisabledLowBrush +MaterialFabPressedStateOverlay|**_REMOVED_**|OnPrimaryContainerPressedBrush +MaterialFabFocusedStateOverlay|**_REMOVED_**|OnPrimaryContainerFocusedBrush +MaterialFabPointerOverStateOverlay|**_REMOVED_**|OnPrimaryContainerHoverBrush +MaterialFabDisabledForeground|**_REMOVED_**|OnSurfaceDisabledBrush +MaterialFabDisabledBackground|**_REMOVED_**|SystemControlTransparentBrush +MaterialFabBackground|**_REMOVED_**|PrimaryContainerBrush +MaterialFabForeground|**_REMOVED_**|OnPrimaryContainerBrush + +### NavigationView + +Old Key|New Key|Value +-|-|- +NavigationViewItemExpandedGlyph|**_REMOVED_**| +NavigationViewItemExpandedGlyphFontSize|**_REMOVED_**|8 +NavigationViewItemChildrenMenuFlyoutPadding|**_REMOVED_**|0,8 +TopNavigationViewOverflowMenuPadding|**_REMOVED_**|0,8 +NavigationViewMinimalContentGridCornerRadius|**_REMOVED_**|0 +TopNavigationViewContentGridCornerRadius|**_REMOVED_**|0 +NavigationViewContentGridCornerRadius|**_REMOVED_**|8,0,0,0 +TopNavigationViewItemOnOverflowExpandChevronPadding|**_REMOVED_**|12,0 +TopNavigationViewItemOnOverflowExpandChevronMargin|**_REMOVED_**|-4,0,-8,0 +TopNavigationViewItemOnOverflowNoIconContentPresenterMargin|**_REMOVED_**|16,0,20,0 +TopNavigationViewItemOnOverflowContentPresenterMargin|**_REMOVED_**|12,0,20,0 +TopNavigationViewItemContentOnlyExpandChevronMargin|**_REMOVED_**|-12,0,0,0 +TopNavigationViewItemIconOnlyExpandChevronMargin|**_REMOVED_**|0 +TopNavigationViewItemExpandChevronMargin|**_REMOVED_**|-16,0,0,0 +NavigationViewItemExpandChevronMargin|**_REMOVED_**|0,0,-14,0 +TopNavigationViewItemContentOnlyContentPresenterMargin|**_REMOVED_**|12,0 +TopNavigationViewItemContentPresenterMargin|**_REMOVED_**|8,-1,12,-1 +NavigationViewCompactItemContentPresenterMargin|**_REMOVED_**|0 +NavigationViewItemContentPresenterMargin|**_REMOVED_**|4,-1,8,-1 +TopNavigationViewOverflowButtonMargin|**_REMOVED_**|0 +TopNavigationViewItemSeparatorMargin|**_REMOVED_**|3,0,4,0 +NavigationViewCompactItemSeparatorMargin|**_REMOVED_**|0,3,0,4 +NavigationViewItemSeparatorMargin|**_REMOVED_**|0,3,0,4 +TopNavigationViewItemMargin|**_REMOVED_**|0 +NavigationViewItemMargin|**_REMOVED_**|0 +NavigationViewPaneTitlePresenterMargin|**_REMOVED_**|8,4,0,0 +TopNavigationViewContentMargin|**_REMOVED_**|0 +NavigationViewMinimalContentMargin|**_REMOVED_**|0 +NavigationViewContentMargin|**_REMOVED_**|0 +NavigationViewContentPresenterMargin|**_REMOVED_**|0 +NavigationViewHeaderMargin|**_REMOVED_**|56,44,0,0 +NavigationViewBorderThickness|**_REMOVED_**|1 +TopNavigationViewTopNavGridMargin|**_REMOVED_**|4,0 +TopNavigationViewContentGridBorderThickness|**_REMOVED_**|0,1,0,0 +NavigationViewMinimalContentGridBorderThickness|**_REMOVED_**|0,1,0,0 +NavigationViewContentGridBorderThickness|**_REMOVED_**|1,1,0,0 +NavigationViewPaneContentGridMargin|**_REMOVED_**|-1,3 +NavigationViewButtonHolderGridMargin|**_REMOVED_**|0 +NavigationViewMinimalHeaderMargin|**_REMOVED_**|-24,44,0,0 +TopNavigationViewItemInnerHeaderMargin|**_REMOVED_**|12,0 +NavigationViewItemInnerHeaderMargin|**_REMOVED_**|16,0 +NavigationViewItemButtonMargin|**_REMOVED_**|12,0 +NavigationViewItemOnLeftIconBoxMargin|**_REMOVED_**|3 +NavigationViewItemBorderThickness|**_REMOVED_**|1 +NavigationViewToggleBorderThickness|**_REMOVED_**|0 +TopNavigationViewItemSeparatorWidth|**_REMOVED_**|1 +NavigationViewItemSeparatorHeight|**_REMOVED_**|1 +NavigationViewSelectionIndicatorRadius|**_REMOVED_**|2 +NavigationViewSelectionIndicatorHeight|**_REMOVED_**|24 +NavigationViewSelectionIndicatorWidth|**_REMOVED_**|3 +NavigationViewItemOnLeftIconBoxHeight|**_REMOVED_**|24 +NavigationViewPaneHeaderRowMinHeight|**_REMOVED_**|56 +NavigationViewItemOnLeftMinHeight|**_REMOVED_**|56 +TopNavigationViewSettingsButtonHeight|**_REMOVED_**|40 +TopNavigationViewSettingsButtonWidth|**_REMOVED_**|40 +TopNavigationViewOverflowButtonHeight|**_REMOVED_**|40 +TopNavigationViewOverflowButtonWidth|**_REMOVED_**|40 +TopNavigationViewPaneCustomContentMinWidth|**_REMOVED_**|80 +NavigationViewAutoSuggestAreaHeight|**_REMOVED_**|40 +NavigationViewTopPaneHeight|**_REMOVED_**|48 +NavigationViewIconBoxWidth|**_REMOVED_**|40 +NavigationViewCompactPaneLength|**_REMOVED_**|80 +PaneToggleButtonWidth|**_REMOVED_**|80 +PaneToggleButtonHeight|**_REMOVED_**|56 +TopNavigationViewAutoSuggestBoxMargin|**_REMOVED_**|4,0 +NavigationViewAutoSuggestBoxMargin|**_REMOVED_**|16,0 +MaterialNavigationViewItemRippleFeedback|**_REMOVED_**|PrimaryPressedBrush +MaterialNavigationViewItemBackgroundDisabled|**_REMOVED_**|OnSurfaceDisabledLowBrush +MaterialNavigationViewItemBackgroundPointerOver|**_REMOVED_**|PrimaryHoverBrush +MaterialNavigationViewItemBackgroundPressed|**_REMOVED_**|PrimaryPressedBrush +MaterialNavigationViewItemBackgroundSelected|**_REMOVED_**|PrimarySelectedBrush +MaterialNavigationItemContentMarginWithoutIcon|**_REMOVED_**|0 +MaterialNavigationItemContentMargin|**_REMOVED_**|12,0,0,0 +MaterialNavigationItemIconLength|**_REMOVED_**|24 +MaterialNavigationItemLeftMargin|**_REMOVED_**|12,0 +MaterialNavigationViewItemCornerRadiusLeftOnly|**_REMOVED_**|28,0,0,28 +MaterialNavigationViewItemCornerRadius|**_REMOVED_**|28 +MaterialNavigationItemHeight|**_REMOVED_**|56 +MaterialNavigationViewButtonRippleFeedback|**_REMOVED_**|PrimaryPressedBrush +MaterialNavigationViewButtonBackgroundPointerOver|**_REMOVED_**|PrimaryHoverBrush +MaterialNavigationViewButtonBackgroundPressed|**_REMOVED_**|PrimaryPressedBrush +MaterialNavigationViewButtonForegroundDisabled|**_REMOVED_**|OnSurfaceDisabledLowBrush +MaterialNavigationViewButtonMarginWhenStackedVertically|**_REMOVED_**|12,0 +MaterialNavigationViewButtonIconSymbolFontSize|**_REMOVED_**|24 +MaterialNavigationViewButtonIconLength|**_REMOVED_**|24 +MaterialNavigationViewButtonCornerRadius|**_REMOVED_**|28 +MaterialNavigationViewButtonWidth|**_REMOVED_**|56 +MaterialNavigationViewContentGridCornerRadius|**_REMOVED_**|14,0,0,14 +MaterialNavigationViewSplitViewCornerRadius|**_REMOVED_**|0,14,14,0 +MaterialNavigationViewPaneBackground|**_REMOVED_**|SurfaceBrush +MaterialNavigationViewBackground|**_REMOVED_**|SurfaceBrush + +### PasswordBox + +Old Key|New Key|Value +-|-|- +MaterialDisabledOutlinedPasswordBoxBorderBrush|**_REMOVED_**|OnSurfaceColor*0.12 +MaterialRevealGlyphPathData|**_REMOVED_**|M11 0.5C6 0.5 1.73 3.61 0 8C1.73 12.39 6 15.5 11 15.5C16 15.5 20.27 12.39 22 8C20.27 3.61 16 0.5 11 0.5ZM11 13C8.24 13 6 10.76 6 8C6 5.24 8.24 3 11 3C13.76 3 16 5.24 16 8C16 10.76 13.76 13 11 13ZM11 5C9.34 5 8 6.34 8 8C8 9.66 9.34 11 11 11C12.66 11 14 9.66 14 8C14 6.34 12.66 5 11 5Z + +### PipsPager + +Old Key|New Key|Value +-|-|- +MaterialPipsPagerNormalEllipseSize|**_REMOVED_**|8 +MaterialPipsPagerSelectedEllipseSize|**_REMOVED_**|8 +MaterialPipsPagerNavigationVisualStatesEllipseHeight|**_REMOVED_**|12 +MaterialPipsPagerNavigationVisualStatesEllipseWidth|**_REMOVED_**|12 +MaterialPipsPagerNavigationButtonWidth|**_REMOVED_**|40 +MaterialPipsPagerNavigationButtonHeight|**_REMOVED_**|40 +MaterialPipsPagerNextPageButtonData|**_REMOVED_**|M4.66319 5.67785C4.36844 6.10738 3.63156 6.10738 3.33681 5.67785L0.103738 0.966444C-0.191015 0.536913 0.177425 6.83871e-07 0.766931 6.32335e-07L7.23307 6.70473e-08C7.82257 1.55111e-08 8.19101 0.536912 7.89626 0.966443L4.66319 5.67785Z +MaterialPipsPagerPreviousPageButtonData|**_REMOVED_**|M3.33681 0.322148C3.63156 -0.107383 4.36844 -0.107382 4.66319 0.322148L7.89626 5.03356C8.19101 5.46309 7.82257 6 7.23307 6L0.766932 6C0.177427 6 -0.191014 5.46309 0.103739 5.03356L3.33681 0.322148Z +MaterialPipsPagerNavigationButtonBorderThickness|**_REMOVED_**|0 +MaterialPipsPagerButtonBorderThickness|**_REMOVED_**|0 +MaterialPipsPagerVerticalOrientationButtonHeight|**_REMOVED_**|12 +MaterialPipsPagerVerticalOrientationButtonWidth|**_REMOVED_**|12 +MaterialPipsPagerHorizontalOrientationButtonHeight|**_REMOVED_**|12 +MaterialPipsPagerHorizontalOrientationButtonWidth|**_REMOVED_**|12 + +### ProgressBar + +Old Key|New Key|Value +-|-|- +MaterialProgressBarHeight|**_REMOVED_**|4 +MaterialProgressBarMinWidth|**_REMOVED_**|250 + +### ProgressRing + +Old Key|New Key|Value +-|-|- +M3MaterialIndeterminateAnimation_Uno|**_REMOVED_**|embedded://Uno.Material/Uno.Material.Assets.MaterialIndeterminate.json +M3MaterialDeterminateAnimation_Uno|**_REMOVED_**|embedded://Uno.Material/Uno.Material.Assets.MaterialDeterminate.json +M3MaterialIndeterminateAnimation_Win|**_REMOVED_**|ms-appx:///Uno.Material/Assets/MaterialIndeterminate.json +M3MaterialDeterminateAnimation_Win|**_REMOVED_**|ms-appx:///Uno.Material/Assets/MaterialDeterminate.json + +### RadioButton + +Old Key|New Key|Value +-|-|- +RadioBorderThickness|**_REMOVED_**|2 +RadioCheckAreaSize|**_REMOVED_**|20 +RadioStatesAreaSize|**_REMOVED_**|40 +RadioStatesAreaLength|**_REMOVED_**|40 + +### Slider + +Old Key|New Key|Value +-|-|- +MaterialSliderThumbBackgroundDisabled|**_REMOVED_**|SystemControlDisabledChromeDisabledHighBrush +MaterialSliderInlineTickBarFill|**_REMOVED_**|SystemControlBackgroundAltHighBrush +MaterialSliderTickBarFillDisabled|**_REMOVED_**|SystemControlDisabledBaseMediumLowBrush +MaterialSliderTickBarFill|**_REMOVED_**|OnSecondaryLowBrush +MaterialSliderTrackBrush|**_REMOVED_**|MaterialSliderTrackColor + +### TextBox + +Old Key|New Key|Value +-|-|- +MaterialDisabledOutlinedTextBoxBorderBrush|**_REMOVED_**|OnSurfaceColor*0.12 +M3ClearGlyphPathData|**_REMOVED_**|M10 0C4.47 0 0 4.47 0 10C0 15.53 4.47 20 10 20C15.53 20 20 15.53 20 10C20 4.47 15.53 0 10 0ZM10 18C5.59 18 2 14.41 2 10C2 5.59 5.59 2 10 2C14.41 2 18 5.59 18 10C18 14.41 14.41 18 10 18ZM10 8.59L13.59 5L15 6.41L11.41 10L15 13.59L13.59 15L10 11.41L6.41 15L5 13.59L8.59 10L5 6.41L6.41 5L10 8.59Z + +### ToggleButton + +Old Key|New Key|Value +-|-|- +MaterialToggleButtonPadding|**_REMOVED_**|16,8 +MaterialToggleButtonBorderRadius|**_REMOVED_**|4 +MaterialToggleButtonForegroundThemeBrush|**_REMOVED_**|OnSurfaceBrush +MaterialToggleButtonTextLabelBrush|**_REMOVED_**|PrimaryColor + +### ToggleSwitch + +Old Key|New Key|Value +-|-|- +MaterialPrimaryVariantLowThumbColorBrush|**_REMOVED_**|MaterialPrimaryVariantLowThumbColor +MaterialToggleSwitchOnLowBackgroundBrush|**_REMOVED_**|OnSurfaceSelectedBrush +MaterialToggleSwitchOnLowButtonBrush|**_REMOVED_**|OnSurfaceSelectedBrush +MaterialToggleSwitchOffBackgroundBrush|**_REMOVED_**|OnSurfaceLowBrush +MaterialToggleSwitchOffButtonBrush|**_REMOVED_**|OnPrimaryBrush +MaterialToggleSwitchOnBackgroundBrush|**_REMOVED_**|PrimaryVariantLightBrush +MaterialToggleSwitchOnButtonBrush|**_REMOVED_**|PrimaryBrush +MaterialToggleSwitchHeaderMargin|**_REMOVED_**|0,0,12,0 + +# Updating to Uno.Material v2 Starting with version 2.0.0 of the [Uno.Material](https://www.nuget.org/packages/Uno.Material/2.0.0) and [Uno.Material.WinUI](https://www.nuget.org/packages/Uno.Material.WinUI/2.0.0) packages, users can now take advantage of the new [Material Design 3](https://m3.material.io/) design system from Google. Along with the new Material Design 3 styles, our Uno.Material NuGet packages will continue to support the previous Material Design 2 styles. In order to achieve this backward compatibility, we have had to make some changes to the way Uno.Material is initialized within your `App.xaml`. @@ -10,12 +350,10 @@ Along with the new Material Design 3 styles, our Uno.Material NuGet packages wil - Continue to keep using the v1 styles; or, - Migrate app to reference the new v2 styles - ## Continue Using v1 Styles > [!WARNING] > In order to continue using the v1 styles, some changes are required in your `App.xaml`. - The Uno.Material v2 NuGet package contains both sets of v1 and v2 styles. Within your `App.xaml`, you will need to replace the references to `MaterialColors` and `MaterialResouces` with `MaterialColorsV1` and `MaterialResourcesV1`. `MaterialFonts` remains unchanged. ## Migrating to v2 Styles diff --git a/doc/styles/Button.md b/doc/styles/Button.md new file mode 100644 index 000000000..142d78b8b --- /dev/null +++ b/doc/styles/Button.md @@ -0,0 +1,160 @@ +# Button Control +## Styles + +Style Key|IsDefaultStyle* +-|- +ElevatedButtonStyle| +FilledButtonStyle|True +FilledTonalButtonStyle| +OutlinedButtonStyle| +TextButtonStyle| +IconButtonStyle| + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +ElevatedButtonForeground|SolidColorBrush|PrimaryBrush +ElevatedButtonForegroundPointerOver|SolidColorBrush|PrimaryBrush +ElevatedButtonForegroundPressed|SolidColorBrush|PrimaryBrush +ElevatedButtonForegroundFocused|SolidColorBrush|PrimaryBrush +ElevatedButtonForegroundPointerFocused|SolidColorBrush|PrimaryBrush +ElevatedButtonForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +ElevatedButtonIconForeground|SolidColorBrush|PrimaryBrush +ElevatedButtonIconForegroundPointerOver|SolidColorBrush|PrimaryBrush +ElevatedButtonIconForegroundPressed|SolidColorBrush|PrimaryBrush +ElevatedButtonIconForegroundFocused|SolidColorBrush|PrimaryBrush +ElevatedButtonIconForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +ElevatedButtonIconForegroundPointerFocused|SolidColorBrush|PrimaryBrush +ElevatedButtonBackground|SolidColorBrush|SurfaceBrush +ElevatedButtonBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +ElevatedButtonBackgroundPointerOver|SolidColorBrush|PrimaryHoverBrush +ElevatedButtonBackgroundPressed|SolidColorBrush|PrimaryPressedBrush +ElevatedButtonBackgroundFocused|SolidColorBrush|PrimaryFocusedBrush +ElevatedButtonBackgroundPointerFocused|SolidColorBrush|PrimaryFocusedBrush +ElevatedButtonBorderBrush|SolidColorBrush|SystemControlTransparentBrush +ElevatedButtonBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +ElevatedButtonBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +ElevatedButtonBorderBrushFocused|SolidColorBrush|SystemControlTransparentBrush +ElevatedButtonBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +ElevatedButtonBorderBrushPointerFocused|SolidColorBrush|SystemControlTransparentBrush +FilledButtonForeground|SolidColorBrush|OnPrimaryBrush +FilledButtonForegroundPointerOver|SolidColorBrush|OnPrimaryBrush +FilledButtonForegroundPressed|SolidColorBrush|OnPrimaryBrush +FilledButtonForegroundPointerFocused|SolidColorBrush|OnPrimaryBrush +FilledButtonForegroundFocused|SolidColorBrush|OnPrimaryBrush +FilledButtonForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FilledButtonIconForeground|SolidColorBrush|OnPrimaryBrush +FilledButtonIconForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FilledButtonIconForegroundPointerOver|SolidColorBrush|OnPrimaryBrush +FilledButtonIconForegroundPressed|SolidColorBrush|OnPrimaryBrush +FilledButtonIconForegroundFocused|SolidColorBrush|OnPrimaryBrush +FilledButtonIconForegroundPointerFocused|SolidColorBrush|OnPrimaryBrush +FilledButtonBackground|SolidColorBrush|PrimaryBrush +FilledButtonBackgroundPointerOver|SolidColorBrush|OnPrimaryHoverBrush +FilledButtonBackgroundPressed|SolidColorBrush|OnPrimaryPressedBrush +FilledButtonBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +FilledButtonBackgroundFocused|SolidColorBrush|OnPrimaryFocusedBrush +FilledButtonBackgroundPointerFocused|SolidColorBrush|OnPrimaryFocusedBrush +FilledButtonBorderBrush|SolidColorBrush|SystemControlTransparentBrush +FilledButtonBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +FilledButtonBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +FilledButtonBorderBrushFocused|SolidColorBrush|SystemControlTransparentBrush +FilledButtonBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +FilledButtonBorderBrushPointerFocused|SolidColorBrush|SystemControlTransparentBrush +FilledTonalButtonForeground|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonForegroundPointerOver|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonForegroundPressed|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonForegroundFocused|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonForegroundPointerFocused|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FilledTonalButtonIconForeground|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonIconForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FilledTonalButtonIconForegroundPointerOver|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonIconForegroundPressed|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonIconForegroundFocused|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonIconForegroundPointerFocused|SolidColorBrush|OnSecondaryContainerBrush +FilledTonalButtonBackground|SolidColorBrush|SecondaryContainerBrush +FilledTonalButtonBackgroundPointerOver|SolidColorBrush|OnSecondaryContainerHoverBrush +FilledTonalButtonBackgroundPressed|SolidColorBrush|OnSecondaryContainerPressedBrush +FilledTonalButtonBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +FilledTonalButtonBackgroundFocused|SolidColorBrush|OnSecondaryContainerFocusedBrush +FilledTonalButtonBackgroundPointerFocused|SolidColorBrush|OnSecondaryContainerFocusedBrush +FilledTonalButtonBorderBrush|SolidColorBrush|SystemControlTransparentBrush +FilledTonalButtonBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +FilledTonalButtonBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +FilledTonalButtonBorderBrushFocused|SolidColorBrush|SystemControlTransparentBrush +FilledTonalButtonBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +FilledTonalButtonBorderBrushPointerFocused|SolidColorBrush|SystemControlTransparentBrush +OutlinedButtonForeground|SolidColorBrush|PrimaryBrush +OutlinedButtonForegroundPressed|SolidColorBrush|PrimaryBrush +OutlinedButtonForegroundPointerOver|SolidColorBrush|PrimaryBrush +OutlinedButtonForegroundFocused|SolidColorBrush|PrimaryBrush +OutlinedButtonForegroundPointerFocused|SolidColorBrush|PrimaryBrush +OutlinedButtonForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +OutlinedButtonIconForeground|SolidColorBrush|PrimaryBrush +OutlinedButtonIconForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +OutlinedButtonIconForegroundPointerOver|SolidColorBrush|PrimaryBrush +OutlinedButtonIconForegroundPressed|SolidColorBrush|PrimaryBrush +OutlinedButtonIconForegroundFocused|SolidColorBrush|PrimaryBrush +OutlinedButtonIconForegroundPointerFocused|SolidColorBrush|PrimaryBrush +OutlinedButtonBackground|SolidColorBrush|SystemControlTransparentBrush +OutlinedButtonBackgroundPointerOver|SolidColorBrush|PrimaryHoverBrush +OutlinedButtonBackgroundPressed|SolidColorBrush|PrimaryPressedBrush +OutlinedButtonBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +OutlinedButtonBackgroundFocused|SolidColorBrush|PrimaryFocusedBrush +OutlinedButtonBackgroundPointerFocused|SolidColorBrush|PrimaryFocusedBrush +OutlinedButtonBorderBrush|SolidColorBrush|OutlineBrush +OutlinedButtonBorderBrushPointerOver|SolidColorBrush|OutlineBrush +OutlinedButtonBorderBrushPressed|SolidColorBrush|OutlineBrush +OutlinedButtonBorderBrushFocused|SolidColorBrush|OutlineBrush +OutlinedButtonBorderBrushDisabled|SolidColorBrush|OutlineDisabledBrush +OutlinedButtonBorderBrushPointerFocused|SolidColorBrush|OutlineBrush +TextButtonForeground|SolidColorBrush|PrimaryBrush +TextButtonForegroundPressed|SolidColorBrush|PrimaryBrush +TextButtonForegroundPointerOver|SolidColorBrush|PrimaryBrush +TextButtonForegroundFocused|SolidColorBrush|PrimaryBrush +TextButtonForegroundPointerFocused|SolidColorBrush|PrimaryBrush +TextButtonForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +TextButtonIconForeground|SolidColorBrush|PrimaryBrush +TextButtonIconForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +TextButtonIconForegroundPointerOver|SolidColorBrush|PrimaryBrush +TextButtonIconForegroundPressed|SolidColorBrush|PrimaryBrush +TextButtonIconForegroundFocused|SolidColorBrush|PrimaryBrush +TextButtonIconForegroundPointerFocused|SolidColorBrush|PrimaryBrush +TextButtonBackground|SolidColorBrush|SystemControlTransparentBrush +TextButtonBackgroundPointerOver|SolidColorBrush|PrimaryHoverBrush +TextButtonBackgroundPressed|SolidColorBrush|PrimaryPressedBrush +TextButtonBackgroundFocused|SolidColorBrush|PrimaryFocusedBrush +TextButtonBackgroundPointerFocused|SolidColorBrush|PrimaryFocusedBrush +TextButtonBorderBrush|SolidColorBrush|SystemControlTransparentBrush +TextButtonBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +TextButtonBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +TextButtonBorderBrushFocused|SolidColorBrush|SystemControlTransparentBrush +TextButtonBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +TextButtonBorderBrushPointerFocused|SolidColorBrush|SystemControlTransparentBrush +IconButtonForeground|SolidColorBrush|OnSurfaceVariantBrush +IconButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +IconButtonEllipseFillPointerOver|SolidColorBrush|PrimaryHoverBrush +IconButtonEllipseFillPressed|SolidColorBrush|PrimaryPressedBrush +IconButtonEllipseFillFocused|SolidColorBrush|PrimaryFocusedBrush +ButtonMinHeight|Double|40 +ButtonMinWidth|Double|40 +ButtonIconMinWidth|Double|18 +ElevatedButtonElevation|Double|1 +ElevatedButtonElevationDisabled|Double|0 +ButtonElevation|Double|0 +IconButtonOpacityVisibleState|Double|1 +IconButtonOpacityHiddenState|Double|0 +ButtonPadding|Thickness|16,0 +TextButtonPadding|Thickness|12,0 +TextButtonIconMargin|Thickness|0,0,8,0 +ButtonBorderThickness|Thickness|0 +OutlinedButtonBorderThickness|Thickness|1 +ElevatedButtonMargin|Thickness|0,0,0,1 +ElevatedButtonDisabledMargin|Thickness|0 +ButtonContentMargin|Thickness|8,0 +ButtonMargin|Thickness|0 +ButtonCornerRadius|CornerRadius|20 \ No newline at end of file diff --git a/doc/styles/CalendarDatePicker.md b/doc/styles/CalendarDatePicker.md new file mode 100644 index 000000000..3f748e784 --- /dev/null +++ b/doc/styles/CalendarDatePicker.md @@ -0,0 +1,44 @@ +# CalendarDatePicker Control +## Styles + +Style Key|IsDefaultStyle* +-|- +CalendarDatePickerStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +CalendarDatePickerBackgroundCornerRadius|CornerRadius|4,4,0,0 +CalendarDatePickerBorderThemeThickness|Thickness|1 +CalendarDatePickerFlyoutPresenterPadding|Thickness|0 +CalendarDatePickerFlyoutPresenterMargin|Thickness|0 +CalendarDatePickerContentMargin|Thickness|10,0 +CalendarDatePickerHeight|Double|53 +CalendarDatePickerBackgroundMinHeight|Double|53 +CalendarDatePickerCornerRadius|CornerRadius|ControlCornerRadius +CalendarDatePickerFlyoutPresenterCornerRadius|CornerRadius|OverlayCornerRadius +CalendarDatePickerCalendarViewCornerRadius|CornerRadius|OverlayCornerRadius +CalendarDatePickerForeground|SolidColorBrush|OnSurfaceBrush +CalendarDatePickerForegroundDisabled|SolidColorBrush|OnSurfaceMediumBrush +CalendarDatePickerCalendarGlyphForeground|SolidColorBrush|OnSurfaceBrush +CalendarDatePickerCalendarGlyphForegroundDisabled|SolidColorBrush|OnSurfaceMediumBrush +CalendarDatePickerTextForeground|SolidColorBrush|OnSurfaceLowBrush +CalendarDatePickerTextForegroundDisabled|SolidColorBrush|OnSurfaceMediumBrush +CalendarDatePickerTextForegroundSelected|SolidColorBrush|OnSurfaceBrush +CalendarDatePickerHeaderForeground|SolidColorBrush|PrimaryBrush +CalendarDatePickerHeaderForegroundDisabled|SolidColorBrush|OnSurfaceMediumBrush +CalendarDatePickerBackground|SolidColorBrush|SurfaceVariantBrush +CalendarDatePickerBackgroundPointerOver|SolidColorBrush|SurfaceVariantBrush +CalendarDatePickerBackgroundPressed|SolidColorBrush|SurfaceVariantBrush +CalendarDatePickerBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +CalendarDatePickerBackgroundFocused|SolidColorBrush|SurfaceVariantBrush +CalendarDatePickerBorderBrush|SolidColorBrush|OnSurfaceLowBrush +CalendarDatePickerBorderBrushPointerOver|SolidColorBrush|OnSurfaceLowBrush +CalendarDatePickerBorderBrushPressed|SolidColorBrush|OnSurfaceLowBrush +CalendarDatePickerBorderBrushDisabled|SolidColorBrush|OnSurfaceLowBrush +CalendarDatePickerBottomBorderBrush|SolidColorBrush|PrimaryBrush +CalendarDatePickerHeaderStyle|Style|MaterialBodySmall +CalendarDatePickerTextStyle|Style|MaterialBodyMedium \ No newline at end of file diff --git a/doc/styles/CheckBox.md b/doc/styles/CheckBox.md new file mode 100644 index 000000000..f148add8d --- /dev/null +++ b/doc/styles/CheckBox.md @@ -0,0 +1,102 @@ +# CheckBox Control +## Styles + +Style Key|IsDefaultStyle* +-|- +CheckBoxStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +CheckBoxBackgroundUnchecked|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundUncheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundUncheckedPressed|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundUncheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundChecked|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundCheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundCheckedPressed|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundCheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundIndeterminate|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundIndeterminatePointerOver|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundIndeterminatePressed|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBackgroundIndeterminateDisabled|SolidColorBrush|SystemControlTransparentBrush +CheckBoxForegroundUnchecked|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxForegroundUncheckedPointerOver|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxForegroundUncheckedPressed|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxForegroundUncheckedDisabled|SolidColorBrush|OnSurfaceLowBrush +CheckBoxForegroundChecked|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxForegroundCheckedPointerOver|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxForegroundCheckedPressed|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxForegroundCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush +CheckBoxForegroundIndeterminate|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxForegroundIndeterminatePointerOver|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxForegroundIndeterminatePressed|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxForegroundIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush +CheckBoxBorderBrushUnchecked|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushUncheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushUncheckedPressed|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushUncheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushChecked|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushCheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushCheckedPressed|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushCheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushIndeterminate|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushIndeterminatePointerOver|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushIndeterminatePressed|SolidColorBrush|SystemControlTransparentBrush +CheckBoxBorderBrushIndeterminateDisabled|SolidColorBrush|SystemControlTransparentBrush +CheckBoxCheckBackgroundStrokeUnchecked|SolidColorBrush|OnSurfaceVariantBrush +CheckBoxCheckBackgroundStrokeUncheckedPointerOver|SolidColorBrush|OnSurfaceBrush +CheckBoxCheckBackgroundStrokeUncheckedPressed|SolidColorBrush|OnSurfaceBrush +CheckBoxCheckBackgroundStrokeUncheckedDisabled|SolidColorBrush|OnSurfaceLowBrush +CheckBoxCheckBackgroundStrokeChecked|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundStrokeCheckedPointerOver|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundStrokeCheckedPressed|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundStrokeCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush +CheckBoxCheckBackgroundStrokeIndeterminate|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundStrokeIndeterminatePointerOver|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundStrokeIndeterminatePressed|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundStrokeIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush +CheckBoxCheckBackgroundFillUnchecked|SolidColorBrush|SystemControlTransparentBrush +CheckBoxCheckBackgroundFillUncheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +CheckBoxCheckBackgroundFillUncheckedPressed|SolidColorBrush|SystemControlTransparentBrush +CheckBoxCheckBackgroundFillUncheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +CheckBoxCheckBackgroundFillChecked|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundFillCheckedPointerOver|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundFillCheckedPressed|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundFillCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush +CheckBoxCheckBackgroundFillIndeterminate|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundFillIndeterminatePointerOver|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundFillIndeterminatePressed|SolidColorBrush|PrimaryBrush +CheckBoxCheckBackgroundFillIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush +CheckBoxFontFamily|FontFamily|MaterialMediumFontFamily +CheckBoxFontWeight|String|BodySmallFontWeight +CheckBoxFontSize|Double|BodySmallFontSize +CheckBoxCharacterSpacing|Int32|BodySmallCharacterSpacing +CheckBoxGlyphForegroundUnchecked|SolidColorBrush|SystemControlTransparentBrush +CheckBoxGlyphForegroundUncheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +CheckBoxGlyphForegroundUncheckedPressed|SolidColorBrush|SystemControlTransparentBrush +CheckBoxGlyphForegroundUncheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +CheckBoxGlyphForegroundChecked|SolidColorBrush|OnPrimaryBrush +CheckBoxGlyphForegroundCheckedPointerOver|SolidColorBrush|OnPrimaryBrush +CheckBoxGlyphForegroundCheckedPressed|SolidColorBrush|OnPrimaryBrush +CheckBoxGlyphForegroundCheckedDisabled|SolidColorBrush|OnPrimaryBrush +CheckBoxGlyphForegroundIndeterminate|SolidColorBrush|OnPrimaryBrush +CheckBoxGlyphForegroundIndeterminatePointerOver|SolidColorBrush|OnPrimaryBrush +CheckBoxGlyphForegroundIndeterminatePressed|SolidColorBrush|OnPrimaryBrush +CheckBoxGlyphForegroundIndeterminateDisabled|SolidColorBrush|OnPrimaryBrush +CheckBoxHyphenGlyphPathData|String|M0,0L32,0 32,5.3 0,5.3z +CheckBoxCheckGlyphPathData|String|M28.718018,0L32,3.2819897 10.666016,24.616999 0,13.951997 3.2810059,10.670007 10.666016,18.055033z +CheckBoxStateCircleFillUnchecked|SolidColorBrush|OnSurfaceBrush +CheckBoxStateCircleFillChecked|SolidColorBrush|PrimaryBrush +CheckBoxStateCircleOpacityPointerOver|Double|HoverOpacity +CheckBoxStateCircleOpacityPressed|Double|PressedOpacity +CheckBoxStateCircleOpacityFocused|Double|FocusedOpacity +CheckBoxFocusAreaSize|Double|40 +CheckBoxCheckAreaSize|Double|18 +CheckBoxCheckAreaLength|GridLength|40 +CheckBoxCheckAreaCornerRadius|CornerRadius|2 +CheckBoxCheckAreaBorderThickness|Thickness|2 +CheckBoxCheckAreaPadding|Thickness|8,0,0,0 \ No newline at end of file diff --git a/doc/styles/ComboBox.md b/doc/styles/ComboBox.md new file mode 100644 index 000000000..5781b1cff --- /dev/null +++ b/doc/styles/ComboBox.md @@ -0,0 +1,103 @@ +# ComboBox Control +## Styles + +Style Key|IsDefaultStyle* +-|- +ComboBoxStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +ComboBoxItemForeground|SolidColorBrush|OnSurfaceBrush +ComboBoxItemForegroundPressed|SolidColorBrush|OnSurfaceBrush +ComboBoxItemForegroundPointerOver|SolidColorBrush|OnSurfaceBrush +ComboBoxItemForegroundDisabled|SolidColorBrush|OnSurfaceBrush +ComboBoxItemForegroundSelected|SolidColorBrush|OnSurfaceBrush +ComboBoxItemForegroundSelectedUnfocused|SolidColorBrush|OnSurfaceBrush +ComboBoxItemForegroundSelectedPressed|SolidColorBrush|OnSurfaceBrush +ComboBoxItemForegroundSelectedPointerOver|SolidColorBrush|OnSurfaceBrush +ComboBoxItemForegroundSelectedDisabled|SolidColorBrush|OnSurfaceBrush +ComboBoxItemBackground|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBackgroundPressed|SolidColorBrush|OnSurfaceVariantHoverBrush +ComboBoxItemBackgroundPointerOver|SolidColorBrush|OnSurfaceVariantHoverBrush +ComboBoxItemBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBackgroundSelected|SolidColorBrush|PrimarySelectedBrush +ComboBoxItemBackgroundSelectedUnfocused|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBackgroundSelectedPressed|SolidColorBrush|PrimarySelectedBrush +ComboBoxItemBackgroundSelectedPointerOver|SolidColorBrush|PrimarySelectedBrush +ComboBoxItemBackgroundSelectedDisabled|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBorderBrush|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBorderBrushSelected|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBorderBrushSelectedUnfocused|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBorderBrushSelectedPressed|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBorderBrushSelectedPointerOver|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemBorderBrushSelectedDisabled|SolidColorBrush|SystemControlTransparentBrush +ComboBoxBorderBrush|SolidColorBrush|OutlineBrush +ComboBoxBorderBrushPointerOver|SolidColorBrush|OnSurfaceBrush +ComboBoxBorderBrushPressed|SolidColorBrush|OnSurfaceBrush +ComboBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceDisabledBrush +ComboBoxBorderBrushOpened|SolidColorBrush|PrimaryBrush +ComboBoxDropDownGlyphForeground|SolidColorBrush|SystemControlTransparentBrush +ComboBoxDropDownGlyphForegroundDisabled|SolidColorBrush|SystemControlTransparentBrush +ComboBoxDropDownGlyphForegroundFocused|SolidColorBrush|SystemControlTransparentBrush +ComboBoxDropDownGlyphForegroundFocusedPressed|SolidColorBrush|SystemControlTransparentBrush +ComboBoxDropDownForeground|SolidColorBrush|SystemControlTransparentBrush +ComboBoxDropDownBorderBrush|SolidColorBrush|SystemControlTransparentBrush +ComboBoxDropDownBackground|SolidColorBrush|SurfaceBrush +ComboBoxDropDownBackgroundPointerOver|SolidColorBrush|SurfaceBrush +ComboBoxDropDownBackgroundPointerPressed|SolidColorBrush|SurfaceBrush +ComboBoxDropDownBackgroundPressed|SolidColorBrush|SurfaceBrush +ComboBoxDropDownBackgroundFocused|SolidColorBrush|SurfaceBrush +ComboBoxDropDownBackgroundFocusedPressed|SolidColorBrush|SurfaceBrush +ComboBoxEditableDropDownGlyphForeground|SolidColorBrush|SystemControlTransparentBrush +ComboBoxItemPillFillBrush|SolidColorBrush|SystemControlTransparentBrush +ComboBoxBackground|SolidColorBrush|SystemControlTransparentBrush +ComboBoxBackgroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +ComboBoxBackgroundPressed|SolidColorBrush|SystemControlTransparentBrush +ComboBoxBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +ComboBoxBackgroundUnfocused|SolidColorBrush|SystemControlTransparentBrush +ComboBoxBackgroundFocused|SolidColorBrush|SystemControlTransparentBrush +ComboBoxBackgroundFocusedPressed|SolidColorBrush|SystemControlTransparentBrush +ComboBoxForeground|SolidColorBrush|OnSurfaceBrush +ComboBoxForegroundPointerOver|SolidColorBrush|OnSurfaceBrush +ComboBoxForegroundPressed|SolidColorBrush|OnSurfaceBrush +ComboBoxForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +ComboBoxForegroundFocused|SolidColorBrush|OnSurfaceBrush +ComboBoxForegroundFocusedPressed|SolidColorBrush|OnSurfaceBrush +ComboBoxPlaceHolderForeground|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxPlaceHolderForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxPlaceHolderForegroundPressed|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxPlaceHolderForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +ComboBoxPlaceHolderForegroundFocused|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxPlaceHolderForegroundFocusedPressed|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxLeadingIconForeground|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxLeadingIconForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +ComboBoxArrowForeground|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxArrowForegroundOpened|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxUpperPlaceHolderForeground|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxUpperPlaceHolderForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxUpperPlaceHolderForegroundPressed|SolidColorBrush|OnSurfaceVariantBrush +ComboBoxUpperPlaceHolderForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +ComboBoxUpperPlaceHolderForegroundFocused|SolidColorBrush|PrimaryBrush +ComboBoxUpperPlaceHolderForegroundFocusedPressed|SolidColorBrush|PrimaryBrush +ComboBoxUpperPlaceHolderForegroundOpened|SolidColorBrush|PrimaryBrush +ComboBoxCornerRadius|CornerRadius|4 +ComboBoxHeight|Double|50 +ComboBoxMinHeight|Double|56 +ComboBoxLeadingIconWidth|Double|20 +ComboBoxDownGlyphWidth|Double|10 +ComboBoxUpGlyphWidth|Double|10 +ComboBoxDownGlyphHeight|Double|5 +ComboBoxUpGlyphHeight|Double|5 +ComboBoxDownGlyphMargin|Thickness|7,0 +ComboBoxUpGlyphMargin|Thickness|7,0 +ComboBoxLeadingIconMargin|Thickness|2,0,18,0 +ComboBoxBorderThickness|Thickness|1 +ComboBoxOpenedBorderThickness|Thickness|2 +ComboBoxPadding|Thickness|16,0 \ No newline at end of file diff --git a/doc/styles/DatePicker.md b/doc/styles/DatePicker.md new file mode 100644 index 000000000..ffbc7f5fe --- /dev/null +++ b/doc/styles/DatePicker.md @@ -0,0 +1,57 @@ +# DatePicker Control +## Styles + +Style Key|IsDefaultStyle* +-|- +DatePickerStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +DatePickerFlyoutButtonBackground|SolidColorBrush|SystemControlTransparentBrush +DatePickerFlyoutPresenterBackground|SolidColorBrush|SurfaceBrush +DatePickerFlyoutPresenterBorderBrush|SolidColorBrush|OnSurfaceFocusedBrush +DatePickerFlyoutPresenterSpacerFill|SolidColorBrush|OnSurfaceFocusedBrush +DatePickerFlyoutPresenterHighlightFill|SolidColorBrush|PrimarySelectedBrush +DatePickerFlyoutPresenterCornerRadius|CornerRadius|OverlayCornerRadius +DatePickerButtonBackground|SolidColorBrush|SurfaceVariantBrush +DatePickerButtonBackgroundPointerOver|SolidColorBrush|SurfaceVariantBrush +DatePickerButtonBackgroundPressed|SolidColorBrush|SurfaceVariantBrush +DatePickerButtonBackgroundDisabled|SolidColorBrush|PrimaryFocusedBrush +DatePickerButtonForeground|SolidColorBrush|PrimaryBrush +DatePickerButtonForegroundPointerOver|SolidColorBrush|PrimaryBrush +DatePickerButtonForegroundPressed|SolidColorBrush|PrimaryBrush +DatePickerButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +DatePickerPlaceholderTextForeground|SolidColorBrush|OnSurfaceLowBrush +DatePickerButtonDateTextForeground|SolidColorBrush|OnSurfaceVariantBrush +DatePickerButtonDateTextForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +DatePickerButtonDateTextForegroundPressed|SolidColorBrush|OnSurfaceVariantBrush +DatePickerButtonDateTextForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +DatePickerButtonBorderBrush|SolidColorBrush|PrimaryBrush +DatePickerButtonBorderBrushPointerOver|SolidColorBrush|PrimaryBrush +DatePickerButtonBorderBrushPressed|SolidColorBrush|PrimaryBrush +DatePickerButtonBorderBrushDisabled|SolidColorBrush|OnSurfaceLowBrush +DatePickerFlyoutPresenterFontFamily|FontFamily|MaterialRegularFontFamily +DatePickerFlyoutPresenterFontSize|Double|ControlContentThemeFontSize +DatePickerFlyoutBorderThickness|Double|1 +DatePickerSpacerThemeWidth|Double|1 +DatePickerHeight|Double|53 +DatePickerFlyoutElevation|Double|8 +DatePickerFlyoutButtonOpacityPressed|Double|0.65 +DatePickerFlyoutButtonOpacityDisabled|Double|0.65 +DatePickerFlyoutPresenterWidth|Double|296 +DatePickerFlyoutPresenterMinWidth|Double|296 +DatePickerFlyoutPresenterMaxHeight|Double|398 +DatePickerFlyoutPresenterAcceptDismissHostGridHeight|Double|41 +DatePickerFlyoutPresenterHighlightHeight|Double|40 +DatePickerButtonBottomBorderHeight|Double|2 +DatePickerButtonContentHeight|Double|24 +DatePickerButtonHeaderMargin|Thickness|10,8,10,0 +DatePickerButtonPlaceholderMargin|Thickness|4,0,0,0 +DatePickerButtonContentMargin|Thickness|6,24,10,0 +DatePickerHostPadding|Thickness|24,24,8,8 +DatePickerFlyoutButtonPadding|Thickness|0 +DatePickerCornerRadius|CornerRadius|4,4,0,0 \ No newline at end of file diff --git a/doc/styles/FloatingActionButton.md b/doc/styles/FloatingActionButton.md new file mode 100644 index 000000000..e343b7dd0 --- /dev/null +++ b/doc/styles/FloatingActionButton.md @@ -0,0 +1,75 @@ +# FloatingActionButton Control +## Styles + +Style Key|IsDefaultStyle* +-|- +FabStyle|True +SurfaceFabStyle| +SecondaryFabStyle| +TertiaryFabStyle| +SmallFabStyle| +SurfaceSmallFabStyle| +SecondarySmallFabStyle| +TertiarySmallFabStyle| +LargeFabStyle| +SurfaceLargeFabStyle| +SecondaryLargeFabStyle| +TertiaryLargeFabStyle| + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +FabForeground|SolidColorBrush|OnPrimaryContainerBrush +FabForegroundPressed|SolidColorBrush|OnPrimaryContainerBrush +FabForegroundPointerOver|SolidColorBrush|OnPrimaryContainerBrush +FabForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FabBackground|SolidColorBrush|PrimaryContainerBrush +FabBackgroundPressed|SolidColorBrush|PrimaryContainerBrush +FabBackgroundPointerOver|SolidColorBrush|PrimaryContainerBrush +FabBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +FabStateOverlayBackground|SolidColorBrush|SystemControlTransparentBrush +FabStateOverlayBackgroundPointerOver|SolidColorBrush|OnPrimaryContainerHoverBrush +FabStateOverlayBackgroundFocused|SolidColorBrush|OnPrimaryContainerFocusedBrush +FabStateOverlayBackgroundPressed|SolidColorBrush|OnPrimaryContainerPressedBrush +FabStateOverlayBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +FabSurfaceForeground|SolidColorBrush|OnPrimaryContainerBrush +FabSurfaceForegroundPressed|SolidColorBrush|OnPrimaryContainerBrush +FabSurfaceForegroundPointerOver|SolidColorBrush|OnPrimaryContainerBrush +FabSurfaceForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FabSurfaceBackground|SolidColorBrush|SurfaceBrush +FabSurfaceBackgroundPressed|SolidColorBrush|SurfaceBrush +FabSurfaceBackgroundPointerOver|SolidColorBrush|SurfaceBrush +FabSurfaceBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +FabSurfaceStateOverlayBackground|SolidColorBrush|SystemControlTransparentBrush +FabSurfaceStateOverlayBackgroundPointerOver|SolidColorBrush|PrimaryHoverBrush +FabSurfaceStateOverlayBackgroundFocused|SolidColorBrush|PrimaryFocusedBrush +FabSurfaceStateOverlayBackgroundPressed|SolidColorBrush|PrimaryPressedBrush +FabSurfaceStateOverlayBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +FabSecondaryForeground|SolidColorBrush|OnSecondaryContainerBrush +FabSecondaryForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FabSecondaryForegroundPointerOver|SolidColorBrush|OnSecondaryContainerBrush +FabSecondaryForegroundPressed|SolidColorBrush|OnSecondaryContainerBrush +FabSecondaryBackground|SolidColorBrush|SecondaryContainerBrush +FabSecondaryBackgroundPointerOver|SolidColorBrush|SecondaryContainerBrush +FabSecondaryBackgroundPressed|SolidColorBrush|SecondaryContainerBrush +FabSecondaryBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +FabSecondaryStateOverlayBackground|SolidColorBrush|SystemControlTransparentBrush +FabSecondaryStateOverlayBackgroundPointerOver|SolidColorBrush|OnSecondaryContainerHoverBrush +FabSecondaryStateOverlayBackgroundFocused|SolidColorBrush|OnSecondaryContainerFocusedBrush +FabSecondaryStateOverlayBackgroundPressed|SolidColorBrush|OnSecondaryContainerPressedBrush +FabSecondaryStateOverlayBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +FabTertiaryForeground|SolidColorBrush|OnTertiaryContainerBrush +FabTertiaryForegroundPointerOver|SolidColorBrush|OnTertiaryContainerBrush +FabTertiaryForegroundPressed|SolidColorBrush|OnTertiaryContainerBrush +FabTertiaryForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FabTertiaryBackground|SolidColorBrush|TertiaryContainerBrush +FabTertiaryBackgroundPointerOver|SolidColorBrush|TertiaryContainerBrush +FabTertiaryBackgroundPressed|SolidColorBrush|TertiaryContainerBrush +FabTertiaryBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +FabTertiaryStateOverlayBackgroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +FabTertiaryStateOverlayBackgroundFocused|SolidColorBrush|SystemControlTransparentBrush +FabTertiaryStateOverlayBackgroundPressed|SolidColorBrush|SystemControlTransparentBrush +FabTertiaryStateOverlayBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush \ No newline at end of file diff --git a/doc/styles/HyperlinkButton.md b/doc/styles/HyperlinkButton.md new file mode 100644 index 000000000..d15536657 --- /dev/null +++ b/doc/styles/HyperlinkButton.md @@ -0,0 +1,33 @@ +# HyperlinkButton Control +## Styles + +Style Key|IsDefaultStyle* +-|- +HyperlinkButtonStyle|True +SecondaryHyperlinkButtonStyle| + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +HyperlinkButtonForeground|SolidColorBrush|PrimaryBrush +HyperlinkButtonForegroundPointerOver|SolidColorBrush|PrimaryBrush +HyperlinkButtonForegroundPressed|SolidColorBrush|PrimaryBrush +HyperlinkButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +HyperlinkButtonBackground|SolidColorBrush|SystemControlTransparentBrush +HyperlinkButtonBackgroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +HyperlinkButtonBackgroundPressed|SolidColorBrush|SystemControlTransparentBrush +HyperlinkButtonBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +HyperlinkButtonBorderBrush|SolidColorBrush|SystemControlTransparentBrush +HyperlinkButtonBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +HyperlinkButtonBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +HyperlinkButtonBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +HyperlinkButtonFontSize|Double|LabelLargeFontSize +HyperlinkButtonFontFamily|FontFamily|MaterialRegularFontFamily +HyperlinkButtonBackgroundOpacity|Double|1 +HyperlinkButtonBackgroundOpacityPointerOver|Double|MediumOpacity +HyperlinkButtonBackgroundOpacityPressed|Double|LowOpacity +HyperlinkButtonBackgroundOpacityDisabled|Double|1 +HyperlinkButtonPadding|Thickness|0 diff --git a/doc/styles/NavigationView.md b/doc/styles/NavigationView.md new file mode 100644 index 000000000..288be95e0 --- /dev/null +++ b/doc/styles/NavigationView.md @@ -0,0 +1,160 @@ +# NavigationView Control +## Styles + +Style Key|IsDefaultStyle* +-|- +NavigationViewStyle|True +NavigationViewItemStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +MaterialNavigationViewSplitViewCornerRadius|CornerRadius|0,14,14,0 +MaterialNavigationViewContentGridCornerRadius|CornerRadius|14,0,0,14 +MaterialNavigationViewButtonWidth|Double|56 +MaterialNavigationViewButtonCornerRadius|CornerRadius|28 +MaterialNavigationViewButtonIconLength|Double|24 +MaterialNavigationViewButtonIconSymbolFontSize|Double|24 +MaterialNavigationViewButtonMarginWhenStackedVertically|Thickness|12,0 +MaterialNavigationItemHeight|Double|56 +MaterialNavigationViewItemCornerRadius|CornerRadius|28 +MaterialNavigationViewItemCornerRadiusLeftOnly|CornerRadius|28,0,0,28 +MaterialNavigationItemLeftMargin|Thickness|12,0 +MaterialNavigationItemIconLength|Double|24 +MaterialNavigationItemContentMargin|Thickness|12,0,0,0 +MaterialNavigationItemContentMarginWithoutIcon|Thickness|0 +NavigationViewAutoSuggestBoxMargin|Thickness|16,0 +TopNavigationViewAutoSuggestBoxMargin|Thickness|4,0 +PaneToggleButtonHeight|Double|56 +PaneToggleButtonWidth|Double|80 +NavigationViewCompactPaneLength|Double|80 +NavigationViewIconBoxWidth|Double|40 +NavigationViewTopPaneHeight|Double|48 +NavigationViewAutoSuggestAreaHeight|Double|40 +TopNavigationViewPaneCustomContentMinWidth|Double|80 +TopNavigationViewOverflowButtonWidth|Double|40 +TopNavigationViewOverflowButtonHeight|Double|40 +TopNavigationViewSettingsButtonWidth|Double|40 +TopNavigationViewSettingsButtonHeight|Double|40 +NavigationViewItemOnLeftMinHeight|Double|56 +NavigationViewPaneHeaderRowMinHeight|Double|56 +NavigationViewItemOnLeftIconBoxHeight|Double|24 +NavigationViewSelectionIndicatorWidth|Double|3 +NavigationViewSelectionIndicatorHeight|Double|24 +NavigationViewSelectionIndicatorRadius|Double|2 +NavigationViewItemSeparatorHeight|Double|1 +TopNavigationViewItemSeparatorWidth|Double|1 +NavigationViewToggleBorderThickness|Thickness|0 +NavigationViewItemBorderThickness|Thickness|1 +NavigationViewItemOnLeftIconBoxMargin|Thickness|3 +NavigationViewItemButtonMargin|Thickness|12,0 +NavigationViewItemInnerHeaderMargin|Thickness|16,0 +TopNavigationViewItemInnerHeaderMargin|Thickness|12,0 +NavigationViewMinimalHeaderMargin|Thickness|-24,44,0,0 +NavigationViewButtonHolderGridMargin|Thickness|0 +NavigationViewPaneContentGridMargin|Thickness|-1,3 +NavigationViewContentGridBorderThickness|Thickness|1,1,0,0 +NavigationViewMinimalContentGridBorderThickness|Thickness|0,1,0,0 +TopNavigationViewContentGridBorderThickness|Thickness|0,1,0,0 +TopNavigationViewTopNavGridMargin|Thickness|4,0 +NavigationViewBorderThickness|Thickness|1 +NavigationViewHeaderMargin|Thickness|56,44,0,0 +NavigationViewContentPresenterMargin|Thickness|0 +NavigationViewContentMargin|Thickness|0 +NavigationViewMinimalContentMargin|Thickness|0 +TopNavigationViewContentMargin|Thickness|0 +NavigationViewPaneTitlePresenterMargin|Thickness|8,4,0,0 +NavigationViewItemMargin|Thickness|0 +TopNavigationViewItemMargin|Thickness|0 +NavigationViewItemSeparatorMargin|Thickness|0,3,0,4 +NavigationViewCompactItemSeparatorMargin|Thickness|0,3,0,4 +TopNavigationViewItemSeparatorMargin|Thickness|3,0,4,0 +TopNavigationViewOverflowButtonMargin|Thickness|0 +NavigationViewItemContentPresenterMargin|Thickness|4,-1,8,-1 +NavigationViewCompactItemContentPresenterMargin|Thickness|0 +TopNavigationViewItemContentPresenterMargin|Thickness|8,-1,12,-1 +TopNavigationViewItemContentOnlyContentPresenterMargin|Thickness|12,0 +NavigationViewItemExpandChevronMargin|Thickness|0,0,-14,0 +TopNavigationViewItemExpandChevronMargin|Thickness|-16,0,0,0 +TopNavigationViewItemIconOnlyExpandChevronMargin|Thickness|0 +TopNavigationViewItemContentOnlyExpandChevronMargin|Thickness|-12,0,0,0 +TopNavigationViewItemOnOverflowContentPresenterMargin|Thickness|12,0,20,0 +TopNavigationViewItemOnOverflowNoIconContentPresenterMargin|Thickness|16,0,20,0 +TopNavigationViewItemOnOverflowExpandChevronMargin|Thickness|-4,0,-8,0 +TopNavigationViewItemOnOverflowExpandChevronPadding|Thickness|12,0 +NavigationViewContentGridCornerRadius|CornerRadius|8,0,0,0 +TopNavigationViewContentGridCornerRadius|CornerRadius|0 +NavigationViewMinimalContentGridCornerRadius|CornerRadius|0 +TopNavigationViewOverflowMenuPadding|Thickness|0,8 +NavigationViewItemChildrenMenuFlyoutPadding|Thickness|0,8 +NavigationViewItemExpandedGlyphFontSize|Double|8 +NavigationViewItemExpandedGlyph|String| +SplitViewOpenPaneThemeLength|Double|320 +SplitViewCompactPaneThemeLength|Double|48 +SplitViewLeftBorderThemeThickness|Thickness|0,0,1,0 +SplitViewRightBorderThemeThickness|Thickness|1,0,0,0 +NavigationViewSplitViewLightDismissOverlayBackground|SolidColorBrush|SystemControlPageBackgroundMediumAltMediumBrush +SplitViewPaneAnimationOpenDuration|String|00:00:00.2 +SplitViewPaneAnimationOpenPreDuration|String|00:00:00.19999 +SplitViewPaneAnimationCloseDuration|String|00:00:00.1 +SplitViewPaneRootCornerRadius|CornerRadius|0 +NavigationViewBackground|SolidColorBrush|SurfaceBrush +NavigationViewDefaultPaneBackground|SolidColorBrush|SystemControlPageBackgroundChromeLowBrush +NavigationViewPaneBackground|SolidColorBrush|SurfaceBrush +NavigationViewTopPaneBackground|SolidColorBrush|SystemControlTransparentBrush +NavigationViewDefaultPaneBorderBrush|SolidColorBrush|SurfaceBrush +NavigationViewButtonForeground|SolidColorBrush|OnSurfaceBrush +NavigationViewButtonForegroundPointerOver|SolidColorBrush|OnSurfaceBrush +NavigationViewButtonForegroundPressed|SolidColorBrush|OnSurfaceBrush +NavigationViewButtonForegroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +NavigationViewButtonBackground|SolidColorBrush|SystemControlTransparentBrush +NavigationViewButtonBackgroundPointerOver|SolidColorBrush|PrimaryHoverBrush +NavigationViewButtonBackgroundPressed|SolidColorBrush|PrimaryPressedBrush +NavigationViewButtonBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +NavigationViewButtonRippleFeedback|SolidColorBrush|PrimaryPressedBrush +NavigationViewItemBackground|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBackgroundPointerOver|SolidColorBrush|PrimaryHoverBrush +NavigationViewItemBackgroundPressed|SolidColorBrush|PrimaryPressedBrush +NavigationViewItemBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +NavigationViewItemBackgroundSelected|SolidColorBrush|PrimarySelectedBrush +NavigationViewItemBackgroundSelectedPointerOver|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBackgroundSelectedPressed|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBackgroundSelectedDisabled|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemForeground|SolidColorBrush|OnSurfaceBrush +NavigationViewItemForegroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemForegroundPressed|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemForegroundDisabled|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemForegroundSelected|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemForegroundSelectedPointerOver|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemForegroundSelectedPressed|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemForegroundSelectedDisabled|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBorderBrush|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBorderBrushSelected|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBorderBrushSelectedPointerOver|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBorderBrushSelectedPressed|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemBorderBrushSelectedDisabled|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemSeparatorForeground|SolidColorBrush|OnSurfacePressedBrush +NavigationViewItemHeaderForeground|SolidColorBrush|SystemControlTransparentBrush +NavigationViewSelectionIndicatorForeground|SolidColorBrush|SystemControlTransparentBrush +NavigationViewItemRippleFeedback|SolidColorBrush|PrimaryPressedBrush +TopNavigationViewItemForeground|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemForegroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemForegroundPressed|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemForegroundDisabled|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemForegroundSelected|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemForegroundSelectedPointerOver|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemForegroundSelectedPressed|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemBackground|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemBackgroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemBackgroundPressed|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemBackgroundSelected|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemBackgroundSelectedPointerOver|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemBackgroundSelectedPressed|SolidColorBrush|SystemControlTransparentBrush +TopNavigationViewItemSeparatorForeground|SolidColorBrush|SystemControlTransparentBrush diff --git a/doc/styles/PasswordBox.md b/doc/styles/PasswordBox.md new file mode 100644 index 000000000..390b0ea0d --- /dev/null +++ b/doc/styles/PasswordBox.md @@ -0,0 +1,61 @@ +# PasswordBox Control +## Styles + +Style Key|IsDefaultStyle* +-|- +FilledPasswordBoxStyle|True +OutlinedPasswordBoxStyle| + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +PasswordBoxRevealGlyphPathData|String|`M11 0.5C6 0.5 1.73 3.61 0 8C1.73 12.39 6 15.5 11 15.5C16 15.5 20.27 12.39 22 8C20.27 3.61 16 0.5 11 0.5ZM11 13C8.24 13 6 10.76 6 8C6 5.24 8.24 3 11 3C13.76 3 16 5.24 16 8C16 10.76 13.76 13 11 13ZM11 5C9.34 5 8 6.34 8 8C8 9.66 9.34 11 11 11C12.66 11 14 9.66 14 8C14 6.34 12.66 5 11 5Z` +PasswordBoxRevealButtonForeground|SolidColorBrush|OnSurfaceVariantBrush +PasswordBoxLeadingIconForeground|SolidColorBrush|OnSurfaceVariantBrush +PasswordBoxLeadingIconForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +FilledPasswordBoxBackground|SolidColorBrush|SurfaceVariantBrush +FilledPasswordBoxBackgroundPointerOver|SolidColorBrush|OnSurfaceVariantHoverBrush +FilledPasswordBoxBackgroundFocused|SolidColorBrush|SurfaceVariantBrush +FilledPasswordBoxBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FilledPasswordBoxBorderBrush|SolidColorBrush|OnSurfaceVariantBrush +FilledPasswordBoxBorderBrushPointerOver|SolidColorBrush|OnSurfaceBrush +FilledPasswordBoxBorderBrushFocused|SolidColorBrush|PrimaryBrush +FilledPasswordBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FilledPasswordBoxForeground|SolidColorBrush|OnSurfaceBrush +FilledPasswordBoxForegroundPointerOver|SolidColorBrush|OnSurfaceBrush +FilledPasswordBoxForegroundFocused|SolidColorBrush|OnSurfaceBrush +FilledPasswordBoxForegroundDisabled|SolidColorBrush|OnSurfaceBrush +FilledPasswordBoxForegroundOpacityDisabled|Double|LowOpacity +FilledPasswordBoxPlaceholderForeground|SolidColorBrush|OnSurfaceVariantBrush +FilledPasswordBoxPlaceholderForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +FilledPasswordBoxPlaceholderForegroundFocused|SolidColorBrush|PrimaryBrush +FilledPasswordBoxPlaceholderForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +FilledPasswordBoxRevealButtonForeground|SolidColorBrush|OnSurfaceVariantBrush +FilledPasswordBoxFontFamily|FontFamily|MaterialMediumFontFamily +FilledPasswordBoxFontWeight|String|BodyLargeFontWeight +FilledPasswordBoxFontSize|Double|BodyLargeFontSize +FilledPasswordBoxCharacterSpacing|Int32|BodyLargeCharacterSpacing +OutlinedPasswordBoxBackground|SolidColorBrush|SystemControlTransparentBrush +OutlinedPasswordBoxBackgroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +OutlinedPasswordBoxBackgroundFocused|SolidColorBrush|SystemControlTransparentBrush +OutlinedPasswordBoxBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +OutlinedPasswordBoxBorderBrush|SolidColorBrush|OutlineBrush +OutlinedPasswordBoxBorderBrushPointerOver|SolidColorBrush|OnSurfaceBrush +OutlinedPasswordBoxBorderBrushFocused|SolidColorBrush|PrimaryBrush +OutlinedPasswordBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceDisabledLowBrush +OutlinedPasswordBoxForeground|SolidColorBrush|OnSurfaceBrush +OutlinedPasswordBoxForegroundPointerOver|SolidColorBrush|OnSurfaceBrush +OutlinedPasswordBoxForegroundFocused|SolidColorBrush|OnSurfaceBrush +OutlinedPasswordBoxForegroundDisabled|SolidColorBrush|OnSurfaceBrush +OutlinedPasswordBoxForegroundOpacityDisabled|Double|LowOpacity +OutlinedPasswordBoxPlaceholderForeground|SolidColorBrush|OnSurfaceVariantBrush +OutlinedPasswordBoxPlaceholderForegroundPointerOver|SolidColorBrush|OnSurfaceBrush +OutlinedPasswordBoxPlaceholderForegroundFocused|SolidColorBrush|PrimaryBrush +OutlinedPasswordBoxPlaceholderForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +OutlinedPasswordBoxFontFamily|FontFamily|MaterialMediumFontFamily +OutlinedPasswordBoxFontWeight|String|BodyLargeFontWeight +OutlinedPasswordBoxFontSize|Double|BodyLargeFontSize +OutlinedPasswordBoxCharacterSpacing|Int32|BodyLargeCharacterSpacing diff --git a/doc/styles/PipsPager.md b/doc/styles/PipsPager.md new file mode 100644 index 000000000..fd5653c74 --- /dev/null +++ b/doc/styles/PipsPager.md @@ -0,0 +1,65 @@ +# PipsPager Control +## Styles + +Style Key|IsDefaultStyle* +-|- +PipsPagerStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +PipsPagerSelectionIndicatorBackground|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorBackgroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorBackgroundPressed|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorBackgroundSelected|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorBorderBrush|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorBorderBrushSelected|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +PipsPagerSelectionIndicatorForeground|SolidColorBrush|SurfaceVariantBrush +PipsPagerSelectionIndicatorForegroundPointerOver|SolidColorBrush|SurfaceBrush +PipsPagerSelectionIndicatorForegroundPressed|SolidColorBrush|SurfaceBrush +PipsPagerSelectionIndicatorForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +PipsPagerSelectionIndicatorForegroundFocused|SolidColorBrush|SurfaceBrush +PipsPagerSelectionIndicatorForegroundSelected|SolidColorBrush|PrimaryBrush +MaterialPipsPagerVisualStateEllipseFill|SolidColorBrush|SystemControlTransparentBrush +MaterialPipsPagerVisualStateEllipseFillPointerOver|SolidColorBrush|PrimaryHoverBrush +MaterialPipsPagerVisualStateEllipseFillPressed|SolidColorBrush|PrimaryPressedBrush +MaterialPipsPagerVisualStateEllipseFillFocused|SolidColorBrush|PrimaryFocusedBrush +PipsPagerNavigationButtonBackground|SolidColorBrush|SystemControlTransparentBrush +PipsPagerNavigationButtonBackgroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +PipsPagerNavigationButtonBackgroundPressed|SolidColorBrush|SystemControlTransparentBrush +PipsPagerNavigationButtonBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +PipsPagerNavigationButtonBorderBrush|SolidColorBrush|SystemControlTransparentBrush +PipsPagerNavigationButtonBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +PipsPagerNavigationButtonBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +PipsPagerNavigationButtonBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +PipsPagerNavigationButtonForeground|SolidColorBrush|PrimaryBrush +PipsPagerNavigationButtonForegroundPointerOver|SolidColorBrush|PrimaryBrush +PipsPagerNavigationButtonForegroundPressed|SolidColorBrush|PrimaryBrush +PipsPagerNavigationButtonForegroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +MaterialPipsPagerNavigationButtonVisualStateEllipseFill|SolidColorBrush|SystemControlTransparentBrush +MaterialPipsPagerNavigationButtonVisualStateEllipseFillPointerOver|SolidColorBrush|PrimaryHoverBrush +MaterialPipsPagerNavigationButtonVisualStateEllipseFillPressed|SolidColorBrush|PrimaryPressedBrush +MaterialPipsPagerNavigationButtonVisualStateEllipseFillFocused|SolidColorBrush|PrimaryFocusedBrush +MaterialPipsPagerNavigationButtonVisualStateEllipseFillUnfocused|Brush|PrimaryUnfocusedBrush +PipsPagerHorizontalOrientationButtonWidth|Double|12 +PipsPagerHorizontalOrientationButtonHeight|Double|12 +PipsPagerVerticalOrientationButtonWidth|Double|12 +PipsPagerVerticalOrientationButtonHeight|Double|12 +PipsPagerButtonBorderThickness|Thickness|0 +PipsPagerNavigationButtonBorderThickness|Thickness|0 +PipsPagerPreviousPageButtonData|String|`M3.33681 0.322148C3.63156 -0.107383 4.36844 -0.107382 4.66319 0.322148L7.89626 5.03356C8.19101 5.46309 7.82257 6 7.23307 6L0.766932 6C0.177427 6 -0.191014 5.46309 0.103739 5.03356L3.33681 0.322148Z` +PipsPagerNextPageButtonData|String|`M4.66319 5.67785C4.36844 6.10738 3.63156 6.10738 3.33681 5.67785L0.103738 0.966444C-0.191015 0.536913 0.177425 6.83871e-07 0.766931 6.32335e-07L7.23307 6.70473e-08C7.82257 1.55111e-08 8.19101 0.536912 7.89626 0.966443L4.66319 5.67785Z` +PipsPagerNavigationButtonHeight|Double|40 +PipsPagerNavigationButtonWidth|Double|40 +PipsPagerNavigationButtonPadding|Thickness|4 +PipsPagerNavigationVisualStatesEllipseWidth|Double|12 +PipsPagerNavigationVisualStatesEllipseHeight|Double|12 +PipsPagerSelectedEllipseSize|Double|8 +PipsPagerNormalEllipseSize|Double|8 diff --git a/doc/styles/ProgressBar.md b/doc/styles/ProgressBar.md new file mode 100644 index 000000000..16be9229b --- /dev/null +++ b/doc/styles/ProgressBar.md @@ -0,0 +1,17 @@ +# ProgressBar Control +## Styles + +Style Key|IsDefaultStyle* +-|- +ProgressBarStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +ProgressBarForeground|SolidColorBrush|PrimaryBrush +ProgressBarBackground|SolidColorBrush|SurfaceVariantBrush +ProgressBarMinWidth|Double|250 +ProgressBarHeight|Double|4 diff --git a/doc/styles/ProgressRing.md b/doc/styles/ProgressRing.md new file mode 100644 index 000000000..1cd82507f --- /dev/null +++ b/doc/styles/ProgressRing.md @@ -0,0 +1,15 @@ +# ProgressRing Control +## Styles + +Style Key|IsDefaultStyle* +-|- +ProgressRingStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +ProgressRingForeground|SolidColorBrush|PrimaryBrush +ProgressRingBackground|SolidColorBrush|SystemControlTransparentBrush \ No newline at end of file diff --git a/doc/styles/RadioButton.md b/doc/styles/RadioButton.md new file mode 100644 index 000000000..1bfba71b8 --- /dev/null +++ b/doc/styles/RadioButton.md @@ -0,0 +1,51 @@ +# RadioButton Control +## Styles + +Style Key|IsDefaultStyle* +-|- +RadioButtonStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +RadioButtonForeground|SolidColorBrush|OnSurfaceVariantBrush +RadioButtonForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +RadioButtonForegroundPressed|SolidColorBrush|OnSurfaceVariantBrush +RadioButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +RadioButtonOuterEllipseStroke|SolidColorBrush|OnSurfaceVariantBrush +RadioButtonOuterEllipseStrokePointerOver|SolidColorBrush|OnSurfaceBrush +RadioButtonOuterEllipseStrokePressed|SolidColorBrush|OnSurfaceBrush +RadioButtonOuterEllipseStrokeDisabled|SolidColorBrush|OnSurfaceLowBrush +RadioButtonOuterEllipseCheckedStroke|SolidColorBrush|PrimaryBrush +RadioButtonOuterEllipseCheckedStrokePointerOver|SolidColorBrush|PrimaryBrush +RadioButtonOuterEllipseCheckedStrokePressed|SolidColorBrush|PrimaryBrush +RadioButtonOuterEllipseCheckedStrokeDisabled|SolidColorBrush|OnSurfaceLowBrush +RadioButtonOuterEllipseFill|SolidColorBrush|SystemControlTransparentBrush +RadioButtonOuterEllipseFillPointerOver|SolidColorBrush|SystemControlTransparentBrush +RadioButtonOuterEllipseFillPressed|SolidColorBrush|SystemControlTransparentBrush +RadioButtonOuterEllipseFillDisabled|SolidColorBrush|SystemControlTransparentBrush +RadioButtonOuterEllipseCheckedFill|SolidColorBrush|PrimaryBrush +RadioButtonOuterEllipseCheckedFillPointerOver|SolidColorBrush|PrimaryBrush +RadioButtonOuterEllipseCheckedFillPressed|SolidColorBrush|PrimaryBrush +RadioButtonOuterEllipseCheckedFillDisabled|SolidColorBrush|OnSurfaceLowBrush +RadioButtonStateCircleBackgroundUnchecked|SolidColorBrush|OnSurfaceBrush +RadioButtonStateCircleBackgroundChecked|SolidColorBrush|PrimaryBrush +RadioButtonStateCircleOpacityPointerOver|Double|HoverOpacity +RadioButtonStateCircleOpacityPressed|Double|PressedOpacity +RadioButtonStateCircleOpacityFocused|Double|FocusedOpacity +RadioButtonFontFamily|FontFamily|MaterialMediumFontFamily +RadioButtonFontWeight|String|BodySmallFontWeight +RadioButtonFontSize|Double|BodySmallFontSize +RadioButtonCharacterSpacing|Int32|BodySmallCharacterSpacing +RadioButtonGridLength|GridLength|40 +RadioButtonWidth|Double|40 +RadioButtonHeight|Double|40 +RadioButtonCheckGlyphSize|Double|20 +RadioButtonMinHeight|Double|40 +RadioButtonMinWidth|Double|40 +RadioButtonStrokeThickness|Double|2 +RadioButtonPadding|Thickness|4,0,0,0 +RadioButtonCheckEllipsePadding|Thickness|5 \ No newline at end of file diff --git a/doc/styles/RatingControl.md b/doc/styles/RatingControl.md new file mode 100644 index 000000000..6baec07e2 --- /dev/null +++ b/doc/styles/RatingControl.md @@ -0,0 +1,40 @@ +# RatingControl Control +## Styles + +Style Key|IsDefaultStyle* +-|- +RatingControlStyle|True +SecondaryRatingControlStyle| + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +RatingControlHeight|Double|32 +RatingControlCaptionHeight|Double|32 +SecondaryRatingControlCaptionHeight|Double|32 +RatingControlForeground|SolidColorBrush|PrimaryBrush +RatingControlForegroundUnselected|SolidColorBrush|OnSurfaceLowBrush +RatingControlForegroundSelected|SolidColorBrush|PrimaryBrush +RatingControlPlaceholderForeground|SolidColorBrush|OnSurfaceLowBrush +RatingControlPlaceholderForegroundPointerOver|SolidColorBrush|PrimaryBrush +RatingControlForegroundPointerOverUnselected|SolidColorBrush|PrimaryBrush +RatingControlForegroundPointerOverSelected|SolidColorBrush|PrimaryBrush +RatingControlForegroundDisabledSelected|SolidColorBrush|OnSurfaceLowBrush +SecondaryRatingControlForeground|SolidColorBrush|SecondaryBrush +SecondaryRatingControlForegroundUnselected|SolidColorBrush|OnSurfaceLowBrush +SecondaryRatingControlForegroundSelected|SolidColorBrush|SecondaryBrush +SecondaryRatingControlPlaceholderForeground|SolidColorBrush|OnSurfaceLowBrush +SecondaryRatingControlPlaceholderForegroundPointerOver|SolidColorBrush|SecondaryBrush +SecondaryRatingControlForegroundPointerOverUnselected|SolidColorBrush|SecondaryBrush +SecondaryRatingControlForegroundPointerOverSelected|SolidColorBrush|SecondaryBrush +SecondaryRatingControlForegroundDisabledSelected|SolidColorBrush|OnSurfaceLowBrush +RatingControlCaptionForeground|SolidColorBrush|OnSurfaceBrush +RatingControlCaptionFontFamily|FontFamily|MaterialRegularFontFamily +RatingControlCaptionStyle|StaticResourceRef|CaptionMedium +RatingControlFontFamily|FontFamily|SymbolThemeFontFamily +SecondaryRatingControlCaptionForeground|SolidColorBrush|OnSurfaceBrush +SecondaryRatingControlCaptionFontFamily|FontFamily|MaterialRegularFontFamily +SecondaryRatingControlCaptionStyle|StaticResourceRef|CaptionMedium diff --git a/doc/styles/Slider.md b/doc/styles/Slider.md new file mode 100644 index 000000000..1295575a7 --- /dev/null +++ b/doc/styles/Slider.md @@ -0,0 +1,47 @@ +# Slider Control +## Styles + +Style Key|IsDefaultStyle* +-|- +SliderStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +MaterialSliderThumbDisabledColor|Color|#685C64 +MaterialSliderThumbDisabledBrush|SolidColorBrush|Color = MaterialSliderThumbDisabledColor +SliderFocusVisualMargin|Thickness|-7,0 +SliderFontFamily|FontFamily|MaterialRegularFontFamily +SliderFontSize|Double|LabelMediumFontSize +SliderTrackFill|SolidColorBrush|SurfaceVariantBrush +SliderTrackFillDisabled|SolidColorBrush|OnSurfaceSelectedBrush +SliderTrackValueFill|SolidColorBrush|PrimaryBrush +SliderTrackValueFillDisabled|SolidColorBrush|SystemControlDisabledChromeDisabledHighBrush +SliderHorizontalFillCornerRadius|CornerRadius|4,0,0,4 +SliderVerticalFillCornerRadius|CornerRadius|0,0,4,4 +SliderTrackThickness|Double|4 +SliderFillThickness|Double|6 +SliderTickBarFill|SolidColorBrush|OnSurfaceVariantBrush +SliderTickBarFillDisabled|SolidColorBrush|SystemControlDisabledChromeDisabledHighBrush +SliderInlineTickBarFill|SolidColorBrush|OnSurfaceVariantBrush +SliderTopTickBarHeight|Double|4 +SliderBottomTickBarHeight|Double|4 +SliderHorizontalInlineTickBarHeight|Double|2 +SliderLeftTickBarWidth|Double|4 +SliderRightTickBarWidth|Double|4 +SliderVerticallInlineTickBarWidth|Double|2 +SliderTopTickBarMargin|Thickness|0,0,0,4 +SliderBottomTickBarMargin|Thickness|0,4,0,0 +SliderLeftTickBarMargin|Thickness|0,0,4,0 +SliderRightTickBarMargin|Thickness|4,0,0,0 +SliderThumbBackground|SolidColorBrush|PrimaryBrush +SliderThumbBackgroundDisabled|SolidColorBrush|MaterialSliderThumbDisabledBrush +SliderThumbWidth|Double|20 +SliderThumbHeight|Double|20 +SliderThumbCornerRadius|Double|10 +SliderTrackCornerRadius|CornerRadius|ControlCornerRadius +SliderHorizontalFocusVisualMargin|Thickness|-14,-6 +SliderVerticalFocusVisualMargin|Thickness|-6,-14 \ No newline at end of file diff --git a/doc/styles/TextBlock.md b/doc/styles/TextBlock.md new file mode 100644 index 000000000..5720d2f96 --- /dev/null +++ b/doc/styles/TextBlock.md @@ -0,0 +1,80 @@ +# TextBlock Control +## Styles + +Style Key|IsDefaultStyle* +-|- +DisplayLarge| +DisplayMedium| +DisplaySmall| +HeadlineLarge| +HeadlineMedium| +HeadlineSmall| +TitleLarge| +TitleMedium| +TitleSmall| +LabelLarge| +LabelMedium| +LabelSmall| +LabelExtraSmall| +BodyLarge| +BodyMedium|True +BodySmall| +CaptionLarge| +CaptionMedium| +CaptionSmall| + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling `(Typography)` + +Key|Type|Value +-|-|- +DisplayLargeFontWeight|String|Normal +DisplayLargeFontSize|Double|57 +DisplayLargeCharacterSpacing|Int32|-17 +DisplayMediumFontWeight|String|Normal +DisplayMediumFontSize|Double|45 +DisplaySmallFontWeight|String|Normal +DisplaySmallFontSize|Double|36 +HeadlineLargeFontWeight|String|Normal +HeadlineLargeFontSize|Double|32 +HeadlineMediumFontWeight|String|Normal +HeadlineMediumFontSize|Double|28 +HeadlineSmallFontWeight|String|Normal +HeadlineSmallFontSize|Double|24 +TitleLargeFontWeight|String|Normal +TitleLargeFontSize|Double|22 +TitleMediumFontWeight|String|Medium +TitleMediumFontSize|Double|16 +TitleSmallFontWeight|String|Medium +TitleSmallFontSize|Double|14 +LabelLargeFontWeight|String|Medium +LabelLargeFontSize|Double|14 +LabelLargeCharacterSpacing|Int32|7 +LabelMediumFontWeight|String|Medium +LabelMediumFontSize|Double|12 +LabelMediumCharacterSpacing|Int32|41 +LabelSmallFontWeight|String|Medium +LabelSmallFontSize|Double|11 +LabelSmallCharacterSpacing|Int32|45 +LabelExtraSmallFontWeight|String|Normal +LabelExtraSmallFontSize|Double|11 +LabelExtraSmallCharacterSpacing|Int32|7 +BodyLargeFontWeight|String|Medium +BodyLargeFontSize|Double|16 +BodyLargeCharacterSpacing|Int32|9 +BodyMediumFontWeight|String|Medium +BodyMediumFontSize|Double|14 +BodyMediumCharacterSpacing|Int32|17 +BodySmallFontWeight|String|Medium +BodySmallFontSize|Double|12 +BodySmallCharacterSpacing|Int32|33 +CaptionLargeFontWeight|String|Medium +CaptionLargeFontSize|Double|13 +CaptionLargeCharacterSpacing|Int32|-3 +CaptionMediumFontWeight|String|Medium +CaptionMediumFontSize|Double|12 +CaptionMediumCharacterSpacing|Int32|33 +CaptionSmallFontWeight|String|Medium +CaptionSmallFontSize|Double|11 +CaptionSmallCharacterSpacing|Int32|7 diff --git a/doc/styles/TextBox.md b/doc/styles/TextBox.md new file mode 100644 index 000000000..e1a920271 --- /dev/null +++ b/doc/styles/TextBox.md @@ -0,0 +1,76 @@ +# TextBox Control +## Styles + +Style Key|IsDefaultStyle* +-|- +FilledTextBoxStyle|True +OutlinedTextBoxStyle| + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +TextBoxDeleteButtonForeground|SolidColorBrush|OnSurfaceVariantBrush +TextBoxDeleteButtonForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +TextBoxDeleteButtonForegroundPressed|SolidColorBrush|OnSurfaceVariantBrush +TextBoxDeleteButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +TextBoxLeadingIconForeground|SolidColorBrush|OnSurfaceVariantBrush +TextBoxLeadingIconForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +FilledTextBoxBackground|SolidColorBrush|SurfaceVariantBrush +FilledTextBoxBackgroundPointerOver|SolidColorBrush|OnSurfaceVariantHoverBrush +FilledTextBoxBackgroundFocused|SolidColorBrush|SurfaceVariantBrush +FilledTextBoxBackgroundDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FilledTextBoxBorderBrush|SolidColorBrush|OnSurfaceVariantBrush +FilledTextBoxBorderBrushPointerOver|SolidColorBrush|OnSurfaceBrush +FilledTextBoxBorderBrushFocused|SolidColorBrush|PrimaryBrush +FilledTextBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceDisabledBrush +FilledTextBoxDeleteButtonForeground|SolidColorBrush|OnSurfaceVariantBrush +FilledTextBoxDeleteButtonForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +FilledTextBoxDeleteButtonForegroundFocused|SolidColorBrush|OnSurfaceVariantBrush +FilledTextBoxDeleteButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +FilledTextBoxForeground|SolidColorBrush|OnSurfaceBrush +FilledTextBoxForegroundPointerOver|SolidColorBrush|OnSurfaceBrush +FilledTextBoxForegroundFocused|SolidColorBrush|OnSurfaceBrush +FilledTextBoxForegroundDisabled|SolidColorBrush|OnSurfaceBrush +FilledTextBoxForegroundOpacityDisabled|Double|LowOpacity +FilledTextBoxPlaceholderForeground|SolidColorBrush|OnSurfaceVariantBrush +FilledTextBoxPlaceholderForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +FilledTextBoxPlaceholderForegroundFocused|SolidColorBrush|PrimaryBrush +FilledTextBoxPlaceholderForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +OutlinedTextBoxBorderBrush|SolidColorBrush|OutlineBrush +OutlinedTextBoxBorderBrushPointerOver|SolidColorBrush|OnSurfaceBrush +OutlinedTextBoxBorderBrushFocused|SolidColorBrush|PrimaryBrush +OutlinedTextBoxBorderBrushDisabled|SolidColorBrush|OnSurfaceDisabledBrush +OutlinedTextBoxForeground|SolidColorBrush|OnSurfaceBrush +OutlinedTextBoxForegroundPointerOver|SolidColorBrush|OnSurfaceBrush +OutlinedTextBoxForegroundFocused|SolidColorBrush|OnSurfaceBrush +OutlinedTextBoxForegroundDisabled|SolidColorBrush|OnSurfaceBrush +OutlinedTextBoxForegroundOpacityDisabled|Double|LowOpacity +OutlinedTextBoxPlaceholderForeground|SolidColorBrush|OnSurfaceVariantBrush +OutlinedTextBoxPlaceholderForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +OutlinedTextBoxPlaceholderForegroundFocused|SolidColorBrush|PrimaryBrush +OutlinedTextBoxPlaceholderForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +OutlinedTextBoxFontFamily|FontFamily|MaterialMediumFontFamily +OutlinedTextBoxFontWeight|String|BodyLargeFontWeight +OutlinedTextBoxFontSize|Double|BodyLargeFontSize +OutlinedTextBoxCharacterSpacing|Int32|BodyLargeCharacterSpacing +FilledTextBoxFontFamily|FontFamily|MaterialMediumFontFamily +FilledTextBoxFontWeight|String|BodyLargeFontWeight +FilledTextBoxFontSize|Double|BodyLargeFontSize +FilledTextBoxCharacterSpacing|Int32|BodyLargeCharacterSpacing +FilledTextBoxBorderThicknessNormal|Double|TextBoxOutlinedStrokeHeight +FilledTextBoxBorderThicknessFocused|Double|TextBoxFocusStrokeWidth +MaterialTextBoxClearGlyphWidth|Double|20 +MaterialTextBoxClearGlyphHeight|Double|20 +MaterialFilledTextBoxCornerRadius|CornerRadius|4,4,0,0 +MaterialFilledTextBoxPadding|Thickness|16,7 +MaterialFilledTextBoxMinHeight|Double|58 +MaterialFilledTextBoxBorderHeightFocused|Double|2 +MaterialOutlinedTextBoxBorderThickness|Double|1 +MaterialOutlinedTextBoxCornerRadius|CornerRadius|4 +MaterialOutlinedTextBoxPadding|Thickness|16,7,14,7 +MaterialOutlinedTextBoxMinHeight|Double|56 +MaterialOutlinedTextBoxBorderPadding|Thickness|1 +MaterialOutlinedTextBoxBorderThicknessFocused|Double|2 diff --git a/doc/styles/ToggleButton.md b/doc/styles/ToggleButton.md new file mode 100644 index 000000000..c351bfa38 --- /dev/null +++ b/doc/styles/ToggleButton.md @@ -0,0 +1,106 @@ +# ToggleButton Control +## Styles + +Style Key|IsDefaultStyle* +-|- +TextToggleButtonStyle|True +IconToggleButtonStyle| + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +TextToggleButtonBackground|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundPressed|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundChecked|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundCheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundCheckedPressed|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundCheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundIndeterminate|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundIndeterminatePointerOver|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundIndeterminatePressed|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBackgroundIndeterminateDisabled|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonForeground|Color|PrimaryColor +TextToggleButtonForegroundPointerOver|Color|PrimaryColor +TextToggleButtonForegroundPressed|Color|PrimaryColor +TextToggleButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +TextToggleButtonForegroundChecked|Color|PrimaryColor +TextToggleButtonForegroundCheckedPointerOver|Color|PrimaryColor +TextToggleButtonForegroundCheckedPressed|Color|PrimaryColor +TextToggleButtonForegroundCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush +TextToggleButtonForegroundIndeterminate|Color|PrimaryColor +TextToggleButtonForegroundIndeterminatePointerOver|Color|PrimaryColor +TextToggleButtonForegroundIndeterminatePressed|Color|PrimaryColor +TextToggleButtonForegroundIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush +TextToggleButtonFontFamily|FontFamily|MaterialRegularFontFamily +TextToggleButtonFontSize|Double|LabelLargeFontSize +TextToggleButtonBorderBrush|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushChecked|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushCheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushCheckedPressed|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushCheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushIndeterminate|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushIndeterminatePointerOver|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushIndeterminatePressed|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushIndeterminateDisabled|SolidColorBrush|SystemControlTransparentBrush +TextToggleButtonBorderBrushHoverOverlay|SolidColorBrush|OnSurfaceHoverBrush +TextToggleButtonBorderBrushFocusedOverlay|SolidColorBrush|OnSurfaceFocusedBrush +TextToggleButtonBorderBrushSelectedOverlay|SolidColorBrush|OnSurfaceFocusedBrush +TextToggleButtonFeedbackFocused|SolidColorBrush|OnSurfaceFocusedBrush +TextToggleButtonBorderThickness|Thickness|0 +TextToggleButtonCornerRadius|CornerRadius|4 +TextToggleButtonPadding|Thickness|16,8 +TextToggleButtonMinHeight|Double|40 +IconToggleButtonBackground|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundPointerOver|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundPressed|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundDisabled|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundChecked|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundCheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundCheckedPressed|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundCheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundIndeterminate|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundIndeterminatePointerOver|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundIndeterminatePressed|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBackgroundIndeterminateDisabled|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonForeground|SolidColorBrush|OnSurfaceVariantBrush +IconToggleButtonForegroundPointerOver|SolidColorBrush|OnSurfaceVariantBrush +IconToggleButtonForegroundPressed|SolidColorBrush|OnSurfaceVariantBrush +IconToggleButtonForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +IconToggleButtonForegroundChecked|SolidColorBrush|PrimaryBrush +IconToggleButtonForegroundCheckedPointerOver|SolidColorBrush|PrimaryBrush +IconToggleButtonForegroundCheckedPressed|SolidColorBrush|PrimaryBrush +IconToggleButtonForegroundCheckedDisabled|SolidColorBrush|OnSurfaceLowBrush +IconToggleButtonForegroundIndeterminate|SolidColorBrush|PrimaryBrush +IconToggleButtonForegroundIndeterminatePointerOver|SolidColorBrush|PrimaryBrush +IconToggleButtonForegroundIndeterminatePressed|SolidColorBrush|PrimaryBrush +IconToggleButtonForegroundIndeterminateDisabled|SolidColorBrush|OnSurfaceLowBrush +IconToggleButtonBorderBrush|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushPointerOver|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushPressed|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushDisabled|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushChecked|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushCheckedPointerOver|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushCheckedPressed|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushCheckedDisabled|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushIndeterminate|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushIndeterminatePointerOver|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushIndeterminatePressed|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushIndeterminateDisabled|SolidColorBrush|SystemControlTransparentBrush +IconToggleButtonBorderBrushHoverOverlay|SolidColorBrush|OnSurfaceHoverBrush +IconToggleButtonBorderBrushFocusedOverlay|SolidColorBrush|OnSurfaceFocusedBrush +IconToggleButtonBorderBrushSelectedOverlay|SolidColorBrush|OnSurfaceFocusedBrush +IconToggleButtonStateCircleFill|SolidColorBrush|PrimaryBrush +IconToggleButtonStateCircleOpacityPointerOver|Double|HoverOpacity +IconToggleButtonStateCircleOpacityPressed|Double|PressedOpacity +IconToggleButtonStateCircleOpacityFocused|Double|FocusedOpacity +IconToggleButtonBorderThickness|Thickness|0 +IconToggleButtonMinHeight|Double|40 +IconToggleButtonMinWidth|Double|40 \ No newline at end of file diff --git a/doc/styles/ToggleSwitch.md b/doc/styles/ToggleSwitch.md new file mode 100644 index 000000000..5907901b4 --- /dev/null +++ b/doc/styles/ToggleSwitch.md @@ -0,0 +1,63 @@ +# ToggleSwitch Control +## Styles + +Style Key|IsDefaultStyle* +-|- +ToggleSwitchStyle|True + +IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control + +## Lightweight Styling + +Key|Type|Value +-|-|- +ToggleSwitchOffOuterBorderFill|SolidColorBrush|SurfaceVariantBrush +ToggleSwitchOffOuterBorderStroke|SolidColorBrush|OutlineBrush +ToggleSwitchOuterBorderStroke|SolidColorBrush|OutlineBrush +ToggleSwitchOuterBorderFill|SolidColorBrush|SurfaceVariantBrush +ToggleSwitchKnobOffFill|SolidColorBrush|OnSurfaceVariantBrush +ToggleSwitchKnobOffFillPointerOver|SolidColorBrush|OnSurfaceVariantBrush +ToggleSwitchKnobOffFillFocused|SolidColorBrush|OnSurfaceVariantBrush +ToggleSwitchKnobOffFillPressed|SolidColorBrush|OnSurfaceVariantBrush +ToggleSwitchKnobOffFillDisabled|SolidColorBrush|OnSurfaceLowBrush +ToggleSwitchKnobOnFill|SolidColorBrush|OnPrimaryBrush +ToggleSwitchKnobOnFillPointerOver|SolidColorBrush|PrimaryContainerBrush +ToggleSwitchKnobOnFillFocused|SolidColorBrush|PrimaryContainerBrush +ToggleSwitchKnobOnFillPressed|SolidColorBrush|PrimaryContainerBrush +ToggleSwitchKnobOnFillDisabled|SolidColorBrush|SurfaceBrush +ToggleSwitchKnobOnShadowFill|SolidColorBrush|SystemControlTransparentBrush +ToggleSwitchKnobOnShadowFillPointerOver|SolidColorBrush|PrimaryHoverBrush +ToggleSwitchKnobOnShadowFillFocused|SolidColorBrush|PrimaryFocusedBrush +ToggleSwitchKnobOnShadowFillPressed|SolidColorBrush|PrimaryPressedBrush +ToggleSwitchKnobOffShadowFill|SolidColorBrush|SystemControlTransparentBrush +ToggleSwitchKnobOffShadowFillPointerOver|SolidColorBrush|OnSurfaceVariantHoverBrush +ToggleSwitchKnobOffShadowFillFocused|SolidColorBrush|OnSurfaceVariantFocusedBrush +ToggleSwitchKnobOffShadowFillPressed|SolidColorBrush|OnSurfaceVariantPressedBrush +ToggleSwitchOnSwitchKnobBoundsFill|SolidColorBrush|PrimaryBrush +ToggleSwitchKnobBoundsFill|SolidColorBrush|PrimaryBrush +ToggleSwitchKnobBoundsFillPointerOver|SolidColorBrush|PrimaryBrush +ToggleSwitchKnobBoundsFillFocused|SolidColorBrush|PrimaryBrush +ToggleSwitchKnobBoundsFillPressed|SolidColorBrush|PrimaryBrush +ToggleSwitchKnobBoundsFillDisabled|SolidColorBrush|OnSurfaceDisabledBrush +ToggleSwitchOffIconPresenterForeground|SolidColorBrush|SurfaceVariantBrush +ToggleSwitchOffIconPresenterForegroundDisabled|SolidColorBrush|SurfaceVariantBrush +ToggleSwitchOnIconPresenterForeground|SolidColorBrush|OnPrimaryContainerBrush +ToggleSwitchOnIconPresenterForegroundDisabled|SolidColorBrush|OnSurfaceLowBrush +ToggleSwitchThumb|SolidColorBrush|SystemControlTransparentBrush +SwitchKnobWidth|Double|52 +SwitchKnobIncludingOffShadowWidth|Double|56 +SwitchKnobHeight|Double|32 +SwitchKnobRadius|Double|16 +SwitchKnobStrokeThickness|Double|2 +SwitchKnobShadowSize|Double|40 +SmallThumbSize|Double|16 +MediumThumbSize|Double|24 +LargeThumbSize|Double|28 +KnobIconSize|Double|16 +LargeThumbCornerRadius|CornerRadius|14 +KnobIconPadding|Thickness|2 +KnobOnMargin|Thickness|2,0,0,0 +SwitchKnobOnMargin|Thickness|26,0,0,0 +SwitchKnobOffMargin|Thickness|0,0,22,0 +SwitchKnobOnShadowMargin|Thickness|20,0,0,0 +SwitchKnobOffShadowMargin|Thickness|0,0,20,0 \ No newline at end of file diff --git a/doc/toc.yml b/doc/toc.yml index ec13c72c0..b8f6d0477 100644 --- a/doc/toc.yml +++ b/doc/toc.yml @@ -14,6 +14,9 @@ # ***************** Fluent ********************* - name: Fluent href: fluent-getting-started.md + # ***************** Lightweight Styling ********************* + - name: Lightweight Styling + href: lightweight-styling.md # ******************* Learn ********************** #- name: Learn @@ -35,4 +38,43 @@ - name: Cupertino items: - name: Cupertino Control Styles - href: cupertino-controls-styles.md \ No newline at end of file + href: cupertino-controls-styles.md + # ***************** Reference\Lightweight Styling ****************** + - name: Lightweight Styling + items: + - name: Button + href: styles/Button.md + - name: CheckBox + href: styles/CheckBox.md + - name: ComboBox + href: styles/ComboBox.md + - name: DatePicker + href: styles/DatePicker.md + - name: FloatingActionButton + href: styles/FloatingActionButton.md + - name: HyperlinkButton + href: styles/HyperlinkButton.md + - name: NavigationView + href: styles/NavigationView.md + - name: PasswordBox + href: styles/PasswordBox.md + - name: PipsPager + href: styles/PipsPager.md + - name: ProgressBar + href: styles/ProgressBar.md + - name: ProgressRing + href: styles/ProgressRing.md + - name: RadioButton + href: styles/RadioButton.md + - name: RatingControl + href: styles/RatingControl.md + - name: Slider + href: styles/Slider.md + - name: TextBox + href: styles/TextBox.md + - name: ToggleButton + href: styles/ToggleButton.md + - name: ToggleSwitch + href: styles/ToggleSwitch.md + - name: Typography + href: styles/Typography.md \ No newline at end of file diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml index 419cfce3f..4cfbffb03 100644 --- a/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml +++ b/src/library/Uno.Cupertino/Styles/Controls/ProgressRing.xaml @@ -5,32 +5,28 @@ xmlns:not_win="http://uno.ui/not_win" xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" - xmlns:lottie_win="using:Microsoft.Toolkit.Uwp.UI.Lottie" - xmlns:lottie_not_win="using:Microsoft.Toolkit.Uwp.UI.Lottie" + xmlns:lottie_not_win="#using:Microsoft.Toolkit.Uwp.UI.Lottie;CommunityToolkit.WinUI.Lottie" mc:Ignorable="d not_win lottie_not_win"> + + + + - - + + - - + + + + + - + + + diff --git a/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml b/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml deleted file mode 100644 index b0463c8f4..000000000 --- a/src/library/Uno.Cupertino/Styles/Controls/ProgressRingWinUI.xaml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/src/library/Uno.Cupertino/Styles/Controls/Slider.xaml b/src/library/Uno.Cupertino/Styles/Controls/Slider.xaml index 792c44a92..776fda76a 100644 --- a/src/library/Uno.Cupertino/Styles/Controls/Slider.xaml +++ b/src/library/Uno.Cupertino/Styles/Controls/Slider.xaml @@ -11,6 +11,8 @@ Color="{ThemeResource CupertinoWhiteColor}" /> + + + + + + + - + + + + diff --git a/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml b/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml deleted file mode 100644 index 5497069ae..000000000 --- a/src/library/Uno.Material/Styles/Controls/v1/ProgressRingWinUI.xaml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml b/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml index 046af1367..ce930c112 100644 --- a/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml +++ b/src/library/Uno.Material/Styles/Controls/v1/ToggleSwitch.Mobile.xaml @@ -10,6 +10,7 @@ xmlns:toolkit="using:Uno.UI.Toolkit" xmlns:macos="http://uno.ui/macos" xmlns:uuc="using:Uno.UI.Controls" + xmlns:uuvc="using:Uno.UI.Views.Controls" mc:Ignorable="ios android xamarin wasm macos"> - diff --git a/src/library/Uno.Material/Styles/Controls/v2/Button.xaml b/src/library/Uno.Material/Styles/Controls/v2/Button.xaml index b36ee66d5..0d59d8d91 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/Button.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/Button.xaml @@ -14,24 +14,6 @@ NullValue="0" /> - 40 - 40 - 18 - 1 - 0 - 0 - 1 - 0 - 16,0 - 12,0 - 0,0,8,0 - 0 - 1 - 0,0,0,1 - 0 - 8,0 - 0 - 20 Center Center Stretch @@ -173,11 +155,30 @@ - + + + 40 + 40 + 18 + 1 + 0 + 0 + 1 + 0 + 16,0 + 12,0 + 0,0,8,0 + 0 + 1 + 0,0,0,1 + 0 + 8,0 + 0 + 20 @@ -312,11 +313,30 @@ - + + + 40 + 40 + 18 + 1 + 0 + 0 + 1 + 0 + 16,0 + 12,0 + 0,0,8,0 + 0 + 1 + 0,0,0,1 + 0 + 8,0 + 0 + 20 @@ -331,11 +351,11 @@ - - - - - + + + + + @@ -350,7 +370,7 @@ - + @@ -360,7 +380,7 @@ @@ -398,8 +418,8 @@ - - + + @@ -454,7 +474,7 @@ @@ -590,7 +610,7 @@ @@ -726,7 +746,7 @@ - + @@ -858,7 +878,7 @@ - + @@ -987,8 +1007,8 @@ - + - + - + @@ -1062,21 +1082,21 @@ HorizontalAlignment="{StaticResource IconButtonEllipseHorizontalAlignment}" VerticalAlignment="{StaticResource IconButtonEllipseVerticalAlignment}" Fill="{ThemeResource IconButtonEllipseFillPointerOver}" - Opacity="{StaticResource IconButtonOpacityHiddenState}" /> + Opacity="{ThemeResource IconButtonOpacityHiddenState}" /> + Opacity="{ThemeResource IconButtonOpacityHiddenState}" /> + Opacity="{ThemeResource IconButtonOpacityHiddenState}" /> + + - - + + + + + + + + + @@ -701,35 +720,37 @@ + + diff --git a/src/library/Uno.Material/Styles/Controls/v2/Flyout.xaml b/src/library/Uno.Material/Styles/Controls/v2/Flyout.xaml index 16be6b36e..af60d4606 100644 --- a/src/library/Uno.Material/Styles/Controls/v2/Flyout.xaml +++ b/src/library/Uno.Material/Styles/Controls/v2/Flyout.xaml @@ -606,7 +606,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - - - + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:um="using:Uno.Material" + xmlns:android="http://uno.ui/android" + xmlns:ios="http://uno.ui/ios" + xmlns:wasm="http://uno.ui/wasm" + mc:Ignorable="ios android wasm"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 40 + 40 + 40 + 20 + 40 + 40 + 2 + 4,0,0,0 + 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 40 + 40 + 40 + 20 + 40 + 40 + 2 + 4,0,0,0 + 5 + + + + + + + + + + + + + + + + + + - - - + + + + + + + #B8B4BC + + -7,0 + + + + + + + + + + + 4,0,0,4 + 0,0,4,4 + 4 + 6 + + + + + + 4 + 4 + 2 + 4 + 4 + 2 + 0,0,0,4 + 0,4,0,0 + 0,0,4,0 + 4,0,0,0 + + + + + 20 + 20 + 10 + -14,-6,-14,-6 + -6,-14,-6,-14 + + + + + + + #685C64 + + -7,0 + + + + + + + + + + + 4,0,0,4 + 0,0,4,4 + 4 + 6 + + + + + + 4 + 4 + 2 + 4 + 4 + 2 + 0,0,0,4 + 0,4,0,0 + 0,0,4,0 + 4,0,0,0 + + + + + 20 + 20 + 10 + + -14,-6,-14,-6 + -6,-14,-6,-14 + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf b/src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf new file mode 100644 index 000000000..fa6c2e32b --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/Android/environment.conf @@ -0,0 +1,2 @@ +# See this for more details: http://developer.xamarin.com/guides/android/advanced_topics/garbage_collection/ +MONO_GC_PARAMS=bridge-implementation=tarjan,nursery-size=32m,soft-heap-limit=256m \ No newline at end of file diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist new file mode 100644 index 000000000..24c310368 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist new file mode 100644 index 000000000..5a4053db4 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Info.plist @@ -0,0 +1,26 @@ + + + + + UIDeviceFamily + + 2 + + LSApplicationCategoryType + public.app-category.utilities + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/iconapp.appiconset + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs new file mode 100644 index 000000000..da19896b5 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Main.maccatalyst.cs @@ -0,0 +1,15 @@ +using UIKit; + +namespace Uno.Themes.Samples.MacCatalyst +{ + public class EntryPoint + { + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } + } +} diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 000000000..69555e440 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj new file mode 100644 index 000000000..d2fc9be0c --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/Uno.Themes.Samples.Mobile.csproj @@ -0,0 +1,101 @@ + + + net7.0-ios;net7.0-maccatalyst;net7.0-android33.0 + true + Exe + + Uno.Themes.Samples + + uno.platform.themes + 11F3A2B0-B218-4AA5-BE7A-6E86E2A72297 + + 1.0 + 1 + + Android\AndroidManifest.xml + + + + + True + true + false + + + + + 0.1.0-alpha.58 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 0.1.0-alpha.58 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 0.1.0-alpha.58 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + 1.0.59 + + + 1.0.59 + + + + + + + + + + + + + + + + + + + + + + + $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep + + $(MtouchExtraArgs) --registrar:static + iossimulator-x64 + + + + $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable + + + + + + $(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep + + $(MtouchExtraArgs) --registrar:static + + false + maccatalyst-x64 + + + + $(MtouchExtraArgs) --marshal-objectivec-exceptions:disable + + + + + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist new file mode 100644 index 000000000..24c310368 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist new file mode 100644 index 000000000..981d8e728 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Info.plist @@ -0,0 +1,43 @@ + + + + + LSRequiresIPhoneOS + + UIDeviceFamily + + 1 + 2 + + UIRequiredDeviceCapabilities + + armv7 + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + XSAppIconAssets + Assets.xcassets/iconapp.appiconset + UIApplicationSupportsIndirectInputEvents + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs new file mode 100644 index 000000000..a4cbfb670 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Main.iOS.cs @@ -0,0 +1,15 @@ +using UIKit; + +namespace Uno.Themes.Samples.iOS +{ + public class EntryPoint + { + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } + } +} diff --git a/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 000000000..69555e440 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Mobile/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RadioButtonSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RadioButtonSamplePage.xaml index 1f254b57b..0aded2350 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RadioButtonSamplePage.xaml +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RadioButtonSamplePage.xaml @@ -132,43 +132,6 @@ IsEnabled="False" Style="{StaticResource MaterialRadioButtonStyle}" /> - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RatingControlSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RatingControlSamplePage.xaml new file mode 100644 index 000000000..81f3b8052 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RatingControlSamplePage.xaml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RatingControlSamplePage.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RatingControlSamplePage.xaml.cs new file mode 100644 index 000000000..08dbc5a22 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/RatingControlSamplePage.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Uno.Themes.Samples.Entities; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +namespace Uno.Themes.Samples.Content.Controls +{ + [SamplePage(SampleCategory.Controls, "RatingControl", Description = "This control allows a user to enter a star rating.", DocumentationLink = "https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.controls.ratingcontrol")] + public sealed partial class RatingControlSamplePage : Page + { + public RatingControlSamplePage() + { + this.InitializeComponent(); + } + } +} diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleButtonSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleButtonSamplePage.xaml new file mode 100644 index 000000000..5f2527241 --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleButtonSamplePage.xaml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleButtonSamplePage.xaml.cs b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleButtonSamplePage.xaml.cs new file mode 100644 index 000000000..fa2e8e38c --- /dev/null +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleButtonSamplePage.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Uno.Themes.Samples.Entities; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +using Windows.UI.Xaml.Controls.Primitives; +using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Input; +using Windows.UI.Xaml.Media; +using Windows.UI.Xaml.Navigation; + +namespace Uno.Themes.Samples.Content.Controls +{ + [SamplePage(SampleCategory.Controls, "ToggleButton", Description = "Represents a control that a user can select (check) or clear (uncheck).", DocumentationLink = "https://learn.microsoft.com/en-us/uwp/api/windows.ui.xaml.controls.primitives.togglebutton")] + public sealed partial class ToggleButtonSamplePage : Page + { + public ToggleButtonSamplePage() + { + this.InitializeComponent(); + } + } +} diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml index 2c8cbd8a2..259bdc010 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/ToggleSwitchSamplePage.xaml @@ -1,229 +1,296 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml index c8046e860..810edc992 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Extensions/ControlExtensionsSamplePage.xaml @@ -127,7 +127,7 @@ - + @@ -137,6 +137,20 @@ + + + + + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/OverviewPage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/OverviewPage.xaml index 6b8695886..bf619706e 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/OverviewPage.xaml +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/OverviewPage.xaml @@ -199,6 +199,11 @@ IsChecked="{x:Null}" IsThreeState="True" Style="{StaticResource MaterialCheckBoxStyle}" /> + + @@ -206,15 +211,41 @@ - - + + + + + + + + + + + + + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Styles/ColorsSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Styles/ColorsSamplePage.xaml index ffca3afb5..523520c7c 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Styles/ColorsSamplePage.xaml +++ b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Styles/ColorsSamplePage.xaml @@ -591,50 +591,56 @@ Color1Container="{ThemeResource OutlineBrush}" ColorContent="{ThemeResource OnPrimaryBrush}" /> + - + + + + + - + - + - - + - + - + - + PasswordBoxSamplePage.xaml - + + PipsPagerSamplePage.xaml + ProgressBarSamplePage.xaml @@ -77,6 +79,9 @@ RadioButtonSamplePage.xaml + + RatingControlSamplePage.xaml + SliderSamplePage.xaml @@ -89,6 +94,9 @@ TimePickerSamplePage.xaml + + ToggleButtonSamplePage.xaml + ToggleSwitchSamplePage.xaml @@ -221,6 +229,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -237,6 +249,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Program.cs b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Program.cs index 5801f9bcd..f9627f2f6 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Program.cs +++ b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Program.cs @@ -14,9 +14,7 @@ static void Main(string[] args) expArgs.ExitApplication = true; }; - Windows.ApplicationModel.Resources.ResourceLoader.GetStringInternal = s => null; - - var host = new GtkHost(() => new App(), args); + var host = new GtkHost(() => new App()); host.Run(); } diff --git a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj index ae6dda4b3..07135e63f 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Skia.Gtk/Uno.Themes.Samples.Skia.Gtk.csproj @@ -20,15 +20,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -36,9 +36,9 @@ - - - + + + diff --git a/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj b/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj index ef9098db8..54d8848da 100644 --- a/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.UWP/Uno.Themes.Samples.UWP.csproj @@ -13,7 +13,7 @@ - 2.6.0-prerelease.210113001 + 2.8.5 0.1.0-alpha.58 @@ -37,7 +37,7 @@ 1.0.59 - 5.0.0-dev.1148 + 5.0.0-dev.1634 @@ -85,7 +85,7 @@ false prompt true - true + false true diff --git a/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj b/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj index 59d69e916..f9405c7ce 100644 --- a/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj +++ b/src/samples/UWP/Uno.Themes.Samples.Wasm/Uno.Themes.Samples.Wasm.csproj @@ -54,9 +54,9 @@ - - - + + +