Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fix: adjust opacity brushes from themes breaking change #1085

Merged
merged 2 commits into from
Mar 28, 2024
Merged

fix: adjust opacity brushes from themes breaking change #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
034ec55
fix: adjust opacity brushes from themes breaking change
kazo0 Mar 28, 2024
24d482b
chore: fix markdown
kazo0 Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/controls/ChipAndChipGroup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ xmlns:utu="using:Uno.Toolkit.UI"
| `ChipBackgroundPointerOver` | `SolidColorBrush` | `SystemControlTransparentBrush` |
| `ChipBackgroundFocused` | `SolidColorBrush` | `SystemControlTransparentBrush` |
| `ChipBackgroundPressed` | `SolidColorBrush` | `SystemControlTransparentBrush` |
| `ChipBackgroundDisabled` | `SolidColorBrush` | `OnSurfaceDisabledLowBrush` |
| `ChipBackgroundDisabled` | `SolidColorBrush` | `OnSurfaceDisabledBrush` |
| `ChipBackgroundChecked` | `SolidColorBrush` | `SecondaryContainerBrush` |
| `ChipBackgroundCheckedPointerOver` | `SolidColorBrush` | `SecondaryContainerBrush` |
| `ChipBackgroundCheckedFocused` | `SolidColorBrush` | `SystemControlTransparentBrush` |
Expand Down Expand Up @@ -143,7 +143,7 @@ xmlns:utu="using:Uno.Toolkit.UI"
| `ChipBorderBrushPointerOver` | `SolidColorBrush` | `OutlineBrush` |
| `ChipBorderBrushFocused` | `SolidColorBrush` | `SystemControlTransparentBrush` |
| `ChipBorderBrushPressed` | `SolidColorBrush` | `OutlineBrush` |
| `ChipBorderBrushDisabled` | `SolidColorBrush` | `OnSurfaceVariantDisabledLowBrush` |
| `ChipBorderBrushDisabled` | `SolidColorBrush` | `OnSurfaceVariantDisabledBrush` |
| `ChipBorderBrushChecked` | `SolidColorBrush` | `OutlineBrush` |
| `ChipBorderBrushCheckedPointerOver` | `SolidColorBrush` | `OutlineBrush` |
| `ChipBorderBrushCheckedFocused` | `SolidColorBrush` | `SystemControlTransparentBrush` |
Expand Down
2 changes: 1 addition & 1 deletion doc/controls/TabBarAndTabBarItem.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ xmlns:utu="using:Uno.Toolkit.UI"
| `FabTabBarItemBackgroundPointerOver` | `SolidColorBrush` | OnPrimaryContainerHoverBrush |
| `FabTabBarItemBackgroundFocused` | `SolidColorBrush` | OnPrimaryContainerFocusedBrush |
| `FabTabBarItemBackgroundPressed` | `SolidColorBrush` | OnPrimaryContainerPressedBrush |
| `FabTabBarItemBackgroundDisabled` | `SolidColorBrush` | OnSurfaceDisabledLowBrush |
| `FabTabBarItemBackgroundDisabled` | `SolidColorBrush` | OnSurfaceDisabledBrush |
| `FabTabBarItemBackgroundSelected` | `SolidColorBrush` | SystemControlTransparentBrush |
| `FabTabBarItemBackgroundSelectedPointerOver` | `SolidColorBrush` | SystemControlTransparentBrush |
| `FabTabBarItemBackgroundSelectedPressed` | `SolidColorBrush` | SystemControlTransparentBrush |
Expand Down
36 changes: 26 additions & 10 deletions doc/material-migration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ uid: Toolkit.Migration.Material2.0

# Updating Material Toolkit Version

## Updating to Material Toolkit v6

