Рефакторинг оверлеев

Author: DizzyJump

DoorsAndButtons/Assembly-CSharp.csproj

@@ -60,7 +60,6 @@
      <Compile Include="Assets\CodeBase\GameLogic\Systems\ViewFeature\UpdateViewPositionSystem.cs" />
      <Compile Include="Assets\CodeBase\GameLogic\LeoEcs\filters.cs" />
      <Compile Include="Assets\CodeBase\Infrastructure\GameBootstrapper.cs" />
-     <Compile Include="Assets\CodeBase\UnityRelatedScripts\UI\Overlays\IOverlay.cs" />
      <Compile Include="Assets\CodeBase\Infrastructure\ILoadingCurtain.cs" />
      <Compile Include="Assets\CodeBase\UnityRelatedScripts\UI\Factories\UIFactoriesInstaller.cs" />
      <Compile Include="Assets\Cinemachine\Base\Runtime\Behaviours\CinemachineVirtualCamera.cs" />
@@ -200,6 +199,7 @@
      <Compile Include="Assets\Cinemachine\Base\Runtime\Behaviours\CinemachineFollowZoom.cs" />
      <Compile Include="Assets\CodeBase\GameLogic\Components\Actors\Actor.cs" />
      <Compile Include="Assets\Cinemachine\Base\Runtime\Core\CinemachineCore.cs" />
+     <Compile Include="Assets\CodeBase\UnityRelatedScripts\UI\Overlays\Overlay.cs" />
      <None Include="Assets\TextMesh Pro\Shaders\TMPro.cginc" />
      <None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile Overlay.shader" />
      <None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap.shader" />

DoorsAndButtons/Assets/CodeBase/UnityRelatedScripts/UI/Common.meta

@@ -2,6 +2,6 @@ namespace CodeBase.UnityRelatedScripts.UI
 {
     public interface IUIFactory
     {
-        IOverlay CreateFinishLevelOverlay(string msg);
+        Overlay CreateFinishLevelOverlay(string msg);
     }
 }

DoorsAndButtons/Assets/CodeBase/UnityRelatedScripts/UI/Factories/IUIFactory.cs

@@ -10,7 +10,7 @@ public class UIFactory : IUIFactory
         public UIFactory(FinishLevelOverlay.Factory finishLevelOverlayFactory) => 
             this.finishLevelOverlayFactory = finishLevelOverlayFactory;
 
-        public IOverlay CreateFinishLevelOverlay(string msg) => 
+        public Overlay CreateFinishLevelOverlay(string msg) => 
             finishLevelOverlayFactory.Create(msg);
     }
 }

DoorsAndButtons/Assets/CodeBase/UnityRelatedScripts/UI/Factories/UIFactory.cs

@@ -7,7 +7,7 @@
 
 namespace CodeBase.UnityRelatedScripts.UI.Overlays.FinishLevelOverlay
 {
-    public class FinishLevelOverlay : MonoBehaviour, IOverlay
+    public class FinishLevelOverlay : Overlay
     {
         [SerializeField] private Button closeButton;
         [SerializeField] private TextMeshProUGUI messageLabel;
@@ -19,18 +19,13 @@ void Contruct(string msg)
         {
             message = msg;
         }
-        
-        public async Task Show()
+
+        public override async Task Show()
         {
             messageLabel.text = message;
             await closeButton;
         }
 
-        public void Destroy()
-        {
-            Destroy(gameObject);
-        }
-
         public class Factory : PlaceholderFactory<string, FinishLevelOverlay>
         {
         }

DoorsAndButtons/Assets/CodeBase/UnityRelatedScripts/UI/Overlays/FinishLevelOverlay/FinishLevelOverlay.cs

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace CodeBase.UnityRelatedScripts.UI
+{
+    // there are we use abstract class due to expect that in future appear and disappear animations could be implemented here
+    public abstract class Overlay : MonoBehaviour
+    {
+        public abstract Task Show();
+    }
+}

DoorsAndButtons/Assets/CodeBase/UnityRelatedScripts/UI/Overlays/IOverlay.cs

@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using UnityEngine;
 
 namespace CodeBase.UnityRelatedScripts.UI.Overlays.OverlaysService
 {
@@ -12,14 +13,14 @@ public OverlayService(IUIFactory uiFactory) =>
 
         public async Task ShowFinishLevelOverlay(string message)
         {
-            IOverlay overlay = uiFactory.CreateFinishLevelOverlay(message);
+            Overlay overlay = uiFactory.CreateFinishLevelOverlay(message);
             await ProcessOverlay(overlay);
         }
 
-        private async Task ProcessOverlay(IOverlay overlay)
+        private async Task ProcessOverlay(Overlay overlay)
         {
             await overlay.Show();
-            overlay.Destroy();
+            GameObject.Destroy(overlay.gameObject);
         }
     }
 }

DoorsAndButtons/Assets/CodeBase/UnityRelatedScripts/UI/Overlays/IOverlay.cs.meta

@@ -253,7 +253,7 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 3347113851224229792, guid: fcf4e9c221c135641bd2506488e95a8d, type: 3}
   m_PrefabInstance: {fileID: 4455067101687999048}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &4974843124421908813
+--- !u!114 &6190775579959678674
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}

DoorsAndButtons/Assets/CodeBase/UnityRelatedScripts/UI/Overlays/Overlay.cs

@@ -21,10 +21,10 @@ EditorUserSettings:
       value: 5752015f55540a0d09080f204573594414154b7b7a2a7f652e711b63b2b8363a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 53500054515151025e0d097149210d444e4e1b287d78746875711c66b0e16c60
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      value: 53500054515151025e0d097149210d444e4e1b287d78746875711c66b0e16c60
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650