[RPC-32] Use VCard Constants to maintain consistency

Aptivi · Apr 1, 2023 · 2d83c79 · 2d83c79
1 parent 2601dbc
commit 2d83c79
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 70 deletions.
diff --git a/VisualCard/Parts/AddressInfo.cs b/VisualCard/Parts/AddressInfo.cs
@@ -133,7 +133,7 @@ internal string ToStringVcardTwo()
         {
             return
                 $"{VcardConstants._addressSpecifierWithType}" +
-                $"TYPE={string.Join(",", AddressTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", AddressTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{PostOfficeBox}{VcardConstants._fieldDelimiter}" +
                 $"{ExtendedAddress}{VcardConstants._fieldDelimiter}" +
                 $"{StreetAddress}{VcardConstants._fieldDelimiter}" +
@@ -147,7 +147,7 @@ internal string ToStringVcardThree()
         {
             return
                 $"{VcardConstants._addressSpecifierWithType}" +
-                $"TYPE={string.Join(",", AddressTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", AddressTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{PostOfficeBox}{VcardConstants._fieldDelimiter}" +
                 $"{ExtendedAddress}{VcardConstants._fieldDelimiter}" +
                 $"{StreetAddress}{VcardConstants._fieldDelimiter}" +
@@ -162,8 +162,8 @@ internal string ToStringVcardFour()
             bool installAltId = AltId >= 0 && AltArguments.Length > 0;
             return
                 $"{VcardConstants._addressSpecifierWithType}" +
-                $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
-                $"TYPE={string.Join(",", AddressTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", AddressTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{PostOfficeBox}{VcardConstants._fieldDelimiter}" +
                 $"{ExtendedAddress}{VcardConstants._fieldDelimiter}" +
                 $"{StreetAddress}{VcardConstants._fieldDelimiter}" +

diff --git a/VisualCard/Parts/EmailInfo.cs b/VisualCard/Parts/EmailInfo.cs
@@ -95,15 +95,15 @@ internal string ToStringVcardTwo()
         {
             return
                 $"{VcardConstants._emailSpecifier}" +
-                $"TYPE={string.Join(",", ContactEmailTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", ContactEmailTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{ContactEmailAddress}";
         }
 
         internal string ToStringVcardThree()
         {
             return
                 $"{VcardConstants._emailSpecifier}" +
-                $"TYPE={string.Join(",", ContactEmailTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", ContactEmailTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{ContactEmailAddress}";
         }
 
@@ -112,8 +112,8 @@ internal string ToStringVcardFour()
             bool installAltId = AltId >= 0 && AltArguments.Length > 0;
             return
                 $"{VcardConstants._emailSpecifier}" +
-                $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
-                $"TYPE={string.Join(",", ContactEmailTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", ContactEmailTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{ContactEmailAddress}";
         }
 

diff --git a/VisualCard/Parts/GeoInfo.cs b/VisualCard/Parts/GeoInfo.cs
@@ -110,7 +110,7 @@ internal string ToStringVcardFour()
             bool installAltId = AltId >= 0 && AltArguments.Length > 0;
             return
                 $"{(installAltId ? VcardConstants._geoSpecifierWithType : VcardConstants._geoSpecifier)}" +
-                $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
+                $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
                 $"{(installAltId ? string.Join(VcardConstants._fieldDelimiter.ToString(), AltArguments) + VcardConstants._argumentDelimiter : "")}" +
                 $"{Geo}";
         }

diff --git a/VisualCard/Parts/ImppInfo.cs b/VisualCard/Parts/ImppInfo.cs
@@ -95,15 +95,15 @@ internal string ToStringVcardTwo()
         {
             return
                 $"{VcardConstants._imppSpecifierWithType}" +
-                $"TYPE={string.Join(",", ImppTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", ImppTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{ContactIMPP}";
         }
 
         internal string ToStringVcardThree()
         {
             return
                 $"{VcardConstants._imppSpecifierWithType}" +
-                $"TYPE={string.Join(",", ImppTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", ImppTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{ContactIMPP}";
         }
 
@@ -112,7 +112,7 @@ internal string ToStringVcardFour()
             bool installAltId = AltId >= 0 && AltArguments.Length > 0;
             return
                 $"{(installAltId ? VcardConstants._imppSpecifierWithType : VcardConstants._imppSpecifier)}" +
