Skip to content

Commit

Permalink
Merge pull request #766 from unoplatform/dev/agzi/FixColors
Browse files Browse the repository at this point in the history
fix(ToDo): Multiple colors and UI related issues
  • Loading branch information
agneszitte authored Jul 5, 2024
2 parents 3eabc60 + 63f1f37 commit 5e27ec6
Show file tree
Hide file tree
Showing 29 changed files with 1,089 additions and 1,576 deletions.
24 changes: 10 additions & 14 deletions reference/ToDo/src/ToDo/App.xaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Application x:Class="ToDo.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:wasm="http://platform.uno/wasm"
xmlns:utum="using:Uno.Toolkit.UI.Material"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:converters="using:ToDo.Converters"
mc:Ignorable="wasm">
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:wasm="http://platform.uno/wasm"
xmlns:utum="using:Uno.Toolkit.UI.Material"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:converters="using:ToDo.Converters"
mc:Ignorable="wasm">

<Application.Resources>
<ResourceDictionary>
Expand All @@ -15,8 +15,8 @@

<!-- Load Material Toolkit resources -->
<MaterialToolkitTheme xmlns="using:Uno.Toolkit.UI.Material"
ColorOverrideSource="ms-appx:///Styles/ColorPaletteOverride.xaml"
FontOverrideSource="ms-appx:///Styles/MaterialFontsOverride.xaml" />
ColorOverrideSource="ms-appx:///Styles/ColorPaletteOverride.xaml"
FontOverrideSource="ms-appx:///Styles/MaterialFontsOverride.xaml" />

<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
Expand All @@ -31,19 +31,15 @@

<!-- Application's custom styles -->
<ResourceDictionary Source="ms-appx:///Styles/FeedView.xaml" />
<ResourceDictionary Source="ms-appx:///Styles/NavigationBar.xaml" />
<ResourceDictionary Source="ms-appx:///Styles/NavigationView.xaml" />

</ResourceDictionary.MergedDictionaries>

<x:Double x:Key="LandscapeMaxPageWidth">500</x:Double>

<!-- To override the default FlyoutLightDismissOverlayBackground resource -->
<SolidColorBrush x:Key="FlyoutLightDismissOverlayBackground"
Color="{ThemeResource OverlayColor}" />
Color="{ThemeResource OverlayColor}" />

<x:Double x:Key="WideMinWindowWidth">800</x:Double>
<x:Double x:Key="ExtraWideMinWindowWidth">1000</x:Double>

<converters:FormatConverter x:Key="FormatConverter" />
<converters:StringFormatter x:Key="StringFormatter" />
Expand Down
139 changes: 3 additions & 136 deletions reference/ToDo/src/ToDo/Assets/Icons/icon_foreground.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
139 changes: 3 additions & 136 deletions reference/ToDo/src/ToDo/Assets/Splash/splash_screen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5e27ec6

Please sign in to comment.