[v0.1.9] Destroy's replaced with TearDown

Author: g0dzZz-coder

Runtime/LoadingCurtainCloseButton.cs

@@ -17,30 +17,13 @@ internal sealed class LoadingContinueButton : LoadingCurtainView
 		private Expectant _buttonClicked;
 		private LoadingCurtainViewModel _viewModel;
 
-		private void OnDestroy()
-		{
-			_buttonClicked?.Dispose();
-
-			if (_button != null)
-			{
-				_button.clicked -= OnClicked;
-			}
-
-			if (_viewModel != null)
-			{
-				_viewModel.Progress.Changed -= OnProgressChanged;
-			}
-		}
-
 		public override void Initialize(LoadingCurtainViewModel viewModel, IGroupExpectant expectant)
 		{
 			_viewModel = viewModel;
 			_viewModel.Progress.Changed += OnProgressChanged;
-			expectant.With(_buttonClicked = new Expectant());
 
-			var document = GetComponent<UIDocument>();
-			var rootElement = document.rootVisualElement;
-			_button = rootElement.Q<Button>(_bindingPath);
+			expectant.With(_buttonClicked = new Expectant());
+			_button = GetComponent<UIDocument>().rootVisualElement.Q<Button>(_bindingPath);
 			if (_button == null)
 			{
 				return;
@@ -50,15 +33,32 @@ public override void Initialize(LoadingCurtainViewModel viewModel, IGroupExpecta
 			_button.clicked += OnClicked;
 		}
 
+		public override void TearDown()
+		{
+			_buttonClicked?.Dispose();
+
+			if (_button != null)
+			{
+				_button.clicked -= OnClicked;
+			}
+
+			if (_viewModel != null)
+			{
+				_viewModel.Progress.Changed -= OnProgressChanged;
+			}
+		}
+
 		private void OnClicked()
 		{
+			_button.clicked -= OnClicked;
 			_button.SetEnabled(false);
 			_buttonClicked.SetReady();
 		}
 
 		private void OnProgressChanged(float progress)
 		{
-			if (Mathf.Approximately(progress, 1))
+			var completed = Mathf.Approximately(progress, 1) || progress >= 1;
+			if (_button.enabledSelf == false && completed)
 			{
 				_button.SetEnabled(true);
 			}

Runtime/LoadingCurtainDescription.cs

@@ -17,21 +17,21 @@ public sealed class LoadingCurtainDescription : LoadingCurtainView
 		private UIDocument _document;
 		private LoadingCurtainViewModel _viewModel;
 
-		private void OnDestroy()
-		{
-			if (_viewModel != null)
-			{
-				_viewModel.Description.Changed -= OnDescriptionChanged;
-			}
-		}
-
 		public override void Initialize(LoadingCurtainViewModel viewModel, IGroupExpectant expectant)
 		{
 			_viewModel = viewModel;
 			_viewModel.Description.Changed += OnDescriptionChanged;
 			_label = GetComponent<UIDocument>().rootVisualElement.Q<Label>(_bindingPath);
 		}
 
+		public override void TearDown()
+		{
+			if (_viewModel != null)
+			{
+				_viewModel.Description.Changed -= OnDescriptionChanged;
+			}
+		}
+
 		private void OnDescriptionChanged(OperationDescription description) => _label.text = description.Text;
 	}
 }

Runtime/LoadingCurtainProgressBar.cs

@@ -7,7 +7,6 @@
 
 namespace Depra.Loading
 {
-	[DisallowMultipleComponent]
 	[RequireComponent(typeof(UIDocument))]
 	public sealed class LoadingCurtainProgressBar : LoadingCurtainView
 	{
@@ -33,15 +32,6 @@ private void Update()
 			_bar.value = delta > _maxDelta ? _bar.value + delta : _target;
 		}
 
-		private void OnDestroy()
-		{
-			_filled?.Dispose();
-			if (_viewModel != null)
-			{
-				_viewModel.Progress.Changed -= OnProgressChanged;
-			}
-		}
-
 		public override void Initialize(LoadingCurtainViewModel viewModel, IGroupExpectant expectant)
 		{
 			_viewModel = viewModel;
@@ -52,6 +42,15 @@ public override void Initialize(LoadingCurtainViewModel viewModel, IGroupExpecta
 			enabled = true;
 		}
 
+		public override void TearDown()
+		{
+			_filled?.Dispose();
+			if (_viewModel != null)
+			{
+				_viewModel.Progress.Changed -= OnProgressChanged;
+			}
+		}
+
 		private void OnProgressChanged(float value) => _target = value;
 	}
 }

Runtime/LoadingCurtainProgressLabel.cs

@@ -16,21 +16,21 @@ public sealed class LoadingCurtainProgressLabel : LoadingCurtainView
 		private Label _label;
 		private LoadingCurtainViewModel _viewModel;
 
-		private void OnDestroy()
-		{
-			if (_viewModel != null)
-			{
-				_viewModel.Progress.Changed -= OnProgressChanged;
-			}
-		}
-
 		public override void Initialize(LoadingCurtainViewModel viewModel, IGroupExpectant expectant)
 		{
 			_viewModel = viewModel;
 			_viewModel.Progress.Changed += OnProgressChanged;
 			_label = GetComponent<UIDocument>().rootVisualElement.Q<Label>(_bindingPath);
 		}
 
+		public override void TearDown()
+		{
+			if (_viewModel != null)
+			{
+				_viewModel.Progress.Changed -= OnProgressChanged;
+			}
+		}
+
 		private void OnProgressChanged(float value) =>
 			_label.text = string.Format(_format, Mathf.RoundToInt(value * 100));
 	}

