From c6d221d6c04592e467460990c16105610fbf1684 Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Fri, 7 Sep 2018 17:12:16 +0200 Subject: [PATCH] - Bring text to text buttons (not fully working) - Refactoring of unity element creation - copy Vocaluxe.UI.dll to unity assets automatically --- Vocaluxe.UI.Unity/Assets/ScreenHandler.cs | 5 +- Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll | Bin 19456 -> 0 bytes Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.mdb | Bin 5164 -> 0 bytes .../Assets/Vocaluxe.UI.dll.mdb.meta | 7 -- Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.meta | 96 ------------------ .../BasicElements/Text/CUiElementText.cs | 5 +- Vocaluxe.UI/Parser/CUiScreenParser.cs | 53 ++-------- Vocaluxe.UI/Vocaluxe.UI.csproj | 4 + 8 files changed, 21 insertions(+), 149 deletions(-) delete mode 100644 Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll delete mode 100644 Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.mdb delete mode 100644 Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.mdb.meta delete mode 100644 Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.meta diff --git a/Vocaluxe.UI.Unity/Assets/ScreenHandler.cs b/Vocaluxe.UI.Unity/Assets/ScreenHandler.cs index 4f19cb6d..cfe308fc 100644 --- a/Vocaluxe.UI.Unity/Assets/ScreenHandler.cs +++ b/Vocaluxe.UI.Unity/Assets/ScreenHandler.cs @@ -105,7 +105,7 @@ public class ScreenHandler : MonoBehaviour button.GetComponent().color = Color.green; var buttonText = button.GetComponentInChildren().gameObject; - SetProperties((CUiElementText)buttonInfo.AsQueryable().FirstOrDefault(x => x is CUiElementText), buttonText); + SetProperties((CUiElementText)buttonInfo.FirstOrDefault(x => x is CUiElementText), buttonText); } private GameObject CreateElement(CUiElementText textInfo) @@ -117,6 +117,9 @@ public class ScreenHandler : MonoBehaviour private void SetProperties(CUiElementText textInfo, GameObject text) { + var textComponent = text.GetComponent(); + // Add text to the text component + textComponent.text = textInfo.Controller.Text; PositionElement(textInfo, text); } diff --git a/Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll b/Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll deleted file mode 100644 index 24f4c24222b6e17c8822e4e6a667b0bd2d826fe9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19456 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 diff --git a/Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.mdb.meta b/Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.mdb.meta deleted file mode 100644 index c842be6e..00000000 --- a/Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.mdb.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ee53898f2ecb9f947bf75286bc93aee0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.meta b/Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.meta deleted file mode 100644 index 2487a4a5..00000000 --- a/Vocaluxe.UI.Unity/Assets/Vocaluxe.UI.dll.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: c159d6aca28a19847ace6c3ea7bfad8c -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux: 0 - Exclude Linux64: 0 - Exclude LinuxUniversal: 0 - Exclude OSXUniversal: 0 - Exclude Win: 0 - Exclude Win64: 0 - Exclude WindowsStoreApps: 0 - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Linux64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Standalone: LinuxUniversal - second: - enabled: 1 - settings: {} - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 1 - settings: - CPU: AnyCPU - DontProcess: false - PlaceholderPath: - SDK: AnySDK - ScriptingBackend: AnyScriptingBackend - userData: - assetBundleName: - assetBundleVariant: diff --git a/Vocaluxe.UI/BasicElements/Text/CUiElementText.cs b/Vocaluxe.UI/BasicElements/Text/CUiElementText.cs index 12526734..62e2d184 100644 --- a/Vocaluxe.UI/BasicElements/Text/CUiElementText.cs +++ b/Vocaluxe.UI/BasicElements/Text/CUiElementText.cs @@ -10,7 +10,10 @@ namespace Vocaluxe.UI.BasicElements.Text public static CUiElementText CreateInstance(Dictionary properties, IEnumerable<(CUiElement uiElement, string bindingId)> children) { - return CUiElement.CreateInstance(properties, children); + var instance = CUiElement.CreateInstance(properties, children); + properties.TryGetValue("value", out string value); + instance.Controller.Text = value; + return instance; } } } diff --git a/Vocaluxe.UI/Parser/CUiScreenParser.cs b/Vocaluxe.UI/Parser/CUiScreenParser.cs index 8bdd3537..0157c03e 100644 --- a/Vocaluxe.UI/Parser/CUiScreenParser.cs +++ b/Vocaluxe.UI/Parser/CUiScreenParser.cs @@ -8,47 +8,6 @@ namespace Vocaluxe.UI.Parser { public static class CUiScreenParser { - public static CUiScreen ParseOld(string path) - { - if(!File.Exists(path)) - throw new FileNotFoundException(path); - - using (XmlReader reader = XmlReader.Create(path, new XmlReaderSettings { IgnoreWhitespace = true })) - { - return _ParseElementOld(reader)[0].Item1 as CUiScreen ?? throw new ArgumentException("First node must be a screen element"); - } - } - - private static List<(CUiElement uiElement, string bindingId)> _ParseElementOld(XmlReader reader) - { - List<(CUiElement, string)> elementList = new List<(CUiElement uiElement, string bindingId)>(); - - while (reader.Read()) - { - if (reader.NodeType != XmlNodeType.Element) - continue; - - string elementName = reader.Name; - - var subtreeReader = reader.ReadSubtree(); - subtreeReader.Read(); - List<(CUiElement uiElement, string bindingId)> childElements = _ParseElementOld(subtreeReader); - - Dictionary attributes = new Dictionary(); - for (var attrIndex = 0; attrIndex < reader.AttributeCount; attrIndex++) - { - reader.MoveToAttribute(attrIndex); - attributes.Add(reader.Name, reader.Value); - } - - attributes.TryGetValue("bindingId", out string bindingId); - elementList.Add((CUiElementFactory.CreateElement(elementName, attributes, childElements), bindingId)); - } - - reader.Close(); - return elementList; - } - public static CUiScreen Parse(string path) { if (!File.Exists(path)) @@ -68,12 +27,18 @@ namespace Vocaluxe.UI.Parser return resultElement; List<(CUiElement uiElement, string bindingId)> childElements = new List<(CUiElement uiElement, string bindingId)>(); - foreach (XmlElement childNode in node.ChildNodes) + Dictionary attributes = new Dictionary(); + foreach (XmlNode childNode in node.ChildNodes) { - childElements.Add(_ParseElement(childNode)); + if(!(childNode is XmlElement)) + { + attributes.Add("value", childNode.Value); + continue; + } + childElements.Add(_ParseElement((XmlElement)childNode)); } - Dictionary attributes = new Dictionary(); + foreach (XmlAttribute attribute in node.Attributes) { attributes.Add(attribute.Name, attribute.Value); diff --git a/Vocaluxe.UI/Vocaluxe.UI.csproj b/Vocaluxe.UI/Vocaluxe.UI.csproj index 4704dadc..d242d0da 100644 --- a/Vocaluxe.UI/Vocaluxe.UI.csproj +++ b/Vocaluxe.UI/Vocaluxe.UI.csproj @@ -119,4 +119,8 @@ + + copy /Y "$(TargetDir)$(ProjectName).dll" "$(SolutionDir)Vocaluxe.UI.Unity\Assets\$(ProjectName).dll" +copy /Y "$(TargetDir)$(ProjectName).pdb" "$(SolutionDir)Vocaluxe.UI.Unity\Assets\$(ProjectName).pdb" + \ No newline at end of file