make theme/orientation settings work and use local settings store

RobertK66 · Aug 24, 2023 · 128c406 · 128c406
1 parent 19655fb
commit 128c406
Show file tree

Hide file tree

Showing 8 changed files with 177 additions and 119 deletions.
diff --git a/MyHomeAudio/App.xaml.cs b/MyHomeAudio/App.xaml.cs
@@ -10,6 +10,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Windows.ApplicationModel;
@@ -46,7 +47,10 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar
             m_window.Activate();
         }
 
-        private Window m_window;
+        public MainWindow m_window;
+
+
+        public new static App Current => (App)Application.Current;
 
         public static string WinAppSdkDetails {
             get => string.Format("Windows App SDK {0}.{1}.{2}{3}",
@@ -60,5 +64,12 @@ public static string WinAppSdkRuntimeDetails {
             }
         }
 
+        public static TEnum GetEnum<TEnum>(string text) where TEnum : struct {
+            if (!typeof(TEnum).GetTypeInfo().IsEnum) {
+                throw new InvalidOperationException("Generic parameter 'TEnum' must be an enum.");
+            }
+            return (TEnum)Enum.Parse(typeof(TEnum), text);
+        }
+
     }
 }
diff --git a/MyHomeAudio/AppSettingKeys.cs b/MyHomeAudio/AppSettingKeys.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MyHomeAudio {
+    internal class AppSettingKeys {
+        internal const String IsLeftMode = "NavView_IsLeftMode";
+
+        internal const String UiTheme = "App_Theme";
+    }
+}
diff --git a/MyHomeAudio/MainWindow.xaml b/MyHomeAudio/MainWindow.xaml
@@ -7,25 +7,27 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
-    <NavigationView ItemInvoked="NavigationView_ItemInvoked" IsBackButtonVisible="Collapsed" Header="This is Header Text"  >
-        <NavigationView.MenuItems>
-            <NavigationViewItem Icon="Play" Content="Menu Item1" Tag="SamplePage1" />
-            <NavigationViewItem Icon="Save" Content="Menu Item2" Tag="SamplePage2" >
-                <NavigationViewItem.MenuItems>
-                    <NavigationViewItem Content="Mail" Icon="Mail" Tag="SamplePage2.1"/>
-                    <NavigationViewItem Content="Calendar" Icon="Calendar" Tag="SamplePage2.2">
-                        <NavigationViewItem.MenuItems>
-                            <NavigationViewItem Content="Mail" Icon="Manage" Tag="SamplePage2.2.1"/>
-                            <NavigationViewItem Content="Calendar" Icon="Camera" Tag="SamplePage2.2.2"/>
-                        </NavigationViewItem.MenuItems>
-                    </NavigationViewItem>
-                </NavigationViewItem.MenuItems>
-            </NavigationViewItem>
-            <NavigationViewItem Icon="Refresh" Content="Menu Item3" Tag="SamplePage3" />
-            <NavigationViewItem Icon="Download" Content="Menu Item4" Tag="SamplePage4" />
-        </NavigationView.MenuItems>
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <NavigationView x:Name="MainNavView" ItemInvoked="NavigationView_ItemInvoked" IsBackButtonVisible="Collapsed" Header="This is Header Text">
+            <NavigationView.MenuItems>
+                <NavigationViewItem Icon="Play" Content="Menu Item1" Tag="SamplePage1" />
+                <NavigationViewItem Icon="Save" Content="Menu Item2" Tag="SamplePage2" >
+                    <NavigationViewItem.MenuItems>
+                        <NavigationViewItem Content="Mail" Icon="Mail" Tag="SamplePage2.1"/>
+                        <NavigationViewItem Content="Calendar" Icon="Calendar" Tag="SamplePage2.2">
+                            <NavigationViewItem.MenuItems>
+                                <NavigationViewItem Content="Mail" Icon="Manage" Tag="SamplePage2.2.1"/>
+                                <NavigationViewItem Content="Calendar" Icon="Camera" Tag="SamplePage2.2.2"/>
+                            </NavigationViewItem.MenuItems>
+                        </NavigationViewItem>
+                    </NavigationViewItem.MenuItems>
+                </NavigationViewItem>
+                <NavigationViewItem Icon="Refresh" Content="Menu Item3" Tag="SamplePage3" />
+                <NavigationViewItem Icon="Download" Content="Menu Item4" Tag="SamplePage4" />
+            </NavigationView.MenuItems>
 
