Rename IElement_AdditionalProperties to IHaveAdditionalProperties

Fix

Author: Sergio0694

Microsoft.Toolkit.Uwp.Notifications/Common/Serialization/IHaveAdditionalProperties.cs

@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+
+#nullable enable
+
+namespace Microsoft.Toolkit.Uwp.Notifications;
+
+/// <summary>
+/// An interface for a notification XML element with additional properties.
+/// </summary>
+internal interface IHaveAdditionalProperties
+{
+    /// <summary>
+    /// Gets the mapping of additional properties.
+    /// </summary>
+    IReadOnlyDictionary<string, string> AdditionalProperties { get; }
+}

Microsoft.Toolkit.Uwp.Notifications/Common/XmlWriterHelper.cs

@@ -41,15 +41,9 @@ public static void Write(System.Xml.XmlWriter writer, object element)
                 object propertyValue = GetPropertyValue(p, element);
 
                 // If it's the additional properties item
-                if (p.Name == nameof(IElement_AdditionalProperties.AdditionalProperties) && element is IElement_AdditionalProperties && p.PropertyType == typeof(IDictionary<string, string>))
+                if (p.Name == nameof(IHaveXmlAdditionalProperties.AdditionalProperties) && element is IHaveXmlAdditionalProperties && p.PropertyType == typeof(IReadOnlyDictionary<string, string>))
                 {
-                    if (propertyValue != null)
-                    {
-                        foreach (var additionalProp in propertyValue as IDictionary<string, string>)
-                        {
-                            writer.WriteAttributeString(additionalProp.Key, additionalProp.Value);
-                        }
-                    }
+                    continue;
                 }
 
                 // If it's an attribute
@@ -74,6 +68,11 @@ public static void Write(System.Xml.XmlWriter writer, object element)
                 }
             }
 
+            foreach (var property in (element as IHaveAdditionalProperties)?.AdditionalProperties ?? Enumerable.Empty<KeyValuePair<string, string>>())
+            {
+                writer.WriteAttributeString(property.Key, property.Value);
+            }
+
             foreach (var property in (element as IHaveXmlNamedProperties)?.EnumerateNamedProperties() ?? Enumerable.Empty<KeyValuePair<string, object>>())
             {
                 if (property.Value is not null)

Microsoft.Toolkit.Uwp.Notifications/Toasts/Elements/Element_Toast.cs

@@ -7,7 +7,7 @@
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
-    internal sealed class Element_Toast : BaseElement, IElement_ToastActivatable, IElement_AdditionalProperties, IHaveXmlName, IHaveXmlNamedProperties
+    internal sealed class Element_Toast : BaseElement, IElement_ToastActivatable, IHaveAdditionalProperties, IHaveXmlName, IHaveXmlNamedProperties
     {
         internal const ToastScenario DEFAULT_SCENARIO = ToastScenario.Default;
         internal const Element_ToastActivationType DEFAULT_ACTIVATION_TYPE = Element_ToastActivationType.Foreground;
@@ -62,7 +62,7 @@ public ToastAfterActivationBehavior AfterActivationBehavior
         [NotificationXmlAttribute("hint-people")]
         public string HintPeople { get; set; }
 
-        public IDictionary<string, string> AdditionalProperties { get; set; }
+        public IReadOnlyDictionary<string, string> AdditionalProperties { get; set; }
 
         public static Element_ToastActivationType ConvertActivationType(ToastActivationType publicType)
         {

Microsoft.Toolkit.Uwp.Notifications/Toasts/Elements/IElement_AdditionalProperties.cs

@@ -144,7 +144,7 @@ internal Element_Toast ConvertToElement()
                 Scenario = Scenario,
                 DisplayTimestamp = strippedDisplayTimestamp,
                 HintToastId = HintToastId,
-                AdditionalProperties = AdditionalProperties
+                AdditionalProperties = (Dictionary<string, string>)AdditionalProperties
             };
 
             ActivationOptions?.PopulateElement(toast);