AvaloniaCommunity · DamianSuess · Feb 6, 2023 · Feb 5, 2023 · Feb 6, 2023
diff --git a/Prism.Avalonia.sln b/Prism.Avalonia.sln
@@ -20,7 +20,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ViewDiscovery", "samples\Vi
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DummyModules", "DummyModules", "{E03DB670-BFA9-4E7B-A69C-D1E6B8E1691F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModulesSample", "samples\ModulesSample\ModulesSample.csproj", "{DCC68F88-29C9-44EF-90E3-685666AFD6AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModulesSampleApp", "samples\ModulesSample\ModulesSampleApp.csproj", "{DCC68F88-29C9-44EF-90E3-685666AFD6AD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DummyModule1", "samples\DummyModule1\DummyModule1.csproj", "{2B315287-FDAE-4092-9A80-7DA07D934BF1}"
 EndProject

diff --git a/Upgrading-to-Avalonia-11.md b/Upgrading-to-Avalonia-11.md
@@ -26,6 +26,7 @@ Check out Avalonia's [Breaking Changes](https://github.com/AvaloniaUI/Avalonia/w
   * The case was for "_single view platforms_" and not just Desktops which have a `Window` object.
 * Themes:
   * Themes must be download as part of a separate package and `App.axaml` implementation has changed.
+  * User MUST set a theme in `App.axaml`, otherwise the window's contents may be transparent
   * See, [PR# 8148](https://github.com/AvaloniaUI/Avalonia/pull/8166), [PR #8166](https://github.com/AvaloniaUI/Avalonia/pull/8166), [Issue #5593](https://github.com/AvaloniaUI/Avalonia/issues/5593)
   * NEW: `<SimpleTheme />`
   * OLD: `<SimpleTheme Mode="Light" />`

diff --git a/samples/BootstrapperShellSample/App.axaml b/samples/BootstrapperShellSample/App.axaml
@@ -1,7 +1,9 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="BootstrapperShellSample.App">
+             x:Class="BootstrapperShellSample.App"
+             RequestedThemeVariant="Light">
   <Application.Styles>
+    <FluentTheme />
     <!--<StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
     <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>-->
   </Application.Styles>

diff --git a/samples/ModulesSample/App.axaml b/samples/ModulesSample/App.axaml
@@ -1,7 +1,9 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ModulesSample.App">
+             x:Class="ModulesSample.App"
+             RequestedThemeVariant="Light">
   <Application.Styles>
+    <FluentTheme />
     <!--<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>-->
     <!--<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>-->
   </Application.Styles>

diff --git a/samples/ModulesSample/App.axaml.cs b/samples/ModulesSample/App.axaml.cs
@@ -13,8 +13,6 @@
 using System.Threading;
 using Avalonia.Dialogs;
 using ModulesSample.Infrastructure;
-using static System.Net.WebRequestMethods;
-using System.Security.Policy;
 
 namespace ModulesSample
 {

diff --git a/samples/ModulesSample/ModulesSample.csproj → ...les/ModulesSample/ModulesSampleApp.csproj b/samples/ModulesSample/ModulesSample.csproj → ...les/ModulesSample/ModulesSampleApp.csproj
diff --git a/samples/SampleMvvmApp/ViewModels/DashboardViewModel.cs b/samples/SampleMvvmApp/ViewModels/DashboardViewModel.cs
@@ -1,6 +1,8 @@
-using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Avalonia;
+using Avalonia.Styling;
 using Prism.Commands;
-using Prism.Regions;
 using SampleMvvmApp.Services;
 
 namespace SampleMvvmApp.ViewModels
@@ -12,10 +14,14 @@ public class DashboardViewModel : ViewModelBase
         private int _listItemSelected = -1;
         private ObservableCollection<string> _listItems = new();
         private string _listItemText;
+        private ThemeVariant _themeSelected;
+        private int _themeSelectedIndex = 0;
 
-        public DashboardViewModel(IRegionManager regionManager, INotificationService notifyService)
+        public DashboardViewModel(INotificationService notifyService)
         {
             _notification = notifyService;
+
+            ThemeSelected = Application.Current!.RequestedThemeVariant;
         }
 
         public DelegateCommand CmdAddItem => new(() =>
@@ -68,5 +74,22 @@ public ObservableCollection<string> ListItems
             get => _listItems;
             set => SetProperty(ref _listItems, value);
         }
+
+        public ThemeVariant ThemeSelected
+        {
+            get => _themeSelected;
+            set
+            {
+                SetProperty(ref _themeSelected, value);
+                Application.Current!.RequestedThemeVariant = _themeSelected;
+            }
+        }
+
+        public List<ThemeVariant> ThemeStyles => new()
+        {
+            ThemeVariant.Default,
+            ThemeVariant.Dark,
+            ThemeVariant.Light,
+        };
     }
 }
diff --git a/samples/SampleMvvmApp/Views/DashboardView.axaml b/samples/SampleMvvmApp/Views/DashboardView.axaml
@@ -27,6 +27,18 @@
       <Button Content="Add Item" Command="{Binding CmdAddItem}" />
       <Button Content="Clear" Command="{Binding CmdClearItems}" />
       <Button Content="Notification Pop-up" Command="{Binding CmdNotification}" />
+
+      <ComboBox VerticalAlignment="Center"
+                HorizontalAlignment="Stretch"
+                Items="{Binding ThemeStyles}"
+                SelectedItem="{Binding ThemeSelected}">
+        <!--SelectedIndex="{Binding ThemeSelectedIndex}" >-->
+        <ComboBox.ItemTemplate>
+          <DataTemplate x:DataType="x:String">
+            <TextBlock Text="{Binding TargetNullValue=Unset}" />
+          </DataTemplate>
+        </ComboBox.ItemTemplate>
+      </ComboBox>
     </StackPanel>
 
     <StackPanel Grid.Row="2" Orientation="Horizontal">