Remove app style selector from demo app, since it broken anyway

AvaloniaUtils · Oct 9, 2023 · c9528e4 · c9528e4
1 parent ebd50c4
commit c9528e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 39 deletions.
diff --git a/ShowMeTheXaml.Avalonia.Demo/ShowMeTheXaml.Avalonia.Demo.csproj b/ShowMeTheXaml.Avalonia.Demo/ShowMeTheXaml.Avalonia.Demo.csproj
@@ -21,7 +21,6 @@
         <PackageReference Include="Avalonia.Diagnostics" Version="11.0.1" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.1" />
         <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.1" />
-        <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.1" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\ShowMeTheXaml.Avalonia.AvaloniaEdit\ShowMeTheXaml.Avalonia.AvaloniaEdit.csproj" />

diff --git a/ShowMeTheXaml.Avalonia.Demo/Views/MainWindow.xaml b/ShowMeTheXaml.Avalonia.Demo/Views/MainWindow.xaml
@@ -13,26 +13,13 @@
     <vm:MainWindowViewModel />
   </Design.DataContext>
   <StackPanel>
-    <Grid RowDefinitions="Auto Auto *">
-      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-        <ComboBox Name="StyleSelector"
-                  SelectionChanged="StyleSelector_OnSelectionChanged"
-                  Margin="4"
-                  SelectedIndex="0">
-          <ComboBoxItem>AvaloniaEdit Style</ComboBoxItem>
-          <ComboBoxItem>Default Style</ComboBoxItem>
-        </ComboBox>
-        <ComboBox x:Name="ThemeSelector"
-                  SelectionChanged="ThemeSelector_OnSelectionChanged"
-                  Margin="4"
-                  SelectedIndex="1">
-          <ComboBox.Items>
-            <models:CatalogTheme>Fluent</models:CatalogTheme>
-            <models:CatalogTheme>Simple</models:CatalogTheme>
-          </ComboBox.Items>
-        </ComboBox>
-      </StackPanel>
-    </Grid>
+    <ComboBox Name="StyleSelector" HorizontalAlignment="Center"
+              SelectionChanged="StyleSelector_OnSelectionChanged"
+              Margin="4"
+              SelectedIndex="0">
+      <ComboBoxItem>AvaloniaEdit Style</ComboBoxItem>
+      <ComboBoxItem>Default Style</ComboBoxItem>
+    </ComboBox>
 
     <showMeTheXaml:XamlDisplay UniqueId="123" HorizontalAlignment="Center">
       <TextBlock Text="{Binding Greeting}" HorizontalAlignment="Center" VerticalAlignment="Center" />

diff --git a/ShowMeTheXaml.Avalonia.Demo/Views/MainWindow.xaml.cs b/ShowMeTheXaml.Avalonia.Demo/Views/MainWindow.xaml.cs
@@ -21,23 +21,5 @@ private void StyleSelector_OnSelectionChanged(object sender, SelectionChangedEve
                 : App.XamlDisplayDefaultStyles;
             Application.Current!.Styles[1] = styleSource;
         }
-
-        private void ThemeSelector_OnSelectionChanged(object sender, SelectionChangedEventArgs e) {
-            try {
-                var theme = (CatalogTheme)((ComboBox)sender).SelectedItem!;
-                if (theme == CatalogTheme.Fluent)
-                {
-                    Application.Current!.Styles[0] = App.Fluent;
-                }
-                else if (theme == CatalogTheme.Simple)
-                {
-                    Application.Current!.Styles[0] = App.Simple;
-                }
-            }
-            catch (Exception exception) {
-                Console.WriteLine(exception);
-                throw;
-            }
-        }
     }
 }