-        <Frame x:Name="ContentFrame" />
+            <Frame x:Name="ContentFrame" />
 
-    </NavigationView>
+        </NavigationView>
+    </Grid>
 </Window>
diff --git a/MyHomeAudio/MainWindow.xaml.cs b/MyHomeAudio/MainWindow.xaml.cs
@@ -18,6 +18,7 @@
 using Windows.UI;
 using System.Net.NetworkInformation;
 using MyHomeAudio.pages;
+using Windows.Storage;
 
 //using AppUIBasics.Common;
 //using AppUIBasics.Data;
@@ -45,31 +46,46 @@ namespace MyHomeAudio {
 
     public sealed partial class MainWindow : Window {
 
+        public NavigationView MainNavPane { get => this.MainNavView; }
+
         public MainWindow() {
             this.InitializeComponent();
             AppWindow.Title = "My Audio - Cast Application";
             AppWindow.TitleBar.IconShowOptions = IconShowOptions.HideIconAndSystemMenu;
             AppWindow.TitleBar.BackgroundColor = Colors.Bisque;
             AppWindow.TitleBar.ButtonBackgroundColor = Colors.Bisque;
 
+            var isLeft = ApplicationData.Current.LocalSettings.Values[AppSettingKeys.IsLeftMode];
+            if (isLeft == null || ((bool)isLeft == true)) {
+                MainNavView.PaneDisplayMode = NavigationViewPaneDisplayMode.Auto;
+            } else {
+                MainNavView.PaneDisplayMode = NavigationViewPaneDisplayMode.Top;
+            }
+
+            String theme = ApplicationData.Current.LocalSettings.Values[AppSettingKeys.UiTheme]?.ToString();
+            if (theme != null) {
+                var t = App.GetEnum<ElementTheme>(theme);
+
+                if (this.Content is FrameworkElement rootElement) {
+                    rootElement.RequestedTheme = t;
+                }
+            }
+
         }
 
         private void NavigationView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) {
             if (args.IsSettingsInvoked) {
                 sender.AlwaysShowHeader = false;
-                //ContentFrame.Navigate(typeof(SettingsPage));
-                ContentFrame.Content = new SettingsPage();
+                ContentFrame.Navigate(typeof(SettingsPage));
+                //ContentFrame.Content = new SettingsPage();
             } else {
                 sender.AlwaysShowHeader = true;
                 string selectedItemTag = (String)args.InvokedItem;
                 sender.Header = "Sample Page " + selectedItemTag;
-                //ContentFrame.Navigate(typeof(ContentPage));
-                ContentFrame.Content = new ContentPage();
+                ContentFrame.Navigate(typeof(ContentPage));
+                //ContentFrame.Content = new ContentPage();
             }
         }
 
-        private void NavigationView_BackRequested(NavigationView sender, NavigationViewBackRequestedEventArgs args) {
-            ContentFrame.GoBack();
-        }
     }
 }
diff --git a/MyHomeAudio/MyHomeAudio.csproj b/MyHomeAudio/MyHomeAudio.csproj
@@ -17,7 +17,7 @@
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundle>Never</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
 
   </PropertyGroup>
@@ -26,6 +26,7 @@
   <PropertyGroup>
     <PublishReadyToRun>false</PublishReadyToRun>
     <AssemblyVersion>1.0.0.42</AssemblyVersion>
+    <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
   </PropertyGroup>
 
 

diff --git a/MyHomeAudio/Package.appxmanifest b/MyHomeAudio/Package.appxmanifest
@@ -8,7 +8,7 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="b1000f29-5d74-47c6-800b-b36d7f1d18e7"
+    Name="Rob1000f29-5d74-47c6-800b-b36d7f1d18e7"
     Publisher="CN=RKOS Software"
     Version="1.0.8.0" />
 
@@ -47,6 +47,5 @@
 
   <Capabilities>
     <rescap:Capability Name="runFullTrust" />
-    <Capability Name="privateNetworkClientServer"/>
   </Capabilities>
 </Package>
diff --git a/MyHomeAudio/pages/SettingsPage.xaml b/MyHomeAudio/pages/SettingsPage.xaml
@@ -8,7 +8,9 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
-      NavigationCacheMode="Enabled"
+      NavigationCacheMode="Required"
+    Loaded="Page_Loaded"
+
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
     <Page.Resources>
         <!--  These styles can be referenced to create a consistent SettingsPage layout  -->