Material Toolkit v6 contains a dependency on [Uno Material](Uno.Themes.Material.GetStarted) which, as of its v5 release, introduces breaking changes that can affect applications using the Material Toolkit. Refer to the [Uno Material v5 migration documentation](xref:Uno.Themes.Material.Migration#updating-to-unothemes-v50) for further information.

### Opacity and brushes

The opacity values of certain brushes have been adjusted in Uno Material v5. The following table shows the changes in opacity values:

| Opacity variant | Old Value | New Value |
|-----------------|-----------|-----------|
| Medium | 0.54 | 0.64 |
| Disabled | 0.38 | 0.12 |
| DisabledLow | 0.12 | *removed* |

Existing explicit references to `-DisabledLow` resources have been updated to use `-Disabled`.

## Updating to Material Toolkit v4

Material Toolkit v4 introduces support for [Lightweight Styling](lightweight-styling.md) and, as a result, 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).
Expand All @@ -21,7 +37,7 @@ Along with the above list of new resource keys, below is a list of the resource
| `MaterialChipCornerRadius` | `ChipCornerRadius` | 8 |
| `MaterialChipIconSize` | `ChipIconSize` | 18 |
| `MaterialChipElevation` | `ChipElevation` | 4 |
| `M3MateriaChipCheckGlyphSize` | **_REMOVED_** | 20 |
| `M3MateriaChipCheckGlyphSize` | ***REMOVED*** | 20 |
| `MaterialChipBorderThickness` | `ChipBorderThickness` | 1 |
| `MaterialChipDeleteIconLength` | `ChipDeleteIconLength` | 11 |
| `MaterialChipDeleteIconContainerLength` | `ChipDeleteIconContainerLength` | 18 |
Expand All @@ -33,21 +49,21 @@ Along with the above list of new resource keys, below is a list of the resource
| `MaterialChipDisabledForeground` | `ChipForegroundDisabled` | `OnSurfaceDisabledBrush` |
| `MaterialChipIconDisabledForeground` | `ChipIconForegroundDisabled` | `OnSurfaceDisabledBrush` |
| `MaterialChipIconForeground` | `ChipIconForeground` | `PrimaryBrush` |
| `MaterialChipSelectedPressedForeground` | **_REMOVED_** | `OnSecondaryContainerBrush` |
| `MaterialChipSelectedFocusedForeground` | **_REMOVED_** | `OnSecondaryContainerBrush` |
| `MaterialChipSelectedPointerOverForeground` | **_REMOVED_** | `OnSecondaryContainerBrush` |
| `MaterialChipSelectedForeground` | **_REMOVED_** | `OnSecondaryContainerBrush` |
| `MaterialChipSelectedPressedForeground` | ***REMOVED*** | `OnSecondaryContainerBrush` |
| `MaterialChipSelectedFocusedForeground` | ***REMOVED*** | `OnSecondaryContainerBrush` |
| `MaterialChipSelectedPointerOverForeground` | ***REMOVED*** | `OnSecondaryContainerBrush` |
| `MaterialChipSelectedForeground` | ***REMOVED*** | `OnSecondaryContainerBrush` |
| `MaterialChipPressedForeground` | `ChipForegroundPressed` | `OnSurfaceVariantBrush` |
| `MaterialChipFocusedForeground` | `ChipForegroundFocused` | `OnSurfaceVariantBrush` -> `SystemControlTransparentBrush` |
| `MaterialChipPointerOverForeground` | `ChipForegroundPointerOver` | `OnSurfaceVariantBrush` |
| `MaterialChipForeground` | `ChipForeground` | `OnSurfaceVariantBrush` |
| `MaterialChipSelectedPressedStateOverlay` | **_REMOVED_** | `OnSecondaryContainerSelectedBrush` |
| `MaterialChipSelectedFocusedStateOverlay` | **_REMOVED_** | `OnSecondaryContainerFocusedBrush` |
| `MaterialChipSelectedPointerOverStateOverlay` | **_REMOVED_** | `OnSecondaryContainerHoverBrush` |
| `MaterialChipSelectedPressedStateOverlay` | ***REMOVED*** | `OnSecondaryContainerSelectedBrush` |
| `MaterialChipSelectedFocusedStateOverlay` | ***REMOVED*** | `OnSecondaryContainerFocusedBrush` |
| `MaterialChipSelectedPointerOverStateOverlay` | ***REMOVED*** | `OnSecondaryContainerHoverBrush` |
| `MaterialChipPressedStateOverlay` | `ChipStateOverlayPressed` | `OnSurfaceVariantPressedBrush` |
| `MaterialChipFocusedStateOverlay` | `ChipStateOverlayFocused` | `OnSurfaceVariantFocusedBrush` -> `SystemControlTransparentBrush` |
| `MaterialChipPointerOverStateOverlay` | `ChipStateOverlayPointerOver` | `OnSurfaceVariantHoverBrush` |
| `MaterialChipSelectedBackground` | **_REMOVED_** | `SecondaryContainerBrush` |
| `MaterialChipSelectedBackground` | ***REMOVED*** | `SecondaryContainerBrush` |
| `MaterialChipBackground` | `ChipBackground` | `SystemControlTransparentBrush` |

