! Upload new version v2.0

Assets/LocalizeService/Demo/LocolizeTest.cs

@@ -1,38 +1,56 @@
-using SunCubeStudio.Localization;
+using System;
+using Localization;
 using UnityEngine;
 using UnityEngine.UI;
 
 // For DEMO VIEW
 public class LocolizeTest : MonoBehaviour
 {
-    public Text CurrentText;
+    public Toggle Localization1;
+    public Toggle Localization2;
+    public Toggle Localization3;
 
     private void Start()
     {
-        CurrentText.text = string.Format("Current localization - {0}", LocalizationService.Instance.Localization);
+        Localization1.onValueChanged.AddListener(OnLocalization1Set);
+        Localization2.onValueChanged.AddListener(OnLocalization2Set);
+        Localization3.onValueChanged.AddListener(OnLocalization3Set);
+
+        CheckLocalization();
     }
 
-    public void English()
+    private void CheckLocalization()
     {
-        LocalizationService.Instance.Localization = "English";
+        if (LocalizationService.Instance == null) return;
+
+        switch (LocalizationService.Instance.Localization)
+        {
+            case "Russian":
+                Localization2.isOn = true;
+                break;
+            case "English":
+                Localization1.isOn = true;
+                break;
+            case "French":
+                Localization3.isOn = true;
+                break;
+        }
+    }
 
-        CurrentText.text = string.Format("Current localization {0}",
-            LocalizationService.Instance.GetTextByKeyWithLocalize("localization1", "English"));
+    private void OnLocalization1Set(bool value)
+    {
+        if (!value) return;
+        LocalizationService.Instance.Localization = "English";
     }
-    public void Russian()
+    private void OnLocalization2Set(bool value)
     {
+        if (!value) return;
         LocalizationService.Instance.Localization = "Russian";
-
-        CurrentText.text = string.Format("Current localization {0}",
-            LocalizationService.Instance.GetTextByKeyWithLocalize("localization2", "English"));
     }
-
-    public void French()
+    private void OnLocalization3Set(bool value)
     {
+        if (!value) return;
         LocalizationService.Instance.Localization = "French";
-
-        CurrentText.text = string.Format("Current localization {0}",
-            LocalizationService.Instance.GetTextByKeyWithLocalize("localization3", "English"));
     }
 
 }

Assets/LocalizeService/Plugins/Core/MonoSingleton.cs

@@ -2,7 +2,6 @@
 
 public class MonoSingleton<T> : MonoBehaviour where T : MonoBehaviour
 {
-
 	private static T s_Instance;
 	private static bool s_IsDestroyed;
 
@@ -32,15 +31,15 @@ public static T Instance
 
 	protected virtual void OnDestroy()
 	{
-		if (s_Instance)
-			Destroy(s_Instance);
-
 		s_Instance = null;
 		s_IsDestroyed = true;
+
+		if (s_Instance)
+			Destroy(s_Instance);
 	}
 
-	public bool IsLive()
+	public static bool IsLive
 	{
-		return s_IsDestroyed;
+		get { return !s_IsDestroyed; }
 	}
 }

Assets/LocalizeService/Plugins/Core/TypeHelper.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+public class TypeHelper
+{
+	public static Dictionary<string, Type> _fastTypes = new Dictionary<string, Type>(); 
+
+	public static Type GetTypeByName(string name, string assemblyName)
+	{
+		if (_fastTypes.ContainsKey(name))
+			return _fastTypes[name];
+
+		foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
+		{
+			if (!assembly.FullName.Contains(assemblyName))
+				continue;
+
+			foreach (Type type in assembly.GetTypes())
+			{
+				if (type.Name == name)
+				{
+					_fastTypes.Add(name, type);
+					return type;
+				}
+			}
+		}
+
+		return null;
+	}
+}

Assets/LocalizeService/Resources/Localization/English.csv

@@ -1,8 +1,7 @@
-Id,English
-title,Localization\n Service
-text,"This package is designed to show the localization of text in your applications. Simple interface. Text of localization located in the .CSV file format. Works with several possible types of text output in Unity(MeshText and UIText), there is also has the opportunity to get text value of the code."
-shorttext,This package is designed to show the localization of text...
+Id,English
+title,Localization Service
+text,"This package is designed to show the localization of text in your applications. Simple interface. Text of localization located in the .CSV file format. Works with several possible types of text output in Unity3d (MeshText and UIText), there is also has the opportunity to get text value of the code."
 autors,Sun Cube
 localization1,English
 localization2,Russian
-localization3,French
+localization3,French