From 56f6f144bd54dae1cf66510ed2795f7f3d5d771c Mon Sep 17 00:00:00 2001
From: moooyo <42196638+moooyo@users.noreply.github.com>
Date: Tue, 18 Mar 2025 21:25:02 +0800
Subject: [PATCH] Add Icon for TimeDate extension in settings page. (#565)

1. Remove unused file
2. Fix Icon in Extensions setting page.
3. Fix save settings issue

---------

Co-authored-by: Yu Leng (from Dev Box) <yuleng@microsoft.com>
---
 .../Helpers/SettingsManager.cs                |  2 ++
 .../Pages/TimeDateExtensionPage.cs            |  2 +-
 .../TimeDateCommandsProvider.cs               |  9 ++++++---
 .../app.manifest                              | 19 -------------------
 4 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/app.manifest

diff --git a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/Helpers/SettingsManager.cs b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/Helpers/SettingsManager.cs
index 07750ebfc0..d0de0017b8 100644
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/Helpers/SettingsManager.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/Helpers/SettingsManager.cs
@@ -164,5 +164,7 @@ public class SettingsManager : JsonSettingsManager
 
         // Load settings from file upon initialization
         LoadSettings();
+
+        Settings.SettingsChanged += (s, a) => this.SaveSettings();
     }
 }
diff --git a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/Pages/TimeDateExtensionPage.cs b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/Pages/TimeDateExtensionPage.cs
index 6f9b804690..bb5b58adb6 100644
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/Pages/TimeDateExtensionPage.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/Pages/TimeDateExtensionPage.cs
@@ -16,7 +16,7 @@ internal sealed partial class TimeDateExtensionPage : DynamicListPage
 
     public TimeDateExtensionPage(SettingsManager settingsManager)
     {
-        Icon = new("\uEC92"); // DateTime icon
+        Icon = IconHelpers.FromRelativePath("Assets\\TimeDate.svg");
         Title = Resources.Microsoft_plugin_timedate_main_page_title;
         Name = Resources.Microsoft_plugin_timedate_main_page_name;
         PlaceholderText = Resources.Microsoft_plugin_timedate_placeholder_text;
diff --git a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs
index 76f30b6f8a..a76cdb9ee0 100644
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs
+++ b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs
@@ -15,20 +15,23 @@ namespace Microsoft.CmdPal.Ext.TimeDate;
 public partial class TimeDateCommandsProvider : CommandProvider
 {
     private readonly CommandItem _command;
-    private readonly SettingsManager _settingsManager = new();
+    private static readonly SettingsManager _settingsManager = new();
     private static readonly CompositeFormat MicrosoftPluginTimedatePluginDescription = System.Text.CompositeFormat.Parse(Resources.Microsoft_plugin_timedate_plugin_description);
+    private static readonly TimeDateExtensionPage _timeDateExtensionPage = new(_settingsManager);
 
     public TimeDateCommandsProvider()
     {
         DisplayName = Resources.Microsoft_plugin_timedate_plugin_name;
 
-        _command = new CommandItem(new TimeDateExtensionPage(_settingsManager))
+        _command = new CommandItem(_timeDateExtensionPage)
         {
-            Icon = IconHelpers.FromRelativePath("Assets\\TimeDate.svg"),
+            Icon = _timeDateExtensionPage.Icon,
             Title = Resources.Microsoft_plugin_timedate_plugin_name,
             Subtitle = GetTranslatedPluginDescription(),
             MoreCommands = [new CommandContextItem(_settingsManager.Settings.SettingsPage)],
         };
+
+        Icon = _timeDateExtensionPage.Icon;
     }
 
     private string GetTranslatedPluginDescription()
diff --git a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/app.manifest b/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/app.manifest
deleted file mode 100644
index bcafb9bc5b..0000000000
--- a/src/modules/cmdpal/Exts/Microsoft.CmdPal.Ext.TimeDate/app.manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="HackerNewsExtension.app"/>
-
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
-      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
-      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-  
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </windowsSettings>
-  </application>
-</assembly>