-                $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
+                $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
                 $"{(installAltId ? string.Join(VcardConstants._fieldDelimiter.ToString(), AltArguments) + VcardConstants._argumentDelimiter : "")}" +
                 $"{ContactIMPP}";
         }

diff --git a/VisualCard/Parts/LogoInfo.cs b/VisualCard/Parts/LogoInfo.cs
@@ -112,16 +112,16 @@ internal string ToStringVcardTwo()
             {
                 return
                     $"{VcardConstants._logoSpecifierWithType}" +
-                    $"VALUE={ValueType}{VcardConstants._argumentDelimiter}" +
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._argumentDelimiter}" +
                     $"{LogoEncoded}";
             }
             else
             {
                 string logoArgsLine =
                     $"{VcardConstants._logoSpecifierWithType}" +
-                    $"VALUE={ValueType}{VcardConstants._fieldDelimiter}" +
-                    $"ENCODING={Encoding}{VcardConstants._fieldDelimiter}" +
-                    $"TYPE={LogoType}{VcardConstants._argumentDelimiter}";
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._encodingArgumentSpecifier}{Encoding}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._typeArgumentSpecifier}{LogoType}{VcardConstants._argumentDelimiter}";
                 return logoArgsLine + BaseVcardParser.MakeStringBlock(LogoEncoded, logoArgsLine.Length);
             }
         }
@@ -132,16 +132,16 @@ internal string ToStringVcardThree()
             {
                 return
                     $"{VcardConstants._logoSpecifierWithType}" +
-                    $"VALUE={ValueType}{VcardConstants._argumentDelimiter}" +
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._argumentDelimiter}" +
                     $"{LogoEncoded}";
             }
             else
             {
                 string logoArgsLine =
                     $"{VcardConstants._logoSpecifierWithType}" +
-                    $"VALUE={ValueType}{VcardConstants._fieldDelimiter}" +
-                    $"ENCODING={Encoding}{VcardConstants._fieldDelimiter}" +
-                    $"TYPE={LogoType}{VcardConstants._argumentDelimiter}";
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._encodingArgumentSpecifier}{Encoding}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._typeArgumentSpecifier}{LogoType}{VcardConstants._argumentDelimiter}";
                 return logoArgsLine + BaseVcardParser.MakeStringBlock(LogoEncoded, logoArgsLine.Length);
             }
         }
@@ -153,20 +153,20 @@ internal string ToStringVcardFour()
             {
                 return
                     $"{VcardConstants._logoSpecifierWithType}" +
-                    $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
+                    $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
                     $"{(installAltId ? string.Join(VcardConstants._fieldDelimiter.ToString(), AltArguments) + VcardConstants._fieldDelimiter : "")}" +
-                    $"VALUE={ValueType}{VcardConstants._argumentDelimiter}" +
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._argumentDelimiter}" +
                     $"{LogoEncoded}";
             }
             else
             {
                 string logoArgsLine =
                     $"{VcardConstants._logoSpecifierWithType}" +
-                    $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
+                    $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
                     $"{(installAltId ? string.Join(VcardConstants._fieldDelimiter.ToString(), AltArguments) + VcardConstants._fieldDelimiter : "")}" +
-                    $"VALUE={ValueType}{VcardConstants._fieldDelimiter}" +
-                    $"ENCODING={Encoding}{VcardConstants._fieldDelimiter}" +
-                    $"TYPE={LogoType}{VcardConstants._argumentDelimiter}";
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._encodingArgumentSpecifier}{Encoding}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._typeArgumentSpecifier}{LogoType}{VcardConstants._argumentDelimiter}";
                 return logoArgsLine + BaseVcardParser.MakeStringBlock(LogoEncoded, logoArgsLine.Length);
             }
         }

diff --git a/VisualCard/Parts/NameInfo.cs b/VisualCard/Parts/NameInfo.cs
@@ -146,7 +146,7 @@ internal string ToStringVcardFour()
             string suffixesStr = string.Join(VcardConstants._valueDelimiter.ToString(), Suffixes);
             return
                 $"{(installAltId ? VcardConstants._nameSpecifierWithType : VcardConstants._nameSpecifier)}" +
