将设置控件命名与 Toolkit 匹配

wherewhere · Aug 24, 2024 · 316e29f · 316e29f
1 parent fdc208f
commit 316e29f
Show file tree

Hide file tree

Showing 18 changed files with 410 additions and 300 deletions.
diff --git a/.filenesting.json b/.filenesting.json
@@ -0,0 +1,22 @@
+{
+  "help": "https://go.microsoft.com/fwlink/?linkid=866610",
+  "dependentFileProviders": {
+    "add": {
+      "extensionToExtension": {
+        "add": {
+          ".cs": [
+            ".xaml"
+          ]
+        }
+      },
+      "pathSegment": {
+        "add": {
+          ".*": [
+            ".cs",
+            ".xaml"
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/CoreAppUWP.Package/Assets/About/About.en-US.md b/CoreAppUWP.Package/Assets/About/About.en-US.md
@@ -12,7 +12,7 @@
 | [CS/WinRT for UWP](https://github.com/gus33000/CsUWP "CsUWP") | [Gustave Monce](https://github.com/gus33000 "@gus33000") |
 | [Windows.SDK.NET.Ref for UWP](https://github.com/dongle-the-gadget/CsWinRTProjectionForWindows "CsWinRTProjectionForWindows") | [Dongle](https://github.com/dongle-the-gadget "@dongle-the-gadget") |
 | [XAML build tool for UWP](https://www.nuget.org/packages/WindowsXaml.ModernDotNet.BuildTools "WindowsXaml.ModernDotNet.BuildTools") | [Ahmed Walid](https://github.com/ahmed605 "@ahmed605") |
-| [XAML compiler for UWP](https://github.com/driver1998/ModernNetUAP.XamlCompiler "ModernNetUAP.XamlCompiler") | [³õÉúÖ®Äñ](https://github.com/driver1998 "@driver1998") |
+| [XAML compiler for UWP](https://github.com/driver1998/ModernNetUAP.XamlCompiler "ModernNetUAP.XamlCompiler") | [初生之鸟](https://github.com/driver1998 "@driver1998") |
 
 ##### Contributors
 - [wherewhere](https://github.com/wherewhere "@wherewhere")

diff --git a/...WP/Controls/Setting/Setting.Properties.cs → ...s/SettingsCard/SettingsCard.Properties.cs b/...WP/Controls/Setting/Setting.Properties.cs → ...s/SettingsCard/SettingsCard.Properties.cs
@@ -4,7 +4,7 @@
 
 namespace CoreAppUWP.Controls
 {
-    public partial class Setting
+    public partial class SettingsCard
     {
         /// <summary>
         /// Gets or sets the content of a ContentControl.
@@ -22,7 +22,7 @@ public partial class Setting
             DependencyProperty.Register(
                 nameof(Header),
                 typeof(object),
-                typeof(Setting),
+                typeof(SettingsCard),
                 new PropertyMetadata(null, OnHeaderPropertyChanged));
 
         /// <summary>
@@ -39,7 +39,7 @@ private static void OnHeaderPropertyChanged(DependencyObject d, DependencyProper
         {
             if (e.NewValue != e.OldValue)
             {
-                ((Setting)d).OnHeaderChanged();
+                ((SettingsCard)d).OnHeaderChanged();
             }
         }
 
@@ -54,7 +54,7 @@ private static void OnHeaderPropertyChanged(DependencyObject d, DependencyProper
             DependencyProperty.Register(
                 nameof(Description),
                 typeof(object),
-                typeof(Setting),
+                typeof(SettingsCard),
                 new PropertyMetadata(null, OnDescriptionPropertyChanged));
 
         /// <summary>
@@ -71,38 +71,38 @@ private static void OnDescriptionPropertyChanged(DependencyObject d, DependencyP
         {
             if (e.NewValue != e.OldValue)
             {
-                ((Setting)d).OnDescriptionChanged();
+                ((SettingsCard)d).OnDescriptionChanged();
             }
         }
 
         #endregion
 
-        #region Icon
+        #region HeaderIcon
 
         /// <summary>
-        /// Identifies the <see cref="Icon"/> dependency property.
+        /// Identifies the <see cref="HeaderIcon"/> dependency property.
         /// </summary>
-        public static readonly DependencyProperty IconProperty =
+        public static readonly DependencyProperty HeaderIconProperty =
             DependencyProperty.Register(
-                nameof(Icon),
+                nameof(HeaderIcon),
                 typeof(object),
-                typeof(Setting),
+                typeof(SettingsCard),
                 new PropertyMetadata(null, OnIconPropertyChanged));
 
         /// <summary>
         /// Gets or sets the icon on the left.
         /// </summary>
-        public object Icon
+        public object HeaderIcon
         {
-            get => GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
+            get => GetValue(HeaderIconProperty);
+            set => SetValue(HeaderIconProperty, value);
         }
 
         private static void OnIconPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (e.NewValue != e.OldValue)
             {
-                ((Setting)d).OnHeaderIconChanged();
+                ((SettingsCard)d).OnHeaderIconChanged();
             }
         }
 
@@ -117,7 +117,7 @@ private static void OnIconPropertyChanged(DependencyObject d, DependencyProperty
             DependencyProperty.Register(
                 nameof(ActionIcon),
                 typeof(object),
-                typeof(Setting),
+                typeof(SettingsCard),
                 new PropertyMetadata(null, OnActionIconPropertyChanged));
 
         /// <summary>
@@ -133,7 +133,7 @@ private static void OnActionIconPropertyChanged(DependencyObject d, DependencyPr
         {
             if (e.NewValue != e.OldValue)
             {
-                ((Setting)d).OnButtonIconChanged();
+                ((SettingsCard)d).OnButtonIconChanged();
             }
         }
 
@@ -148,7 +148,7 @@ private static void OnActionIconPropertyChanged(DependencyObject d, DependencyPr
             DependencyProperty.Register(
                 nameof(ActionIconToolTip),
                 typeof(string),
-                typeof(Setting),
+                typeof(SettingsCard),
                 new PropertyMetadata("More"));
 
         /// <summary>
@@ -171,7 +171,7 @@ public string ActionIconToolTip
             DependencyProperty.Register(
                 nameof(IsClickEnabled),
                 typeof(bool),
-                typeof(Setting),
+                typeof(SettingsCard),
                 new PropertyMetadata(false, OnIsClickEnabledPropertyChanged));
 
         /// <summary>
@@ -187,7 +187,7 @@ private static void OnIsClickEnabledPropertyChanged(DependencyObject d, Dependen
         {
             if (e.NewValue != e.OldValue)
             {
-                ((Setting)d).OnIsClickEnabledChanged();
+                ((SettingsCard)d).OnIsClickEnabledChanged();
             }
         }
 
@@ -202,7 +202,7 @@ private static void OnIsClickEnabledPropertyChanged(DependencyObject d, Dependen
             DependencyProperty.Register(
                 nameof(ContentAlignment),
                 typeof(ContentAlignment),
-                typeof(Setting),
+                typeof(SettingsCard),
                 new PropertyMetadata(ContentAlignment.Right));
 
         /// <summary>
@@ -225,7 +225,7 @@ public ContentAlignment ContentAlignment
             DependencyProperty.Register(
                 nameof(WrapThreshold),
                 typeof(double),
-                typeof(Setting),
+                typeof(SettingsCard),
                 new PropertyMetadata(476));
 
         /// <summary>
@@ -248,7 +248,7 @@ public double WrapThreshold
             DependencyProperty.Register(
                 nameof(WrapNoIconThreshold),
                 typeof(double),
-                typeof(Setting),
+                typeof(SettingsCard),
                 new PropertyMetadata(286));
 
         /// <summary>