Merge pull request #9 from CoderGamester/develop

Release 0.4.0

Author: CoderGamester

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## [0.4.0] - 2020-07-13
+
+**Changed**:
+- Removed the *UiService* dependency from the *Addressables*
+- Modified the *UiService* to be testable and injectable into other systems
+
 ## [0.3.2] - 2020-04-18
 
 - Moved interface *IUiService* to a separate file to improve the code readability

Runtime/UiService.cs

@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using GameLovers.AssetLoader;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 // ReSharper disable CheckNamespace
 
@@ -12,12 +11,18 @@ namespace GameLovers.UiService
 	/// <inheritdoc />
 	public class UiService : IUiService
 	{
+		private readonly IAssetLoader _assetLoader;
 		private readonly IDictionary<Type, UiReference> _uiViews = new Dictionary<Type, UiReference>();
 		private readonly IDictionary<Type, UiConfig> _uiConfigs = new Dictionary<Type, UiConfig>();
 		private readonly IDictionary<int, UiSetConfig> _uiSets = new Dictionary<int, UiSetConfig>();
 		private readonly IList<Type> _visibleUiList = new List<Type>();
 		private readonly IList<Canvas> _layers = new List<Canvas>();
 
+		public UiService(IAssetLoader assetLoader)
+		{
+			_assetLoader = assetLoader;
+		}
+
 		/// <summary>
 		/// Initialize the service with the proper <paramref name="configs"/>
 		/// </summary>
@@ -140,7 +145,7 @@ public async Task<UiPresenter> LoadUiAsync(Type type, bool openAfter = false)
 				throw new KeyNotFoundException($"The UiConfig of type {type} was not added to the service. Call {nameof(AddUiConfig)} first");
 			}
 
-			var gameObject = await AssetLoaderService.InstantiatePrefabAsync(config.AddressableAddress);
+			var gameObject = await _assetLoader.InstantiatePrefabAsync(config.AddressableAddress);
 			var uiPresenter = gameObject.GetComponent<UiPresenter>();
 
 			gameObject.SetActive(false);
@@ -161,7 +166,7 @@ public void UnloadUi(Type type)
 		{
 			var gameObject = RemoveUi(type).gameObject;
 
-			AssetLoaderService.UnloadAsset(gameObject);
+			_assetLoader.UnloadAsset(gameObject);
 		}
 
 		/// <inheritdoc />
@@ -367,7 +372,7 @@ public Task<Task<UiPresenter>>[] LoadUiSetAsync(int setId)
 				uiTasks.Add(LoadUiAsync(set.UiConfigsType[i]));
 			}
 
-			return AssetLoaderService.Interleaved(uiTasks);
+			return AssetLoaderUtils.Interleaved(uiTasks);
 		}
 
 		/// <inheritdoc />

package.json

@@ -5,8 +5,7 @@
   "unity": "2019.3",
   "description": "This package provides a service to help manage an Unity's, game UI.\nIt allows to open, close, load, unload and request any Ui Configured in the game.\nThe package provides a Ui Set that allows to group a set of Ui Presenters to help load, open and close multiple Uis at the same time.\n\nTo help configure the game's UI you need to create a UiConfigs Scriptable object by:\n- Right Click on the Project View > Create > ScriptableObjects > Configs > UiConfigs",
   "dependencies": {
-    "com.unity.addressables": "1.6.0",
-    "com.gamelovers.assetloader": "0.1.1"
+    "com.gamelovers.assetloader": "0.3.0"
   },
   "type": "library",
   "hideInEditor": false