-                $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
+                $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
                 $"{(installAltId ? string.Join(VcardConstants._fieldDelimiter.ToString(), AltArguments) + VcardConstants._argumentDelimiter : "")}" +
                 $"{ContactLastName}{VcardConstants._fieldDelimiter}" +
                 $"{ContactFirstName}{VcardConstants._fieldDelimiter}" +

diff --git a/VisualCard/Parts/NicknameInfo.cs b/VisualCard/Parts/NicknameInfo.cs
@@ -100,7 +100,7 @@ internal string ToStringVcardThree()
         {
             return
                 $"{VcardConstants._nicknameSpecifierWithType}" +
-                $"TYPE={string.Join(",", NicknameTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", NicknameTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{ContactNickname}";
         }
 
@@ -109,9 +109,9 @@ internal string ToStringVcardFour()
             bool installAltId = AltId >= 0 && AltArguments.Length > 0;
             return
                 $"{(installAltId ? VcardConstants._nicknameSpecifierWithType : VcardConstants._nicknameSpecifier)}" +
-                $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
+                $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
                 $"{(installAltId ? string.Join(VcardConstants._fieldDelimiter.ToString(), AltArguments) + VcardConstants._fieldDelimiter : "")}" +
-                $"TYPE={string.Join(",", NicknameTypes)}{VcardConstants._argumentDelimiter}" +
+                $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", NicknameTypes)}{VcardConstants._argumentDelimiter}" +
                 $"{ContactNickname}";
         }
 

diff --git a/VisualCard/Parts/OrganizationInfo.cs b/VisualCard/Parts/OrganizationInfo.cs
@@ -108,7 +108,7 @@ internal string ToStringVcardTwo()
             bool installType = OrgTypes.Length > 0 && OrgTypes[0].ToUpper() != "WORK";
             return
                 $"{(installType ? VcardConstants._orgSpecifierWithType : VcardConstants._orgSpecifier)}" +
-                $"{(installType ? $"TYPE={string.Join(",", OrgTypes)}{VcardConstants._argumentDelimiter}" : "")}" +
+                $"{(installType ? $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", OrgTypes)}{VcardConstants._argumentDelimiter}" : "")}" +
                 $"{Name}{VcardConstants._fieldDelimiter}" +
                 $"{Unit}{VcardConstants._fieldDelimiter}" +
                 $"{Role}";
@@ -119,7 +119,7 @@ internal string ToStringVcardThree()
             bool installType = OrgTypes.Length > 0 && OrgTypes[0].ToUpper() != "WORK";
             return
                 $"{(installType ? VcardConstants._orgSpecifierWithType : VcardConstants._orgSpecifier)}" +
-                $"{(installType ? $"TYPE={string.Join(",", OrgTypes)}{VcardConstants._argumentDelimiter}" : "")}" +
+                $"{(installType ? $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", OrgTypes)}{VcardConstants._argumentDelimiter}" : "")}" +
                 $"{Name}{VcardConstants._fieldDelimiter}" +
                 $"{Unit}{VcardConstants._fieldDelimiter}" +
                 $"{Role}";
@@ -131,8 +131,8 @@ internal string ToStringVcardFour()
             bool installType = (installAltId || OrgTypes.Length > 0) && OrgTypes[0].ToUpper() != "WORK";
             return
                 $"{(installType ? VcardConstants._orgSpecifierWithType : VcardConstants._orgSpecifier)}" +
-                $"{(installAltId ? "ALTID=" + AltId + (installType ? VcardConstants._fieldDelimiter : VcardConstants._argumentDelimiter) : "")}" +
-                $"{(installType ? $"TYPE={string.Join(",", OrgTypes)}{VcardConstants._argumentDelimiter}" : "")}" +
+                $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + (installType ? VcardConstants._fieldDelimiter : VcardConstants._argumentDelimiter) : "")}" +
+                $"{(installType ? $"{VcardConstants._typeArgumentSpecifier}{string.Join(",", OrgTypes)}{VcardConstants._argumentDelimiter}" : "")}" +
                 $"{Name}{VcardConstants._fieldDelimiter}" +
                 $"{Unit}{VcardConstants._fieldDelimiter}" +
                 $"{Role}";

