Skip to content

Commit 221f9e2

Browse files
ghost1372ghost1372
committed
Rename JsonNavigationViewService to JsonNavigationService
1 parent 89b188f commit 221f9e2

39 files changed

Lines changed: 7918 additions & 5343 deletions

‎VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/App.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public partial class App : Application
55
public static Window MainWindow = Window.Current;
66
public IServiceProvider Services { get; }
77
public new static App Current => (App)Application.Current;
8-
public IJsonNavigationViewService GetNavigationService => GetService<IJsonNavigationViewService>();
8+
public IJsonNavigationService GetNavigationService => GetService<IJsonNavigationService>();
99
public IThemeService GetThemeService => GetService<IThemeService>();
1010

1111
public static T GetService<T>() where T : class
@@ -28,7 +28,7 @@ private static IServiceProvider ConfigureServices()
2828
{
2929
var services = new ServiceCollection();
3030
services.AddSingleton<IThemeService, ThemeService>();
31-
services.AddSingleton<IJsonNavigationViewService, JsonNavigationViewService>();
31+
services.AddSingleton<IJsonNavigationService, JsonNavigationService>();
3232

3333
services.AddTransient<MainViewModel>();$Services$
3434

‎VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/T4Templates/NavigationPageMappings.tt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void ProcessItems(JsonElement items, List<string> xamlPages)
4545
if (!string.IsNullOrEmpty(xamlClass))
4646
{
4747
#>
48-
{"<#= uniqueId + parameter #>", typeof(<#= xamlClass #>)},
48+
{"<#= uniqueId #>", typeof(<#= xamlClass #>)},
4949
<#
5050
}
5151
}
@@ -57,7 +57,7 @@ void ProcessItems(JsonElement items, List<string> xamlPages)
5757
if (!string.IsNullOrEmpty(xamlClass))
5858
{
5959
#>
60-
{"<#= uniqueId + parameter #>", typeof(<#= xamlClass #>)},
60+
{"<#= uniqueId #>", typeof(<#= xamlClass #>)},
6161
<#
6262
}
6363
}
@@ -172,4 +172,4 @@ string FindProjectRoot(string directory)
172172

173173
return null; // No project root found
174174
}
175-
#>
175+
#>

‎VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/Views/HomeLandingPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
HeaderOverlayImage="{ThemeResource HeaderCover}"
1212
HeaderSubtitleText="{x:Bind dev:ProcessInfoHelper.Version}"
1313
HeaderText="{x:Bind dev:ProcessInfoHelper.ProductName}"
14-
JsonNavigationViewService="{x:Bind local:App.Current.GetNavigationService}" />
14+
JsonNavigationService="{x:Bind local:App.Current.GetNavigationService}" />
1515
</Page>
1616

‎VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/Views/MainPage.xaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
<Grid RowDefinitions="Auto, *">
1111
<TitleBar x:Name="AppTitleBar"
1212
Title="{x:Bind dev:ProcessInfoHelper.ProductName}"
13-
BackRequested="AppTitleBar_BackRequested"
1413
IconSource="{dev:BitmapIconSource Source=ms-appx:///Assets/AppIcon.png}"
1514
IsBackButtonVisible="True"
1615
IsPaneToggleButtonVisible="True"
17-
PaneToggleRequested="AppTitleBar_PaneToggleRequested"
1816
Subtitle="{x:Bind dev:ProcessInfoHelper.VersionWithPrefix}">
1917
<TitleBar.Content>
2018
<AutoSuggestBox MinWidth="320"

‎VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/Views/MainPage.xaml.cs‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,16 @@ public MainPage()
1010
App.MainWindow.ExtendsContentIntoTitleBar = true;
1111
App.MainWindow.SetTitleBar(AppTitleBar);
1212

13-
var navService = App.GetService<IJsonNavigationViewService>() as JsonNavigationViewService;
13+
var navService = App.GetService<IJsonNavigationService>() as JsonNavigationService;
1414
if (navService != null)
1515
{
1616
navService.Initialize(NavView, NavFrame, NavigationPageMappings.PageDictionary)
1717
.ConfigureJsonFile("Assets/NavViewMenu/AppData.json")$ConfigDefaultPages$
18+
.ConfigureTitleBar(AppTitleBar)
1819
.ConfigureBreadcrumbBar(BreadCrumbNav, BreadcrumbPageMappings.PageDictionary);
1920
}
2021
}
2122

22-
private void AppTitleBar_BackRequested(TitleBar sender, object args)
23-
{
24-
if (NavFrame.CanGoBack)
25-
{
26-
NavFrame.GoBack();
27-
}
28-
}
29-
30-
private void AppTitleBar_PaneToggleRequested(TitleBar sender, object args)
31-
{
32-
NavView.IsPaneOpen = !NavView.IsPaneOpen;
33-
}
34-
35-
private void NavFrame_Navigated(object sender, NavigationEventArgs e)
36-
{
37-
AppTitleBar.IsBackButtonVisible = NavFrame.CanGoBack;
38-
}
39-
4023
private void ThemeButton_Click(object sender, RoutedEventArgs e)
4124
{
4225
ThemeService.ChangeThemeWithoutSave(App.MainWindow);

‎VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/Views/SettingsPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
VerticalScrollBarVisibility="Auto">
1515
<StackPanel Margin="10"
1616
dev:PanelAttach.ChildrenTransitions="Default"
17-
dev:SettingsNavigationAttach.JsonNavigationViewService="{x:Bind local:App.Current.GetNavigationService}"
17+
dev:SettingsNavigationAttach.JsonNavigationService="{x:Bind local:App.Current.GetNavigationService}"
1818
Spacing="5">
1919
$SettingsCards$
2020
</StackPanel>

‎VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ public partial class App : Application
44
{
55
public static Window MainWindow = Window.Current;
66
public IThemeService ThemeService { get; set; }
7-
public IJsonNavigationViewService NavigationService { get; set; }
7+
public IJsonNavigationService NavigationService { get; set; }
88
public new static App Current => (App)Application.Current;
9-
public IJsonNavigationViewService GetNavigationService => NavigationService;
9+
public IJsonNavigationService GetNavigationService => NavigationService;
1010
public IThemeService GetThemeService => ThemeService;
1111

1212
public App()
1313
{
1414
this.InitializeComponent();
15-
NavigationService = new JsonNavigationViewService();
15+
NavigationService = new JsonNavigationService();
1616
}
1717

1818
protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args)

‎VSIX/DevWinUI_Template/WinUIApp-NavigationView/T4Templates/NavigationPageMappings.tt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void ProcessItems(JsonElement items, List<string> xamlPages)
4545
if (!string.IsNullOrEmpty(xamlClass))
4646
{
4747
#>
48-
{"<#= uniqueId + parameter #>", typeof(<#= xamlClass #>)},
48+
{"<#= uniqueId #>", typeof(<#= xamlClass #>)},
4949
<#
5050
}
5151
}
@@ -57,7 +57,7 @@ void ProcessItems(JsonElement items, List<string> xamlPages)
5757
if (!string.IsNullOrEmpty(xamlClass))
5858
{
5959
#>
60-
{"<#= uniqueId + parameter #>", typeof(<#= xamlClass #>)},
60+
{"<#= uniqueId #>", typeof(<#= xamlClass #>)},
6161
<#
6262
}
6363
}
@@ -172,4 +172,4 @@ string FindProjectRoot(string directory)
172172

173173
return null; // No project root found
174174
}
175-
#>
175+
#>

‎VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/HomeLandingPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
HeaderOverlayImage="{ThemeResource HeaderCover}"
1212
HeaderSubtitleText="{x:Bind dev:ProcessInfoHelper.Version}"
1313
HeaderText="{x:Bind dev:ProcessInfoHelper.ProductName}"
14-
JsonNavigationViewService="{x:Bind local:App.Current.GetNavigationService}" />
14+
JsonNavigationService="{x:Bind local:App.Current.GetNavigationService}" />
1515
</Page>
1616

‎VSIX/DevWinUI_Template/WinUIApp-NavigationView/Views/MainPage.xaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
<Grid RowDefinitions="Auto, *">
1111
<TitleBar x:Name="AppTitleBar"
1212
Title="{x:Bind dev:ProcessInfoHelper.ProductName}"
13-
BackRequested="AppTitleBar_BackRequested"
1413
IconSource="{dev:BitmapIconSource Source=ms-appx:///Assets/AppIcon.png}"
1514
IsBackButtonVisible="True"
1615
IsPaneToggleButtonVisible="True"
17-
PaneToggleRequested="AppTitleBar_PaneToggleRequested"
1816
Subtitle="{x:Bind dev:ProcessInfoHelper.VersionWithPrefix}">
1917
<TitleBar.Content>
2018
<AutoSuggestBox MinWidth="320"

0 commit comments

Comments
 (0)