Allow to set AssetLoader for each Container.

Haruma-K · Jun 14, 2022 · f7e5dcf · f7e5dcf
1 parent 1b22017
commit f7e5dcf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/Assets/UnityScreenNavigator/Runtime/Core/Modal/ModalContainer.cs b/Assets/UnityScreenNavigator/Runtime/Core/Modal/ModalContainer.cs
@@ -39,7 +39,17 @@ private readonly Dictionary<int, AssetLoadHandle<GameObject>> _assetLoadHandles
         private ModalBackdrop _backdropPrefab;
         private CanvasGroup _canvasGroup;
 
-        private IAssetLoader AssetLoader => UnityScreenNavigatorSettings.Instance.AssetLoader;
+        private IAssetLoader _assetLoader;
+
+        /// <summary>
+        ///     By default, <see cref="IAssetLoader" /> in <see cref="UnityScreenNavigatorSettings" /> is used.
+        ///     If this property is set, it is used instead.
+        /// </summary>
+        public IAssetLoader AssetLoader
+        {
+            get => _assetLoader ?? UnityScreenNavigatorSettings.Instance.AssetLoader;
+            set => _assetLoader = value;
+        }
 
         /// <summary>
         ///     True if in transition.
@@ -455,4 +465,4 @@ public void ReleasePreloaded(string resourceKey)
             AssetLoader.Release(handle);
         }
     }
-}
+}
diff --git a/Assets/UnityScreenNavigator/Runtime/Core/Page/PageContainer.cs b/Assets/UnityScreenNavigator/Runtime/Core/Page/PageContainer.cs
@@ -36,7 +36,17 @@ private readonly Dictionary<int, AssetLoadHandle<GameObject>> _assetLoadHandles
 
         private bool _isActivePageStacked;
 
-        private IAssetLoader AssetLoader => UnityScreenNavigatorSettings.Instance.AssetLoader;
+        private IAssetLoader _assetLoader;
+
+        /// <summary>
+        ///     By default, <see cref="IAssetLoader" /> in <see cref="UnityScreenNavigatorSettings" /> is used.
+        ///     If this property is set, it is used instead.
+        /// </summary>
+        public IAssetLoader AssetLoader
+        {
+            get => _assetLoader ?? UnityScreenNavigatorSettings.Instance.AssetLoader;
+            set => _assetLoader = value;
+        }
 
         /// <summary>
         ///     True if in transition.
@@ -465,4 +475,4 @@ public void ReleasePreloaded(string resourceKey)
             AssetLoader.Release(handle);
         }
     }
-}
+}
diff --git a/Assets/UnityScreenNavigator/Runtime/Core/Sheet/SheetContainer.cs b/Assets/UnityScreenNavigator/Runtime/Core/Sheet/SheetContainer.cs
@@ -33,7 +33,17 @@ private readonly Dictionary<int, AssetLoadHandle<GameObject>> _assetLoadHandles
         private int? _activeSheetId;
         private CanvasGroup _canvasGroup;
 
-        private IAssetLoader AssetLoader => UnityScreenNavigatorSettings.Instance.AssetLoader;
+        private IAssetLoader _assetLoader;
+
+        /// <summary>
+        ///     By default, <see cref="IAssetLoader" /> in <see cref="UnityScreenNavigatorSettings" /> is used.
+        ///     If this property is set, it is used instead.
+        /// </summary>
+        public IAssetLoader AssetLoader
+        {
+            get => _assetLoader ?? UnityScreenNavigatorSettings.Instance.AssetLoader;
+            set => _assetLoader = value;
+        }
 
         public int? ActiveSheetId => _activeSheetId;
 
@@ -394,4 +404,4 @@ private IEnumerator HideRoutine(bool playAnimation)
             }
         }
     }
-}
+}