Improve Template

ghost1372 · ghost1372 · commit f887ee4bb1f3 · 2025-02-13T13:37:11.000+03:30
diff --git a/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PredefinedCodes.cs b/VSIX/DevWinUI_Template/DevWinUI_Template/Common/PredefinedCodes.cs
@@ -195,12 +195,4 @@ private async void NavigateToLogPath_Click(object sender, RoutedEventArgs e)
         <uap5:StartupTask TaskId="$safeprojectname$StartOnLoginTask" Enabled="true" DisplayName="ms-resource:AppDisplayName" />
       </uap5:Extension>
 """";
-
-    public static readonly string InitializeAppMethods =
-""""
-        private $OnLaunchedAsyncKeyword$void InitializeAppMethods()
-        {
-            $PackagedAppTaskId$$Windows11ContextMenuInitializer$$ConfigLogger$$UnhandeledException$
-        }
-"""";
 }
diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/App.xaml.cs b/VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/App.xaml.cs
@@ -35,7 +35,7 @@ private static IServiceProvider ConfigureServices()
         return services.BuildServiceProvider();
     }
 
-    protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args)
+    protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         MainWindow = new MainWindow();
 
@@ -44,7 +44,14 @@ private static IServiceProvider ConfigureServices()
 
         ThemeService.AutoInitialize(MainWindow).ConfigureTintColor();
 
-        MainWindow.Activate();$PackagedAppTaskId$$Windows11ContextMenuMVVMInitializer$$ConfigLogger$$UnhandeledException$
+        MainWindow.Activate();
+
+        InitializeApp();
+    }
+
+    private $OnLaunchedAsyncKeyword$void InitializeApp()
+    {
+        $PackagedAppTaskId$$Windows11ContextMenuMVVMInitializer$$ConfigLogger$$UnhandeledException$
     }
 }
 
diff --git a/VSIX/DevWinUI_Template/WinUIApp-MVVM/App.xaml.cs b/VSIX/DevWinUI_Template/WinUIApp-MVVM/App.xaml.cs
@@ -33,7 +33,7 @@ private static IServiceProvider ConfigureServices()
         return services.BuildServiceProvider();
     }
 
-    protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args)
+    protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         MainWindow = new MainWindow();
 
@@ -42,7 +42,14 @@ private static IServiceProvider ConfigureServices()
 
         ThemeService.AutoInitialize(MainWindow);
 
-        MainWindow.Activate();$Windows11ContextMenuMVVMInitializer$$ConfigLogger$$UnhandeledException$
+        MainWindow.Activate();
+
+        InitializeApp();
+    }
+
+    private $OnLaunchedAsyncKeyword$void InitializeApp()
+    {
+        $Windows11ContextMenuMVVMInitializer$$ConfigLogger$$UnhandeledException$
     }
 }
 
diff --git a/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml.cs b/VSIX/DevWinUI_Template/WinUIApp-NavigationView/App.xaml.cs
@@ -13,7 +13,7 @@ public App()
         NavService = new JsonNavigationService();
     }
 
-    protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args)
+    protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         MainWindow = new MainWindow();
 
@@ -22,7 +22,14 @@ public App()
 
         ThemeService = new ThemeService(MainWindow);
 
-        MainWindow.Activate();$PackagedAppTaskId$$Windows11ContextMenuInitializer$$ConfigLogger$$UnhandeledException$
+        MainWindow.Activate();
+
+        InitializeApp();
+    }
+
+    private $OnLaunchedAsyncKeyword$void InitializeApp()
+    {
+        $PackagedAppTaskId$$Windows11ContextMenuInitializer$$ConfigLogger$$UnhandeledException$
     }
 }
 
diff --git a/VSIX/DevWinUI_Template/WinUIApp/App.xaml.cs b/VSIX/DevWinUI_Template/WinUIApp/App.xaml.cs
@@ -11,7 +11,7 @@ public App()
         this.InitializeComponent();
     }
 
-    protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args)
+    protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         MainWindow = new MainWindow();
 
@@ -20,7 +20,14 @@ public App()
 
         ThemeService = new ThemeService(MainWindow);
 
-        MainWindow.Activate();$Windows11ContextMenuInitializer$$ConfigLogger$$UnhandeledException$
+        MainWindow.Activate();
+
+        InitializeApp();
+    }
+
+    private $OnLaunchedAsyncKeyword$void InitializeApp()
+    {
+        $Windows11ContextMenuInitializer$$ConfigLogger$$UnhandeledException$
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private static IServiceProvider ConfigureServices()`
`35`	`35`	`return services.BuildServiceProvider();`
`36`	`36`	`}`
`37`	`37`
`38`		`- protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args)`
	`38`	`+ protected override void OnLaunched(LaunchActivatedEventArgs args)`
`39`	`39`	`{`
`40`	`40`	`MainWindow = new MainWindow();`
`41`	`41`
`@@ -44,7 +44,14 @@ private static IServiceProvider ConfigureServices()`
`44`	`44`
`45`	`45`	`ThemeService.AutoInitialize(MainWindow).ConfigureTintColor();`
`46`	`46`
`47`		`- MainWindow.Activate();$PackagedAppTaskId$$Windows11ContextMenuMVVMInitializer$$ConfigLogger$$UnhandeledException$`
	`47`	`+ MainWindow.Activate();`
	`48`	`+`
	`49`	`+ InitializeApp();`
	`50`	`+ }`
	`51`	`+`
	`52`	`+ private $OnLaunchedAsyncKeyword$void InitializeApp()`
	`53`	`+ {`
	`54`	`+ $PackagedAppTaskId$$Windows11ContextMenuMVVMInitializer$$ConfigLogger$$UnhandeledException$`
`48`	`55`	`}`
`49`	`56`	`}`
`50`	`57`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private static IServiceProvider ConfigureServices()`
`33`	`33`	`return services.BuildServiceProvider();`
`34`	`34`	`}`
`35`	`35`
`36`		`- protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args)`
	`36`	`+ protected override void OnLaunched(LaunchActivatedEventArgs args)`
`37`	`37`	`{`
`38`	`38`	`MainWindow = new MainWindow();`
`39`	`39`
`@@ -42,7 +42,14 @@ private static IServiceProvider ConfigureServices()`
`42`	`42`
`43`	`43`	`ThemeService.AutoInitialize(MainWindow);`
`44`	`44`
`45`		`- MainWindow.Activate();$Windows11ContextMenuMVVMInitializer$$ConfigLogger$$UnhandeledException$`
	`45`	`+ MainWindow.Activate();`
	`46`	`+`
	`47`	`+ InitializeApp();`
	`48`	`+ }`
	`49`	`+`
	`50`	`+ private $OnLaunchedAsyncKeyword$void InitializeApp()`
	`51`	`+ {`
	`52`	`+ $Windows11ContextMenuMVVMInitializer$$ConfigLogger$$UnhandeledException$`
`46`	`53`	`}`
`47`	`54`	`}`
`48`	`55`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public App()`
`13`	`13`	`NavService = new JsonNavigationService();`
`14`	`14`	`}`
`15`	`15`
`16`		`- protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args)`
	`16`	`+ protected override void OnLaunched(LaunchActivatedEventArgs args)`
`17`	`17`	`{`
`18`	`18`	`MainWindow = new MainWindow();`
`19`	`19`
`@@ -22,7 +22,14 @@ public App()`
`22`	`22`
`23`	`23`	`ThemeService = new ThemeService(MainWindow);`
`24`	`24`
`25`		`- MainWindow.Activate();$PackagedAppTaskId$$Windows11ContextMenuInitializer$$ConfigLogger$$UnhandeledException$`
	`25`	`+ MainWindow.Activate();`
	`26`	`+`
	`27`	`+ InitializeApp();`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ private $OnLaunchedAsyncKeyword$void InitializeApp()`
	`31`	`+ {`
	`32`	`+ $PackagedAppTaskId$$Windows11ContextMenuInitializer$$ConfigLogger$$UnhandeledException$`
`26`	`33`	`}`
`27`	`34`	`}`
`28`	`35`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public App()`
`11`	`11`	`this.InitializeComponent();`
`12`	`12`	`}`
`13`	`13`
`14`		`- protected $OnLaunchedAsyncKeyword$override void OnLaunched(LaunchActivatedEventArgs args)`
	`14`	`+ protected override void OnLaunched(LaunchActivatedEventArgs args)`
`15`	`15`	`{`
`16`	`16`	`MainWindow = new MainWindow();`
`17`	`17`
`@@ -20,7 +20,14 @@ public App()`
`20`	`20`
`21`	`21`	`ThemeService = new ThemeService(MainWindow);`
`22`	`22`
`23`		`- MainWindow.Activate();$Windows11ContextMenuInitializer$$ConfigLogger$$UnhandeledException$`
	`23`	`+ MainWindow.Activate();`
	`24`	`+`
	`25`	`+ InitializeApp();`
	`26`	`+ }`
	`27`	`+`
	`28`	`+ private $OnLaunchedAsyncKeyword$void InitializeApp()`
	`29`	`+ {`
	`30`	`+ $Windows11ContextMenuInitializer$$ConfigLogger$$UnhandeledException$`
`24`	`31`	`}`
`25`	`32`	`}`
`26`	`33`