Skip to content

Commit 71d7b38

Browse files
agneszitteagneszitte
authored
Merge pull request #944 from unoplatform/dev/xygu/20230901/neumorphic-3rd-pass
neumorphic styles follow up update
2 parents 98812b5 + 8734bb9 commit 71d7b38

File tree

6 files changed

+172
-111
lines changed

6 files changed

+172
-111
lines changed

‎Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
4141
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
4242
<PackageReference Include="Uno.Diagnostics.Eventing" Version="2.1.0-dev.1" />
43-
<PackageReference Include="Uno.Toolkit.Skia.WinUI" Version="4.0.0-dev.98" />
44-
<PackageReference Include="Uno.Toolkit.WinUI" Version="4.0.0-dev.98" />
45-
<PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="4.0.0-dev.98" />
46-
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="4.0.0-dev.98" />
43+
<PackageReference Include="Uno.Toolkit.Skia.WinUI" Version="5.0.0-dev.94" />
44+
<PackageReference Include="Uno.Toolkit.WinUI" Version="5.0.0-dev.94" />
45+
<PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="5.0.0-dev.94" />
46+
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.0.0-dev.94" />
4747
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.0-dev.2319" />
4848
<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
4949
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />

‎Uno.Gallery/Uno.Gallery.Shared/Views/NeumorphicColorsOverride.xaml

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44
<ResourceDictionary.ThemeDictionaries>
55
<!-- Neumorphic ColorPaletteOverride -->
66
<ResourceDictionary x:Key="Dark">
7-
<Color x:Key="OnSurfaceColor">#E6E1E5</Color>
8-
<Color x:Key="OnSurfaceVariantColor">#C9C5D0</Color>
9-
<Color x:Key="PrimaryColor">#C7BFFF</Color>
10-
<Color x:Key="SurfaceColor">#302D38</Color>
11-
<Color x:Key="OnBackgroundColor">#E5E1E6</Color>
127
<Color x:Key="StatusBarForegroundColor">#FFFFFF</Color>
8+
<Color x:Key="SurfaceColor">#302D37</Color>
9+
<Color x:Key="PrimaryColor">#C7BFFF</Color>
1310
<Color x:Key="PrimaryInverseColor">#2A009F</Color>
1411
<Color x:Key="OnPrimaryColor">#2A009F</Color>
1512
<Color x:Key="PrimaryContainerColor">#4129BA</Color>
@@ -21,12 +18,15 @@
2118
<Color x:Key="SecondaryContainerColor">#433C52</Color>
2219
<Color x:Key="OnSecondaryContainerColor">#EDDFFF</Color>
2320
<Color x:Key="BackgroundColor">#1C1B1F</Color>
21+
<Color x:Key="OnBackgroundColor">#E5E1E6</Color>
2422
<Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
2523
<Color x:Key="SurfaceTintColor">#C7BFFF</Color>
2624
<Color x:Key="SurfaceVariantColor">#47464F</Color>
27-
<Color x:Key="OnSurfaceInverseColor">#1C1B1F</Color>
25+
<Color x:Key="OnSurfaceColor">#E6E1E5</Color>
26+
<Color x:Key="OnSurfaceInverseColor">#3E3B46</Color>
27+
<Color x:Key="OnSurfaceVariantColor">#C9C5D0</Color>
2828
<Color x:Key="OutlineColor">#928F99</Color>
29-
<Color x:Key="OutlineVariantColor">#57545D</Color>
29+
<Color x:Key="OutlineVariantColor">#928F99</Color>
3030
<Color x:Key="ErrorColor">#FFB4AB</Color>
3131
<Color x:Key="OnErrorColor">#690005</Color>
3232
<Color x:Key="ErrorContainerColor">#93000A</Color>
@@ -35,7 +35,7 @@
3535
<Color x:Key="OnTertiaryColor">#003258</Color>
3636
<Color x:Key="TertiaryContainerColor">#00497D</Color>
3737
<Color x:Key="OnTertiaryContainerColor">#D1E4FF</Color>
38-
38+
3939
<!-- Workaround to add the SolidColorBrush until https://github.com/unoplatform/Uno.Themes/issues/1145 is fixed -->
4040

