Improve Template

ghost1372 · Feb 13, 2025 · f887ee4 · f887ee4
1 parent 6d417be
commit f887ee4
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 16 deletions.
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$
     }
 }