Runtime/LoadingCurtainView.cs

@@ -8,6 +8,10 @@ namespace Depra.Loading
 {
 	public abstract class LoadingCurtainView : MonoBehaviour
 	{
+		protected private void OnDestroy() { }
+
 		public abstract void Initialize(LoadingCurtainViewModel viewModel, IGroupExpectant expectant);
+
+		public virtual void TearDown() { }
 	}
 }

Runtime/LoadingCurtainViewRoot.cs

@@ -18,6 +18,14 @@ public void Initialize(LoadingCurtainViewModel viewModel, IGroupExpectant expect
 				view.Initialize(viewModel, expectant);
 			}
 		}
+
+		public void TearDown()
+		{
+			foreach (var view in _views)
+			{
+				view.TearDown();
+			}
+		}
 #if UNITY_EDITOR
 		[ContextMenu(nameof(Refill))]
 		private void Refill()

Runtime/OverlayLoadingCurtain.cs

@@ -27,12 +27,12 @@ public sealed class OverlayLoadingCurtain : ILoadingCurtain
 
 		public OverlayLoadingCurtain(IAssetFile<LoadingCurtainViewRoot> assetFile) => _assetFile = assetFile;
 
-		public async Task Load(Queue<ILoadingOperation> operations, CancellationToken cancellationToken)
+		public async Task Load(Queue<ILoadingOperation> operations, CancellationToken token)
 		{
 			_operationIndex = 0;
 			_operationsCount = operations.Count;
 
-			_original = await FetchViewOriginal(cancellationToken);
+			_original ??= await _assetFile.LoadAsync(cancellationToken: token);
 			_viewModel = new LoadingCurtainViewModel();
 			_view = Object.Instantiate(_original);
 
@@ -46,23 +46,24 @@ public async Task Load(Queue<ILoadingOperation> operations, CancellationToken ca
 			foreach (var operation in operations)
 			{
 				_viewModel.Description.Value = operation.Description;
-				await operation.Load(new Progress<float>(OnProgress), cancellationToken);
+				await operation.Load(new Progress<float>(OnProgress), token);
 				_operationIndex++;
 			}
 
 			operationsReady.SetReady();
-			await WaitForViewClosed(cancellationToken);
+			await WaitForViewClosed(token);
 		}
 
-		public Task Unload(CancellationToken cancellationToken)
+		public Task Unload(CancellationToken token)
 		{
 			_operationIndex = 0;
 			_operationsCount = 0;
 			_viewModel?.Dispose();
 			_viewReady?.Dispose();
 
-			if (_view != null)
+			if (_view)
 			{
+				_view.TearDown();
 				Object.Destroy(_view.gameObject);
 			}
 
@@ -78,22 +79,17 @@ public Task Unload(CancellationToken cancellationToken)
 			return Task.CompletedTask;
 		}
 
-		private void OnProgress(float progress) => _viewModel.Progress.Value = NormalizeProgress(progress);
-
-		private float NormalizeProgress(float progress)
+		private void OnProgress(float progress)
 		{
-			var normalizedProgress = (_operationIndex + progress) / _operationsCount;
-			if (Mathf.Abs(normalizedProgress - 1) < 0.01f)
+			var normalized = (_operationIndex + progress) / _operationsCount;
+			if (Mathf.Abs(normalized - 1) < 0.01f)
 			{
-				normalizedProgress = 1;
+				normalized = 1;
 			}
 
-			return normalizedProgress;
+			_viewModel.Progress.Value = normalized;
 		}
 
-		private async Task<LoadingCurtainViewRoot> FetchViewOriginal(CancellationToken token) =>
-			_original == null ? await _assetFile.LoadAsync(cancellationToken: token) : _original;
-
 		private async Task WaitForViewClosed(CancellationToken token)
 		{
 			while (_viewReady.IsReady() == false)

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "com.depra.loading.unity",
-	"version": "0.1.8",
+	"version": "0.1.9",
 	"displayName": "Depra.Loading",
 	"description": "",
 	"unity": "2022.3",