Merge pull request #14 from CoderGamester/develop

Release 0.7.1

Author: CoderGamester

CHANGELOG.md

@@ -4,6 +4,14 @@ 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.7.1] - 2021-05-03
+
+- Added the possibility for *SafeAreaHelpersView* to maintain the View in the same position if not placed outside of the safe area
+
+**Fixed**:
+- Fixed the duplicated memory issue when loading the same *UiPresenter* multiple times at the same time before when of them is finished
+
+
 ## [0.7.0] - 2021-03-12
 
 - Added *NonDrawingView* to have an Image without a renderer to not add additional draw calls.

Runtime/SafeAreaHelperView.cs

@@ -12,10 +12,12 @@ namespace FirstLight.UiService
 	[RequireComponent(typeof(RectTransform))]
 	public class SafeAreaHelperView : MonoBehaviour
 	{
-		private const float _floatTolerance = 0.01f;
-		
+		[Tooltip("If true then will only shift the anchor when the pivot is out of the safe area. If inside the safe area" +
+		         "will remain in the same anchor position")]
+		[SerializeField] private bool _checkAreaBounds = false;
 		[SerializeField] private RectTransform _rectTransform;
-		[SerializeField] private bool _ignoreWidth = true;
+		[SerializeField] private bool _ignoreHeight = false;
+		[SerializeField] private bool _ignoreWidth = false;
 		[SerializeField] private bool _onUpdate = false;
 		[SerializeField] private Vector2 _refResolution;
 
@@ -69,10 +71,10 @@ internal void UpdatePositions()
 			}
 
 			// Check if anchored to top or bottom
-			if (Math.Abs(anchorMax.y - anchorMin.y) < _floatTolerance)
+			if (!_ignoreHeight && Mathf.Approximately(anchorMax.y,anchorMin.y) && !CheckHeightAreaBounds(anchoredPosition))
 			{
 				// bottom
-				if (anchorMax.y < _floatTolerance)
+				if (anchorMax.y < Mathf.Epsilon)
 				{
 					anchoredPosition.y += (_safeArea.yMin - _resolution.yMin) * _refResolution.y / _resolution.height; 
 				}
@@ -83,10 +85,10 @@ internal void UpdatePositions()
 			}
 
 			// Check if anchored to left or right
-			if (!_ignoreWidth && Math.Abs(anchorMax.x - anchorMin.x) < _floatTolerance)
+			if (!_ignoreWidth && Mathf.Approximately(anchorMax.x,anchorMin.x) && !CheckWidthAreaBounds(anchoredPosition))
 			{
 				// left
-				if (anchorMax.x < _floatTolerance)
+				if (anchorMax.x < Mathf.Epsilon)
 				{
 					anchoredPosition.x += (_safeArea.xMin - _resolution.xMin) * _refResolution.x / _resolution.width;
 				}
@@ -98,6 +100,16 @@ internal void UpdatePositions()
 
 			_rectTransform.anchoredPosition = anchoredPosition;
 		}
+	
+		private bool CheckWidthAreaBounds(Vector2 anchoredPosition)
+		{
+			return _checkAreaBounds && anchoredPosition.x > _safeArea.xMin && anchoredPosition.x < _safeArea.xMax;
+		}
+	
+		private bool CheckHeightAreaBounds(Vector2 anchoredPosition)
+		{
+			return _checkAreaBounds && anchoredPosition.y > _safeArea.yMin && anchoredPosition.y < _safeArea.yMax;
+		}
 	}
 
 	#if UNITY_EDITOR

Runtime/UiService.cs

@@ -41,10 +41,7 @@ public void Init(UiConfigs configs)
 			}
 		}
 
-		/// <summary>
-		/// Adds the given <paramref name="layer"/> to be controlled by the <see cref="UiService"/>.
-		/// Layers allow to group <see cref="UiPresenter"/> into the same canvas rendering order.
-		/// </summary>
+		/// <inheritdoc />
 		public GameObject AddLayer(int layer)
 		{
 			for(int i = _layers.Count; i <= layer; i++)
@@ -145,8 +142,28 @@ 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");
 			}
 
+			if (HasUiPresenter(type))
+			{
+				var ui = GetUi(type);
+				
+				ui.gameObject.SetActive(openAfter);
+
+				return ui;
+			}
+
 			var layer = AddLayer(config.Layer);
 			var gameObject = await _assetLoader.InstantiatePrefabAsync(config.AddressableAddress, layer.transform, false);
+			
+			if (HasUiPresenter(type))
+			{
+				var ui = GetUi(type);
+				
+				_assetLoader.UnloadAsset(gameObject);
+				ui.gameObject.SetActive(openAfter);
+
+				return ui;
+			}
+			
 			var uiPresenter = gameObject.GetComponent<UiPresenter>();
 
 			gameObject.SetActive(false);

package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.gamelovers.uiservice",
   "displayName": "UiService",
-  "version": "0.7.0",
-  "unity": "2020.1",
+  "version": "0.7.1",
+  "unity": "2020.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.16.16"
+    "com.unity.addressables": "1.17.17"
   },
   "type": "library",
   "hideInEditor": false