WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 25d5ed1

Browse files
authored
Merge pull request #1598 from unoplatform/mergify/bp/release/stable/6.0/pr-1597
2 parents 6dbbe45 + bbc4b35 commit 25d5ed1

10 files changed

+47
-5
lines changed

doc/cupertino-controls-styles.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ uid: Uno.Themes.Cupertino.Styles
44

55
# Cupertino Controls Styles
66

7+
> [!IMPORTANT]
8+
> UnoFeatures: **Cupertino** — add `<UnoFeatures>Cupertino</UnoFeatures>` to your app's `.csproj` to include Uno Cupertino resources.
9+
710
| Control | Style Key |
811
|-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
912
| `Button` | `CupertinoButtonStyle`<br/>`CupertinoContainedButtonStyle`<br/>`CupertinoDatePickerFlyoutButtonStyle` |

doc/cupertino-getting-started.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ uid: Uno.Themes.Cupertino.GetStarted
88
<img src="assets/cupertino-design-system.png" alt="Cupertino design system" />
99
</p>
1010

11-
Uno Cupertino is an add-on package that lets you apply [Cupertino - Human Interface Guideline styling](https://developer.apple.com/design/human-interface-guidelines) to your application with a few lines of code.
11+
> [!IMPORTANT]
12+
> UnoFeatures: **Cupertino** — add `<UnoFeatures>Cupertino</UnoFeatures>` to your app's `.csproj` to enable Uno Cupertino.
13+
14+
Uno Cupertino is enabled through the `Cupertino` UnoFeatures and lets you apply [Cupertino - Human Interface Guideline styling](https://developer.apple.com/design/human-interface-guidelines) to your application with a few lines of code.
1215

1316
## Getting Started
1417

@@ -60,6 +63,9 @@ Depending on the type of project template that the Uno Platform application was
6063

6164
#### [**Multi-Head Project Template (Legacy)**](#tab/multihead)
6265

66+
> [!NOTE]
67+
> Use this only when working on older multi-head templates that do not support `UnoFeatures`. Modern templates should use the Single Project instructions above.
68+
6369
1. In the Solution Explorer panel, right-click on your app's **App Code Library** project (`PROJECT_NAME.csproj`) and select `Manage NuGet Packages...`
6470
1. Install the [`Uno.Cupertino.WinUI`](https://www.nuget.org/packages/Uno.Cupertino.WinUI)
6571
1. Add the following Cupertino resources to `AppResources.xaml`:
@@ -78,6 +84,9 @@ Depending on the type of project template that the Uno Platform application was
7884
7985
#### [**Shared Project (.shproj) Template (Legacy)**](#tab/shproj)
8086
87+
> [!NOTE]
88+
> Use this only when working on older `.shproj`-based solutions that do not support `UnoFeatures`. Modern templates should use the Single Project instructions above.
89+
8190
1. In the Solution Explorer panel, right-click on your solution name and select `Manage NuGet Packages for Solution ...`. Choose either:
8291
- The [`Uno.Cupertino`](https://www.nuget.org/packages/Uno.Cupertino/) package when targetting Xamarin/UWP
8392
- The [`Uno.Cupertino.WinUI`](https://www.nuget.org/packages/Uno.Cupertino.WinUI) package when targetting net6.0+/WinUI

doc/lightweight-styling.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ uid: Uno.Themes.LightweightStyling
44

55
# Lightweight Styling
66

7+
> [!IMPORTANT]
8+
> UnoFeatures: **Material** — add `<UnoFeatures>Material</UnoFeatures>` to your app's `.csproj` to include the Uno Material resources used in these examples.
9+
710
[Lightweight styling](https://learn.microsoft.com/windows/apps/design/style/xaml-styles#lightweight-styling) is a way to customize the appearance of XAML controls by **overriding** their default brushes, fonts, and numeric properties. Lightweight styles are changed by providing alternate resources with the same key. All Uno Material styles support the capability to be customized through resource overrides without the need to redefine the style.
811

912
Overriding resources from Uno Material can be done at the App level, Page level, or even at the Control level. The following sections will cover how to override resources at each of these levels.

doc/material-colors.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ uid: Uno.Themes.Material.Colors
44

55
# Material Colors and Brushes
66

7+
> [!IMPORTANT]
8+
> UnoFeatures: **Material** — add `<UnoFeatures>Material</UnoFeatures>` to your app's `.csproj` to include Uno Material resources.
9+
710
## Colors
811

912
| Key | LightValue | DarkValue |

doc/material-controls-styles.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ uid: Uno.Themes.Material.Styles
44

55
# Material Controls Styles
66

7+
> [!IMPORTANT]
8+
> UnoFeatures: **Material** — add `<UnoFeatures>Material</UnoFeatures>` to your app's `.csproj` to include Uno Material resources.
9+
710
| Control | Style Key | IsDefaultStyle\* |
811
|---------------------------|---------------------------------|------------------|
912
| `AppBarButton` | `AppBarButtonStyle` | True |

doc/material-dsp.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ uid: Uno.Themes.Material.DSP
44

55
# Using the DSP Tooling in Uno.Material
66

7+
> [!IMPORTANT]
8+
> UnoFeatures: **Material** and **Dsp** — add `<UnoFeatures>Material; Dsp;</UnoFeatures>` to your app's `.csproj` to include Uno Material and Dsp resources.
9+
710
## Introduction
811

912
Is it possible to automate the creation of the Material Design color palette? Yes, it is. Uno.Material provides a tooling to generate the color palette from the official Material Design color palette. This tooling is available in the [Uno.Dsp.Cli](https://nuget.org/packages/Uno.Dsp.Cli) and [Uno.Dsp.Tasks](https://nuget.org/packages/Uno.Dsp.Tasks) NuGet packages. The following instructions will cover the Uno.Dsp.Tasks version, which is more automatic.

doc/material-getting-started.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ uid: Uno.Themes.Material.GetStarted
88
<img src="assets/material-design-system.png" alt="Material design system" />
99
</p>
1010

11-
The Uno Material library is available as NuGet packages that can be added to any new or existing Uno Platform solution.
11+
> [!IMPORTANT]
12+
> UnoFeatures: **Material** — add `<UnoFeatures>Material</UnoFeatures>` to your app's `.csproj` to add Uno Material.
13+
14+
The Uno Material library is enabled through the `Material` UnoFeatures, which brings in the required packages for new and existing Uno Platform solutions.
1215
Uno Material lets you apply [Material Design 3](https://m3.material.io/) styling to your application with just a few lines of code.
1316

1417
> [!WARNING]
@@ -91,6 +94,9 @@ Depending on the type of project template that the Uno Platform application was
9194

9295
#### [**Multi-Head Project Template (Legacy)**](#tab/multihead)
9396

97+
> [!NOTE]
98+
> Use this only when working on older multi-head templates that do not support `UnoFeatures`. Modern templates should use the Single Project instructions above.
99+
94100
1. In the Solution Explorer panel, right-click on your app's **App Code Library** project (`PROJECT_NAME.csproj`) and select `Manage NuGet Packages...`
95101
2. Install the [`Uno.Material.WinUI`](https://www.nuget.org/packages/Uno.Material.WinUI)
96102
3. Add the following Material resources to `AppResources.xaml`:
@@ -108,9 +114,12 @@ Depending on the type of project template that the Uno Platform application was
108114
109115
#### [**Shared Project (.shproj) Template (Legacy)**](#tab/shproj)
110116
117+
> [!NOTE]
118+
> Use this only when working on older `.shproj`-based solutions that do not support `UnoFeatures`. Modern templates should use the Single Project instructions above.
119+
111120
1. In the Solution Explorer panel, right-click on your solution name and select `Manage NuGet Packages for Solution ...`. Choose either:
112-
- The [`Uno.Material`](https://www.nuget.org/packages/Uno.Material/) package when targetting Xamarin/UWP
113-
- The [`Uno.Material.WinUI`](https://www.nuget.org/packages/Uno.Material.WinUI) package when targetting net6.0+/WinUI
121+
- The [`Uno.Material`](https://www.nuget.org/packages/Uno.Material/) package when targetting Xamarin/UWP
122+
- The [`Uno.Material.WinUI`](https://www.nuget.org/packages/Uno.Material.WinUI) package when targetting net6.0+/WinUI
114123
115124
2. Select the following projects for installation:
116125
- `PROJECT_NAME.Wasm.csproj`

doc/material-migration.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ uid: Uno.Themes.Material.Migration
44

55
# Upgrading Uno Material
66

7+
> [!IMPORTANT]
8+
> UnoFeatures: **Material** — add `<UnoFeatures>Material</UnoFeatures>` to your app's `.csproj` to include Uno Material resources.
9+
710
## Upgrading to Uno Themes v5
811

912
The Uno Material v5 packages introduce a new dependency on the [Uno Themes](https://www.nuget.org/packages/Uno.Themes.WinUI) package. Uno Themes is the base library for all design system implementations going forward. As a result, the following changes have been made:

doc/themes-control-extensions.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ uid: Uno.Themes.Control.Extensions
44

55
# Control Extensions
66

7+
> [!IMPORTANT]
8+
> UnoFeatures: **Material** — add `<UnoFeatures>Material</UnoFeatures>` to your app's `.csproj` to include the Uno Material resources referenced in these samples.
9+
710
## Icon
811

912
This feature allows for the addition of icon on the supported controls. Those icons could be any of the [`IconElement`](https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.iconelement)s: `<BitmapIcon />`, `<FontIcon />`, `<PathIcon />`, or `<SymbolIcon />`.

doc/themes-overview.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ uid: Uno.Themes.Overview
88
<img src="assets/themes-design-systems.png" alt="Themes design systems" />
99
</p>
1010

11+
> [!IMPORTANT]
12+
> UnoFeatures: **Material** or **Cupertino** — enable these themes by adding `<UnoFeatures>Material</UnoFeatures>` or `<UnoFeatures>Cupertino</UnoFeatures>` to your app's `.csproj`.
13+
1114
## Summary
1215

1316
- [Material Overview](material-getting-started.md)
@@ -16,7 +19,7 @@ uid: Uno.Themes.Overview
1619

1720
## Uno Themes Styles
1821

19-
[Uno Themes](https://github.com/unoplatform/Uno.Themes) is the repository for add-ons NuGet packages that can be added to any new or existing Uno solution.
22+
[Uno Themes](https://github.com/unoplatform/Uno.Themes) is the repository for add-ons enabled through UnoFeatures that can be added to any new or existing Uno solution.
2023

2124
It contains three libraries:
2225

0 commit comments

Comments
 (0)