Skip to content

Commit

Permalink
feat: add M3 NavigationView + update default palette
Browse files Browse the repository at this point in the history
  • Loading branch information
@kazo0
kazo0 committed Apr 28, 2022
1 parent 2b6e1d7 commit 93184fa
Show file tree
Hide file tree
Showing 6 changed files with 2,683 additions and 53 deletions.
2 changes: 2 additions & 0 deletions src/library/Uno.Material/MaterialResourcesV2.cs
View file
Expand Up @@ -110,6 +110,8 @@ private IEnumerable<(string ResourceKey, string SharedKey, bool IsDefaultStyle)>
Add("M3MaterialCalendarDatePickerStyle", isImplicit: true);
Add("M3MaterialFlyoutPresenterStyle", isImplicit: true);
Add("M3MaterialMenuFlyoutPresenterStyle", isImplicit: true);
Add("M3MaterialNavigationViewStyle", isImplicit: true);
Add("M3MaterialNavigationViewItemStyle", isImplicit: true);

// ** TODO **

Expand Down
102 changes: 51 additions & 51 deletions src/library/Uno.Material/Styles/Application/v2/SharedColorPalette.xaml
View file
Expand Up @@ -13,87 +13,87 @@
<!-- Light Theme -->
<ResourceDictionary x:Key="Light">
<!-- Primary -->
<Color x:Key="PrimaryColor">#5946D2</Color>
<Color x:Key="PrimaryInverseColor">#C8BFFF</Color>
<Color x:Key="OnPrimaryColor">#FFFFFF</Color>
<Color x:Key="PrimaryContainerColor">#E5DEFF</Color>
<Color x:Key="OnPrimaryContainerColor">#160067</Color>
<Color x:Key="PrimaryColor">#6750A4</Color>
<Color x:Key="PrimaryInverseColor">#D0BCFF</Color>
<Color x:Key="OnPrimaryColor">#FFFFFF</Color>
<Color x:Key="PrimaryContainerColor">#EADDFF</Color>
<Color x:Key="OnPrimaryContainerColor">#21005E</Color>

<!-- Secondary -->
<Color x:Key="SecondaryColor">#006C47</Color>
<Color x:Key="OnSecondaryColor">#FFFFFF</Color>
<Color x:Key="SecondaryContainerColor">#81F9C1</Color>
<Color x:Key="OnSecondaryContainerColor">#002113</Color>
<Color x:Key="SecondaryColor">#625B71</Color>
<Color x:Key="OnSecondaryColor">#FFFFFF</Color>
<Color x:Key="SecondaryContainerColor">#E8DEF8</Color>
<Color x:Key="OnSecondaryContainerColor">#1E192B</Color>

<!-- Tertiary -->
<Color x:Key="TertiaryColor">#0061A4</Color>
<Color x:Key="TertiaryColor">#7D5260</Color>
<Color x:Key="OnTertiaryColor">#FFFFFF</Color>
<Color x:Key="TertiaryContainerColor">#CFE4FF</Color>
<Color x:Key="OnTertiaryContainerColor">#001D36</Color>
<Color x:Key="TertiaryContainerColor">#FFD8E4</Color>
<Color x:Key="OnTertiaryContainerColor">#370B1E</Color>

<!-- Error -->
<Color x:Key="ErrorColor">#B3261E</Color>
<Color x:Key="OnErrorColor">#FFFFFF</Color>
<Color x:Key="ErrorContainerColor">#F9DEDC</Color>
<Color x:Key="OnErrorContainerColor">#410E0B</Color>
<Color x:Key="ErrorColor">#B3261E</Color>
<Color x:Key="OnErrorColor">#FFFFFF</Color>
<Color x:Key="ErrorContainerColor">#F9DEDC</Color>
<Color x:Key="OnErrorContainerColor">#370B1E</Color>

<!-- Background -->
<Color x:Key="BackgroundColor">#FFFBFE</Color>
<Color x:Key="OnBackgroundColor">#1C1B1F</Color>
<Color x:Key="BackgroundColor">#FFFBFE</Color>
<Color x:Key="OnBackgroundColor">#1C1B1F</Color>

<!-- Surface -->
<Color x:Key="SurfaceColor">#FFFBFE</Color>
<Color x:Key="OnSurfaceColor">#1C1B1F</Color>
<Color x:Key="SurfaceVariantColor">#E7E0EC</Color>
<Color x:Key="OnSurfaceVariantColor">#49454F</Color>
<Color x:Key="SurfaceInverseColor">#313033</Color>
<Color x:Key="OnSurfaceInverseColor">#F4EFF4</Color>
<Color x:Key="SurfaceColor">#FFFBFE</Color>
<Color x:Key="OnSurfaceColor">#1C1B1F</Color>
<Color x:Key="SurfaceVariantColor">#E7E0EC</Color>
<Color x:Key="OnSurfaceVariantColor">#49454E</Color>
<Color x:Key="SurfaceInverseColor">#313033</Color>
<Color x:Key="OnSurfaceInverseColor">#F4EFF4</Color>

