Merge pull request #7 from CoderGamester/develop

0.3.1

Author: CoderGamester

CHANGELOG.md

@@ -4,13 +4,15 @@ 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.3.1] - 2020-02-15
+
+- Updated dependency packages
+
 ## [0.3.0] - 2020-02-11
 
 - Added new *UiPresenterData* class for the case where the *UiPresenter* needs to be initialized with a default data value
 - Added new *OnInitialize* method that is invoked after the *UiPresenter* is initialized
 
-## [0.2.0] - 2020-01-19
-
 ## [0.2.1] - 2020-02-09
 
 - Added the possibility to open the ui after adding or loading it to the *UiService*
@@ -22,25 +24,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [0.2.0] - 2020-01-19
 
-- Added easy selection of the UiConfigs.asset file. Just go to Tools > Select UiConfigs.asset. If the UiConfigs.asset does not exist, it will create a new one in the Assets folder
-- Added the protected Close() method to directly allow to close the UiPresenter from the UiPresenter object file without needing to call the UiService. Also now is possible to close an Ui in the service by referencing the object directly without needing to reference the object type by calling CloseUi<T>(T presenter)
-- Now the UnloadUi & UnloadUiSet properly unloads the ui from memory and removes it from the service
-- Added RemoveUi & RemoveUiPresentersFromSet to allow the ui to be removed from the service without being unloaded from memory
+- Added easy selection of the *UiConfigs.asset* file. Just go to *Tools > Select UiConfigs.asset*. If the *UiConfigs.asset* does not exist, it will create a new one in the Assets folder
+- Added the protected *Close()* method to directly allow to close the *UiPresenter* from the *UiPresenter* object file without needing to call the *UiService*. Also now is possible to close an Ui in the service by referencing the object directly without needing to reference the object type by calling *CloseUi<T>(T presenter)*
+- Now the *UnloadUi* & *UnloadUiSet* properly unloads the ui from memory and removes it from the service
+- Added *RemoveUi* & *RemoveUiPresentersFromSet* to allow the ui to be removed from the service without being unloaded from memory
 - Improved documentation
 
 **Changed**
-- Now the Refresh method on the UiPresenter is public and can be called from any object that has asset to it. The UiService will not call this method anymore if trying to Open the same UiPresenter twice without closing
-- In the UiService, IsUiLoaded changed to HasUiPresenter
-- In the UiService IsAllUiLoadedInSet changed to HasAllUiPresentersInSet
-- Unified AddUi methods
+- Now the Refresh method on the *UiPresenter* is public and can be called from any object that has asset to it. The *UiService* will not call this method anymore if trying to open the same *UiPresenter* twice without closing
+- *UiService.IsUiLoaded* changed to *HasUiPresenter*
+- *UiService.IsAllUiLoadedInSet* changed to *HasAllUiPresentersInSet*
+- Unified *AddUi* methods
 
 **Fixed**:
-- Fixed bug that sometimes don't save the UiConfigs state correctly
+- Fixed bug that sometimes don't save the *UiConfigs* state correctly
 
 ## [0.1.3] - 2020-01-09
 
 **Fixed**:
-- Bug that sometimes was not save+ing the UiConfigs state correctly
+- Bug that sometimes was not save+ing the *UiConfigs* state correctly
 
 ## [0.1.2] - 2020-01-09
 
@@ -50,7 +52,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.1.1] - 2020-01-09
 
 **Fixed**:
-- The state of a the UiPresenter when loaded. Now the UiPresenters are always disabled when loaded
+- The state of a the *UiPresenter* when loaded. Now the *UiPresenters* are always disabled when loaded
 
 ## [0.1.0] - 2020-01-05
 

Runtime/GameLovers.UiService.asmdef

@@ -3,7 +3,7 @@
     "references": [
         "GUID:84651a3751eca9349aac36a66bba901b",
         "GUID:9e24947de15b9834991c9d8411ea37cf",
-        "GUID:11ee0f4d04f11419d8a55b1b6d7c2c1d"
+        "GUID:ebfc05ee5a737f94d8b07099524dab77"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Runtime/UiService.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using GameLovers.LoaderExtension;
+using GameLovers.AssetLoader;
 using UnityEngine;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.AsyncOperations;
 using Object = UnityEngine.Object;
 
 // ReSharper disable CheckNamespace
@@ -423,23 +421,15 @@ public async Task<T> LoadUiAsync<T>(bool openAfter = false) where T : UiPresente
 		/// <inheritdoc />
 		public async Task<UiPresenter> LoadUiAsync(Type type, bool openAfter = false)
 		{
-			if (!_uiConfigs.TryGetValue(type, out UiConfig config))
+			if (!_uiConfigs.TryGetValue(type, out var config))
 			{
 				throw new KeyNotFoundException($"The UiConfig of type {type} was not added to the service. Call {nameof(AddUiConfig)} first");
 			}
 
-			var operation = Addressables.InstantiateAsync(config.AddressableAddress);
-
-			await operation.Task;
-
-			if (operation.Status != AsyncOperationStatus.Succeeded)
-			{
-				throw operation.OperationException;
-			}
-			
-			var uiPresenter = operation.Result.GetComponent<UiPresenter>();
+			var gameObject = await AssetLoaderService.InstantiatePrefabAsync(config.AddressableAddress);
+			var uiPresenter = gameObject.GetComponent<UiPresenter>();
 
-			uiPresenter.gameObject.SetActive(false);
+			gameObject.SetActive(false);
 
 			AddUi(uiPresenter, config.Layer, openAfter);
 
@@ -457,8 +447,7 @@ public void UnloadUi(Type type)
 		{
 			var gameObject = RemoveUi(type).gameObject;
 
-			Addressables.ReleaseInstance(gameObject);
-			Object.Destroy(gameObject);
+			AssetLoaderService.UnloadAsset(gameObject);
 		}
 
 		/// <inheritdoc />
@@ -664,7 +653,7 @@ public Task<Task<UiPresenter>>[] LoadUiSetAsync(int setId)
 				uiTasks.Add(LoadUiAsync(set.UiConfigsType[i]));
 			}
 
-			return LoaderUtil.Interleaved(uiTasks);
+			return AssetLoaderService.Interleaved(uiTasks);
 		}
 
 		/// <inheritdoc />

package.json

@@ -1,11 +1,12 @@
 {
   "name": "com.gamelovers.uiservice",
   "displayName": "UiService",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "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.5.1"
+    "com.unity.addressables": "1.6.0",
+    "com.gamelovers.assetloader": "0.1.1"
   },
   "type": "library",
   "hideInEditor": false