Cleanup TextTagParser to use a bit less copied code

redbluegames · May 13, 2019 · 4c0b016 · 4c0b016
1 parent 41d6a04
commit 4c0b016
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/Assets/RedBlueGames/TextTyper/TextTagParser.cs b/Assets/RedBlueGames/TextTyper/TextTagParser.cs
@@ -19,8 +19,8 @@ public struct CustomTags
             public const string Animation = "animation";
         }
 
-        private static readonly List<string> UnityTagTypes = new List<string> { "b", "i", "size", "color", "style" };
-        private static readonly List<string> CustomTagTypes = new List<string>
+        private static readonly string[] UnityTagTypes = new string[] { "b", "i", "size", "color", "style" };
+        private static readonly string[] CustomTagTypes = new string[]
         {
             CustomTags.Delay,
             CustomTags.Anim,
@@ -65,27 +65,25 @@ public static string RemoveAllTags(string textWithTags)
 
         public static string RemoveCustomTags(string textWithTags)
         {
-            string textWithoutTags = textWithTags;
-            foreach (var customTag in CustomTagTypes)
-            {
-                textWithoutTags = RichTextTag.RemoveTagsFromString(textWithoutTags, customTag);
-            }
-
-            return textWithoutTags;
+            return RemoveTags(textWithTags, CustomTagTypes);
         }
 
         public static string RemoveUnityTags(string textWithTags)
+        {
+            return RemoveTags(textWithTags, UnityTagTypes);
+        }
+
+        private static string RemoveTags(string textWithTags, params string[] tags)
         {
             string textWithoutTags = textWithTags;
-            foreach (var unityTag in UnityTagTypes)
+            foreach (var tag in tags)
             {
-                textWithoutTags = RichTextTag.RemoveTagsFromString(textWithoutTags, unityTag);
+                textWithoutTags = RichTextTag.RemoveTagsFromString(textWithoutTags, tag);
             }
 
             return textWithoutTags;
         }
 
-
         public class TextSymbol
         {
             public TextSymbol(string character)