4141
<!--#region PrimaryColor-->
@@ -968,14 +968,45 @@
968968
Color="{StaticResource OutlineColor}"
969969
Opacity="{StaticResource DisabledLowOpacity}" />
970970
<!--#endregion OutlineColor-->
971+
<!--#region OutlineVariantColor-->
972+
<SolidColorBrush x:Key="OutlineVariantBrush"
973+
Color="{StaticResource OutlineVariantColor}" />
974+
<SolidColorBrush x:Key="OutlineVariantHoverBrush"
975+
Color="{StaticResource OutlineVariantColor}"
976+
Opacity="{StaticResource HoverOpacity}" />
977+
<SolidColorBrush x:Key="OutlineVariantFocusedBrush"
978+
Color="{StaticResource OutlineVariantColor}"
979+
Opacity="{StaticResource FocusedOpacity}" />
980+
<SolidColorBrush x:Key="OutlineVariantPressedBrush"
981+
Color="{StaticResource OutlineVariantColor}"
982+
Opacity="{StaticResource PressedOpacity}" />
983+
<SolidColorBrush x:Key="OutlineVariantDraggedBrush"
984+
Color="{StaticResource OutlineVariantColor}"
985+
Opacity="{StaticResource DraggedOpacity}" />
986+
<SolidColorBrush x:Key="OutlineVariantSelectedBrush"
987+
Color="{StaticResource OutlineVariantColor}"
988+
Opacity="{StaticResource SelectedOpacity}" />
989+
<SolidColorBrush x:Key="OutlineVariantMediumBrush"
990+
Color="{StaticResource OutlineVariantColor}"
991+
Opacity="{StaticResource MediumOpacity}" />
992+
<SolidColorBrush x:Key="OutlineVariantLowBrush"
993+
Color="{StaticResource OutlineVariantColor}"
994+
Opacity="{StaticResource LowOpacity}" />
995+
<SolidColorBrush x:Key="OutlineVariantDisabledBrush"
996+
Color="{StaticResource OutlineVariantColor}"
997+
Opacity="{StaticResource DisabledOpacity}" />
998+
<SolidColorBrush x:Key="OutlineVariantDisabledLowBrush"
999+
Color="{StaticResource OutlineVariantColor}"
1000+
Opacity="{StaticResource DisabledLowOpacity}" />
1001+
<!--#endregion OutlineColor-->
9711002

9721003
<SolidColorBrush x:Key="SurfaceTintBrush"
9731004
Color="{StaticResource SurfaceTintColor}" />
9741005

9751006
</ResourceDictionary>
9761007

9771008
<ResourceDictionary x:Key="Light">
978-
<Color x:Key="OnSurfaceColor">#8E8AA7</Color>
1009+
<Color x:Key="OnSurfaceColor">#1C1B1F</Color>
9791010
<Color x:Key="OnSurfaceVariantColor">#8A8494</Color>
9801011
<Color x:Key="PrimaryColor">#5946D2</Color>
9811012
<Color x:Key="SurfaceColor">#F0F0F3</Color>
@@ -997,7 +1028,7 @@
9971028
<Color x:Key="SurfaceInverseColor">#313033</Color>
9981029
<Color x:Key="SurfaceTintColor">#5946D2</Color>
9991030
<Color x:Key="OnSurfaceInverseColor">#F4EFF4</Color>
1000-
<Color x:Key="SurfaceVariantColor">#F3EFF5</Color>
1031+
<Color x:Key="SurfaceVariantColor">#F2EFF5</Color>
10011032
<Color x:Key="OutlineColor">#79747E</Color>
10021033
<Color x:Key="OutlineVariantColor">#C9C5D0</Color>
10031034
<Color x:Key="ErrorColor">#B3261E</Color>

0 commit comments

Comments
 (0)