diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 7dd8098300..7c2ae441d0 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -1,32 +1,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ Background="{DynamicResource ThemeBackgroundBrush}"
+ Foreground="{DynamicResource ThemeForegroundBrush}"
+ FontSize="{DynamicResource FontSizeNormal}">
+
+
+ Light
+ Dark
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs
index 0be5d25a09..a498b17bdd 100644
--- a/samples/ControlCatalog/MainView.xaml.cs
+++ b/samples/ControlCatalog/MainView.xaml.cs
@@ -2,6 +2,7 @@ using System.Collections;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
+using Avalonia.Markup.Xaml.Styling;
using Avalonia.Platform;
using ControlCatalog.Pages;
@@ -27,6 +28,22 @@ namespace ControlCatalog
});
}
+ var light = AvaloniaXamlLoader.Parse(@"");
+ var dark = AvaloniaXamlLoader.Parse(@"");
+ var themes = this.Find("Themes");
+ themes.SelectionChanged += (sender, e) =>
+ {
+ switch (themes.SelectedIndex)
+ {
+ case 0:
+ Styles[0] = light;
+ break;
+ case 1:
+ Styles[0] = dark;
+ break;
+ }
+ };
+ Styles.Add(light);
}
private void InitializeComponent()