diff --git a/MyHomeAudio/App.xaml.cs b/MyHomeAudio/App.xaml.cs index 2f0f8d4..2159ccb 100644 --- a/MyHomeAudio/App.xaml.cs +++ b/MyHomeAudio/App.xaml.cs @@ -15,6 +15,7 @@ using Windows.ApplicationModel.Activation; using Windows.Foundation; using Windows.Foundation.Collections; +using Windows.Foundation.Metadata; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -38,6 +39,7 @@ public App() { /// Details about the launch request and process. protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) { m_window = new MainWindow(); + //m_window.ExtendsContentIntoTitleBar = true; m_window.Activate(); } diff --git a/MyHomeAudio/MainWindow.xaml b/MyHomeAudio/MainWindow.xaml index ac225eb..fb45d05 100644 --- a/MyHomeAudio/MainWindow.xaml +++ b/MyHomeAudio/MainWindow.xaml @@ -7,9 +7,25 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/MyHomeAudio/MainWindow.xaml.cs b/MyHomeAudio/MainWindow.xaml.cs index df751c6..0c385d7 100644 --- a/MyHomeAudio/MainWindow.xaml.cs +++ b/MyHomeAudio/MainWindow.xaml.cs @@ -16,6 +16,22 @@ using Microsoft.UI.Windowing; // Needed for AppWindow. using WinRT.Interop; // Needed for XAML/HWND interop. using Windows.UI; +using System.Net.NetworkInformation; +using MyHomeAudio.pages; + +//using AppUIBasics.Common; +//using AppUIBasics.Data; +//using AppUIBasics.Helper; +//using System.Text.RegularExpressions; +//using System.Threading.Tasks; +//using Windows.ApplicationModel; +//using Windows.ApplicationModel.Activation; +//using Windows.ApplicationModel.Core; +//using Windows.Foundation.Metadata; +//using Windows.System.Profile; +//using WinUIGallery.DesktopWap.DataModel; +//using WASDK = Microsoft.WindowsAppSDK; + // To learn more about WinUI, the WinUI project structure, @@ -25,21 +41,35 @@ namespace MyHomeAudio { /// /// An empty window that can be used on its own or navigated to within a Frame. /// - + public sealed partial class MainWindow : Window { - private AppWindow m_AppWindow; 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; + + } + + private void NavigationView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) { + if (args.IsSettingsInvoked) { + sender.AlwaysShowHeader = false; + //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(); + } } - private void myButton_Click(object sender, RoutedEventArgs e) { - myButton.Content = "Clicked"; + private void NavigationView_BackRequested(NavigationView sender, NavigationViewBackRequestedEventArgs args) { + ContentFrame.GoBack(); } } } diff --git a/MyHomeAudio/MyHomeAudio.csproj b/MyHomeAudio/MyHomeAudio.csproj index eec4215..29e7696 100644 --- a/MyHomeAudio/MyHomeAudio.csproj +++ b/MyHomeAudio/MyHomeAudio.csproj @@ -23,9 +23,15 @@ - - false - + + false + + + + + + + @@ -52,6 +58,16 @@ + + + MSBuild:Compile + + + + + MSBuild:Compile + +