diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_Template.csproj b/VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_Template.csproj index b7f2aff..e1d6200 100644 --- a/VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_Template.csproj +++ b/VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_Template.csproj @@ -55,6 +55,7 @@ + diff --git a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml.cs b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml.cs index 9281427..52bccc4 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml.cs +++ b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml.cs @@ -4,15 +4,14 @@ public partial class App : Application { public static Window MainWindow = Window.Current; public IThemeService ThemeService { get; set; } - public IJsonNavigationService NavigationService { get; set; } + public JsonNavigationService NavService { get; set; } public new static App Current => (App)Application.Current; - public IJsonNavigationService GetNavService => NavigationService; public IThemeService GetThemeService => ThemeService; public App() { this.InitializeComponent(); - NavigationService = new JsonNavigationService(); + NavService = new JsonNavigationService(); } protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args) diff --git a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/HomeLandingPage.xaml b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/HomeLandingPage.xaml index 3361cf4..1e21048 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/HomeLandingPage.xaml +++ b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/HomeLandingPage.xaml @@ -11,6 +11,6 @@ HeaderOverlayImage="{ThemeResource HeaderCover}" HeaderSubtitleText="{x:Bind dev:ProcessInfoHelper.Version}" HeaderText="{x:Bind dev:ProcessInfoHelper.ProductName}" - JsonNavigationService="{x:Bind local:App.Current.GetNavService}" /> + JsonNavigationService="{x:Bind local:App.Current.NavService}" /> diff --git a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/MainPage.xaml.cs b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/MainPage.xaml.cs index 00367ab..3ec3466 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/MainPage.xaml.cs +++ b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/MainPage.xaml.cs @@ -7,7 +7,7 @@ public MainPage() this.InitializeComponent(); App.MainWindow.ExtendsContentIntoTitleBar = true; App.MainWindow.SetTitleBar(AppTitleBar); - App.Current.GetNavService() + App.Current.NavService .Initialize(NavView, NavFrame, NavigationPageMappings.PageDictionary) .ConfigureJsonFile("Assets/NavViewMenu/AppData.json")$ConfigDefaultPages$ .ConfigureTitleBar(AppTitleBar) diff --git a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/SettingsPage.xaml b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/SettingsPage.xaml index 3ec9918..b531ee0 100644 --- a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/SettingsPage.xaml +++ b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/SettingsPage.xaml @@ -14,7 +14,7 @@ VerticalScrollBarVisibility="Auto"> $SettingsCards$