diff --git a/VisualCard/Parts/PhotoInfo.cs b/VisualCard/Parts/PhotoInfo.cs
@@ -112,16 +112,16 @@ internal string ToStringVcardTwo()
             {
                 return
                     $"{VcardConstants._photoSpecifierWithType}" +
-                    $"VALUE={ValueType}{VcardConstants._argumentDelimiter}" +
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._argumentDelimiter}" +
                     $"{PhotoEncoded}";
             }
             else
             {
                 string photoArgsLine =
                     $"{VcardConstants._photoSpecifierWithType}" +
-                    $"VALUE={ValueType}{VcardConstants._fieldDelimiter}" +
-                    $"ENCODING={Encoding}{VcardConstants._fieldDelimiter}" +
-                    $"TYPE={PhotoType}{VcardConstants._argumentDelimiter}";
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._encodingArgumentSpecifier}{Encoding}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._typeArgumentSpecifier}{PhotoType}{VcardConstants._argumentDelimiter}";
                 return photoArgsLine + BaseVcardParser.MakeStringBlock(PhotoEncoded, photoArgsLine.Length);
             }
         }
@@ -132,16 +132,16 @@ internal string ToStringVcardThree()
             {
                 return
                     $"{VcardConstants._photoSpecifierWithType}" +
-                    $"VALUE={ValueType}{VcardConstants._argumentDelimiter}" +
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._argumentDelimiter}" +
                     $"{PhotoEncoded}";
             }
             else
             {
                 string photoArgsLine =
                     $"{VcardConstants._photoSpecifierWithType}" +
-                    $"VALUE={ValueType}{VcardConstants._fieldDelimiter}" +
-                    $"ENCODING={Encoding}{VcardConstants._fieldDelimiter}" +
-                    $"TYPE={PhotoType}{VcardConstants._argumentDelimiter}";
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._encodingArgumentSpecifier}{Encoding}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._typeArgumentSpecifier}{PhotoType}{VcardConstants._argumentDelimiter}";
                 return photoArgsLine + BaseVcardParser.MakeStringBlock(PhotoEncoded, photoArgsLine.Length);
             }
         }
@@ -153,20 +153,20 @@ internal string ToStringVcardFour()
             {
                 return
                     $"{VcardConstants._photoSpecifierWithType}" +
-                    $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
+                    $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
                     $"{(installAltId ? string.Join(VcardConstants._fieldDelimiter.ToString(), AltArguments) + VcardConstants._fieldDelimiter : "")}" +
-                    $"VALUE={ValueType}{VcardConstants._argumentDelimiter}" +
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._argumentDelimiter}" +
                     $"{PhotoEncoded}";
             }
             else
             {
                 string photoArgsLine =
                     $"{VcardConstants._photoSpecifierWithType}" +
-                    $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
+                    $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
                     $"{(installAltId ? string.Join(VcardConstants._fieldDelimiter.ToString(), AltArguments) + VcardConstants._fieldDelimiter : "")}" +
-                    $"VALUE={ValueType}{VcardConstants._fieldDelimiter}" +
-                    $"ENCODING={Encoding}{VcardConstants._fieldDelimiter}" +
-                    $"TYPE={PhotoType}{VcardConstants._argumentDelimiter}";
+                    $"{VcardConstants._valueArgumentSpecifier}{ValueType}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._encodingArgumentSpecifier}{Encoding}{VcardConstants._fieldDelimiter}" +
+                    $"{VcardConstants._typeArgumentSpecifier}{PhotoType}{VcardConstants._argumentDelimiter}";
                 return photoArgsLine + BaseVcardParser.MakeStringBlock(PhotoEncoded, photoArgsLine.Length);
             }
         }

diff --git a/VisualCard/Parts/RoleInfo.cs b/VisualCard/Parts/RoleInfo.cs
@@ -105,7 +105,7 @@ internal string ToStringVcardFour()
             bool installAltId = AltId >= 0 && AltArguments.Length > 0;
             return
                 $"{(installAltId ? VcardConstants._roleSpecifierWithType : VcardConstants._roleSpecifier)}" +
-                $"{(installAltId ? "ALTID=" + AltId + VcardConstants._fieldDelimiter : "")}" +
+                $"{(installAltId ? VcardConstants._altIdArgumentSpecifier + AltId + VcardConstants._fieldDelimiter : "")}" +
                 $"{(installAltId ? string.Join(VcardConstants._fieldDelimiter.ToString(), AltArguments) + VcardConstants._argumentDelimiter : "")}" +
                 $"{ContactRole}";
         }