<!-- Outline -->
<Color x:Key="OutlineColor">#79747E</Color>
<Color x:Key="OutlineColor">#79747E</Color>
</ResourceDictionary>

<!-- Dark Theme -->
<ResourceDictionary x:Key="Dark">
<!-- Primary -->
<Color x:Key="PrimaryColor">#C8BFFF</Color>
<Color x:Key="OnPrimaryColor">#2800A1</Color>
<Color x:Key="PrimaryContainerColor">#4128BA</Color>
<Color x:Key="OnPrimaryContainerColor">#E5DEFF</Color>
<Color x:Key="PrimaryInverseColor">#5946D2</Color>
<Color x:Key="PrimaryColor">#D0BCFF</Color>
<Color x:Key="OnPrimaryColor">#371E73</Color>
<Color x:Key="PrimaryContainerColor">#4F378B</Color>
<Color x:Key="OnPrimaryContainerColor">#EADDFF</Color>
<Color x:Key="PrimaryInverseColor">#6750A4</Color>

<!-- Secondary -->
<Color x:Key="SecondaryColor">#63DCA6</Color>
<Color x:Key="OnSecondaryColor">#003823</Color>
<Color x:Key="SecondaryContainerColor">#005235</Color>
<Color x:Key="OnSecondaryContainerColor">#81F9C1</Color>
<Color x:Key="SecondaryColor">#CCC2DC</Color>
<Color x:Key="OnSecondaryColor">#332D41</Color>
<Color x:Key="SecondaryContainerColor">#4A4458</Color>
<Color x:Key="OnSecondaryContainerColor">#E8DEF8</Color>

<!-- Tertiary -->
<Color x:Key="TertiaryColor">#9BCAFF</Color>
<Color x:Key="OnTertiaryColor">#003259</Color>
<Color x:Key="TertiaryContainerColor">#00497E</Color>
<Color x:Key="OnTertiaryContainerColor">#CFE4FF</Color>
<Color x:Key="TertiaryColor">#EFB8C8</Color>
<Color x:Key="OnTertiaryColor">#492532</Color>
<Color x:Key="TertiaryContainerColor">#633B48</Color>
<Color x:Key="OnTertiaryContainerColor">#FFD8E4</Color>

<!-- Error -->
<Color x:Key="ErrorColor">#F2B8B5</Color>
<Color x:Key="OnErrorColor">#601410</Color>
<Color x:Key="ErrorContainerColor">#8C1D18</Color>
<Color x:Key="OnErrorContainerColor">#F9DEDC</Color>
<Color x:Key="ErrorColor">#F2B8B5</Color>
<Color x:Key="OnErrorColor">#601410</Color>
<Color x:Key="ErrorContainerColor">#8C1D18</Color>
<Color x:Key="OnErrorContainerColor">#F9DEDC</Color>

<!-- Background -->
<Color x:Key="BackgroundColor">#1C1B1F</Color>
<Color x:Key="OnBackgroundColor">#E6E1E5</Color>
<Color x:Key="BackgroundColor">#1C1B1F</Color>
<Color x:Key="OnBackgroundColor">#E6E1E5</Color>

<!-- Surface -->
<Color x:Key="SurfaceColor">#1C1B1F</Color>
<Color x:Key="OnSurfaceColor">#E6E1E5</Color>
<Color x:Key="SurfaceVariantColor">#49454F</Color>
<Color x:Key="OnSurfaceVariantColor">#CAC4D0</Color>
<Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
<Color x:Key="OnSurfaceInverseColor">#1C1B1F</Color>
<Color x:Key="SurfaceColor">#1C1B1F</Color>
<Color x:Key="OnSurfaceColor">#E6E1E5</Color>
<Color x:Key="SurfaceVariantColor">#49454F</Color>
<Color x:Key="OnSurfaceVariantColor">#CAC4D0</Color>
<Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
<Color x:Key="OnSurfaceInverseColor">#313033</Color>

<!-- Outline -->
<Color x:Key="OutlineColor">#938F99</Color>
<Color x:Key="OutlineColor">#938F99</Color>
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>

Expand Down

0 comments on commit 93184fa

Please sign in to comment.