### Divider
Expand Down Expand Up @@ -102,7 +118,7 @@ Along with the new Material Design 3 styles, our Material Toolkit NuGet packages
> In order to continue using the v1 styles, some changes are required in your `App.xaml`.

<!-- TODO: Use xref link. For some reason, it currently doesn't work. -->
Since the Material Toolkit has a dependency on the Uno Material library, it is required to first follow the steps in the **_Continue Using v1 Styles_** section of the [Uno Material v2 migration documentation](https://platform.uno/docs/articles/external/uno.themes/doc/material-migration.html).
Since the Material Toolkit has a dependency on the Uno Material library, it is required to first follow the steps in the ***Continue Using v1 Styles*** section of the [Uno Material v2 migration documentation](https://platform.uno/docs/articles/external/uno.themes/doc/material-migration.html).

The Material Toolkit v2 NuGet package contains both sets of v1 and v2 styles. Within your `App.xaml`, you will need to replace the reference to `MaterialToolkitResources` with `MaterialToolkitResourcesV1`.

Expand Down
8 changes: 4 additions & 4 deletions src/library/Uno.Toolkit.Material/Styles/Controls/v2/Chip.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<StaticResource x:Key="ChipBackgroundPressed"
ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="ChipBackgroundDisabled"
ResourceKey="OnSurfaceDisabledLowBrush" />
ResourceKey="OnSurfaceDisabledBrush" />
<StaticResource x:Key="ChipBackgroundChecked"
ResourceKey="SecondaryContainerBrush" />
<StaticResource x:Key="ChipBackgroundCheckedPointerOver"
Expand Down Expand Up @@ -105,7 +105,7 @@
<StaticResource x:Key="ChipBorderBrushPressed"
ResourceKey="OutlineBrush" />
<StaticResource x:Key="ChipBorderBrushDisabled"
ResourceKey="OnSurfaceVariantDisabledLowBrush" />
ResourceKey="OnSurfaceVariantDisabledBrush" />
<StaticResource x:Key="ChipBorderBrushChecked"
ResourceKey="OutlineBrush" />
<StaticResource x:Key="ChipBorderBrushCheckedPointerOver"
Expand Down Expand Up @@ -172,7 +172,7 @@
<StaticResource x:Key="ChipBackgroundPressed"
ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="ChipBackgroundDisabled"
ResourceKey="OnSurfaceDisabledLowBrush" />
ResourceKey="OnSurfaceDisabledBrush" />
<StaticResource x:Key="ChipBackgroundChecked"
ResourceKey="SecondaryContainerBrush" />
<StaticResource x:Key="ChipBackgroundCheckedPointerOver"
Expand Down Expand Up @@ -240,7 +240,7 @@
<StaticResource x:Key="ChipBorderBrushPressed"
ResourceKey="OutlineBrush" />
<StaticResource x:Key="ChipBorderBrushDisabled"
ResourceKey="OnSurfaceVariantDisabledLowBrush" />
ResourceKey="OnSurfaceVariantDisabledBrush" />
<StaticResource x:Key="ChipBorderBrushChecked"
ResourceKey="OutlineBrush" />
<StaticResource x:Key="ChipBorderBrushCheckedPointerOver"
Expand Down
4 changes: 2 additions & 2 deletions src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<StaticResource x:Key="FabTabBarItemBackgroundPointerOver" ResourceKey="OnPrimaryContainerHoverBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundFocused" ResourceKey="OnPrimaryContainerFocusedBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundPressed" ResourceKey="OnPrimaryContainerPressedBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundSelected" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
Expand Down Expand Up @@ -297,7 +297,7 @@
<StaticResource x:Key="FabTabBarItemBackgroundPointerOver" ResourceKey="OnPrimaryContainerHoverBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundFocused" ResourceKey="OnPrimaryContainerFocusedBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundPressed" ResourceKey="OnPrimaryContainerPressedBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledLowBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundDisabled" ResourceKey="OnSurfaceDisabledBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundSelected" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
<StaticResource x:Key="FabTabBarItemBackgroundSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
Expand Down
Loading