@@ -53,7 +55,7 @@
            x:Name="PageHeader"
            Margin="36,24,36,0"
            Style="{StaticResource TitleTextBlockStyle}"
-           Text="Settings" />
+           Text="{x:Bind SettingsTitleString, Mode=TwoWay}" />
         <ScrollViewer
            x:Name="contentSV"
            Grid.Row="1"
@@ -63,7 +65,6 @@
            VerticalScrollBarVisibility="Auto"
            VerticalScrollMode="Auto">
             <StackPanel Spacing="22">
-
 
                 <labs:SettingsCard Description="Select which app theme to display" Header="App theme">
                     <labs:SettingsCard.HeaderIcon>
@@ -81,48 +82,14 @@
                         <FontIcon Glyph="&#xF594;" />
                     </labs:SettingsCard.HeaderIcon>
                     <ComboBox x:Name="navigationLocation" SelectionChanged="navigationLocation_SelectionChanged_1">
-                        <ComboBoxItem Content="Left" />
+                        <ComboBoxItem Content="Left (Auto)" />
                         <ComboBoxItem Content="Top" />
                     </ComboBox>
                 </labs:SettingsCard>
-
-                <labs:SettingsExpander Description="Controls provide audible feedback" Header="Sound">
-                    <labs:SettingsExpander.HeaderIcon>
-                        <FontIcon Glyph="&#xEC4F;" />
-                    </labs:SettingsExpander.HeaderIcon>
-                    <ToggleSwitch x:Name="soundToggle" Toggled="soundToggle_Toggled" />
-                    <labs:SettingsExpander.Items>
-                        <labs:SettingsCard
-                           x:Name="SpatialAudioCard"
-                           Header="Enable Spatial Audio"
-                           IsEnabled="False">
-                            <labs:SettingsCard.Description>
-                                <HyperlinkButton Click="HyperlinkButton_Click"  Content="Learn more about enabling sounds in your app" />
-                            </labs:SettingsCard.Description>
-                            <ToggleSwitch x:Name="spatialSoundBox" Toggled="spatialSoundBox_Toggled" />
-                        </labs:SettingsCard>
-                    </labs:SettingsExpander.Items>
-                </labs:SettingsExpander>
-
-                <labs:SettingsExpander x:Name="ScreenshotCard" Header="Screenshot mode">
-                    <labs:SettingsExpander.HeaderIcon>
-                        <FontIcon Glyph="&#xEC4F;" />
-                    </labs:SettingsExpander.HeaderIcon>
-                    <ToggleSwitch x:Name="screenshotModeToggle" Toggled="screenshotModeToggle_Toggled" />
-                    <labs:SettingsExpander.Items>
-                        <labs:SettingsCard x:Name="ScreenshotFolderCard" Header="Screenshot folder">
-                            <labs:SettingsCard.Description>
-                                <HyperlinkButton x:Name="screenshotFolderLink" Click="screenshotFolderLink_Click" />
-                            </labs:SettingsCard.Description>
-                            <Button Click="Button_Click"  Content="Browse" />
-                        </labs:SettingsCard>
-                    </labs:SettingsExpander.Items>
-                </labs:SettingsExpander>
-
+
                 <!--  About  -->
                 <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="About" />
 
-
                 <labs:SettingsExpander x:Name="VersionExpander" Description="© 2023 Robert'sw" Header="{StaticResource AppTitleName}" HeaderIcon="PreviewLink">
                     <TextBlock
                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
@@ -142,14 +109,6 @@
                                 IsTextSelectionEnabled="True"
                                 Text="{x:Bind EaVersion}" />
                         </labs:SettingsCard>
-                        <!--<labs:SettingsExpander x:Name="DllVersionsExpander" Header="{x:Bind EaName}" Description="{x:Bind EaDecription}" HeaderIcon="Library">
-                            <TextBlock 
-                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                IsTextSelectionEnabled="True"
-                                Text="{x:Bind EaVersion}" />
-                            <labs:SettingsExpander.Items >
-                            </labs:SettingsExpander.Items>
-                        </labs:SettingsExpander> -->
                     </labs:SettingsExpander.Items>
                 </labs:SettingsExpander>
             </StackPanel>