Minor refactor changes

BroWar-Collective · Feb 29, 2024 · 11aa622 · 11aa622
1 parent e3e8b18
commit 11aa622
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/Assets/Examples/Prefabs/UIContext.prefab b/Assets/Examples/Prefabs/UIContext.prefab
@@ -396,7 +396,7 @@ GameObject:
   - component: {fileID: 1114633846812842680}
   - component: {fileID: 1114633846812842679}
   m_Layer: 0
-  m_Name: HandlersContainer [UI]
+  m_Name: UIHandler
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

diff --git a/Assets/Examples/Scripts/ViewController.cs b/Assets/Examples/Scripts/ViewController.cs
@@ -14,7 +14,7 @@ public class ViewController : MonoBehaviour
         [SerializeField, TypeConstraint(typeof(UiView))]
         private SerializedType viewType;
 
-        private IUiViewsHandler viewsHandler;
+        private IViewsHandler viewsHandler;
 
         private void Start()
         {
@@ -25,7 +25,7 @@ private void Start()
         }
 
         [Inject]
-        internal void Inject(IUiViewsHandler viewsHandler)
+        internal void Inject(IViewsHandler viewsHandler)
         {
             this.viewsHandler = viewsHandler;
         }

diff --git a/Assets/Package/Runtime/Cursors/CursorHandler.cs b/Assets/Package/Runtime/Cursors/CursorHandler.cs
@@ -9,6 +9,6 @@ namespace BroWar.UI.Cursors
     /// </summary>
     [DisallowMultipleComponent]
     [AddComponentMenu("BroWar/UI/Cursors/Cursor Handler")]
-    public class CursorHandler : UiHandlerBehaviour, IUiCursorHandler
+    public class CursorHandler : UiHandlerBehaviour, ICursorHandler
     { }
 }
diff --git a/...ckage/Runtime/Cursors/IUiCursorHandler.cs → ...Package/Runtime/Cursors/ICursorHandler.cs b/...ckage/Runtime/Cursors/IUiCursorHandler.cs → ...Package/Runtime/Cursors/ICursorHandler.cs
@@ -1,5 +1,5 @@
 namespace BroWar.UI.Cursors
 {
-    public interface IUiCursorHandler
+    public interface ICursorHandler
     { }
 }
diff --git a/.../Runtime/Cursors/IUiCursorHandler.cs.meta → ...ge/Runtime/Cursors/ICursorHandler.cs.meta b/.../Runtime/Cursors/IUiCursorHandler.cs.meta → ...ge/Runtime/Cursors/ICursorHandler.cs.meta
diff --git a/.../Package/Runtime/Input/IUiInputHandler.cs → ...ts/Package/Runtime/Input/IInputHandler.cs b/.../Package/Runtime/Input/IUiInputHandler.cs → ...ts/Package/Runtime/Input/IInputHandler.cs
@@ -2,7 +2,7 @@
 
 namespace BroWar.UI.Input
 {
-    public interface IUiInputHandler
+    public interface IInputHandler
     {
         Vector2? PointerPosition { get; }
     }

diff --git a/...age/Runtime/Input/IUiInputHandler.cs.meta → ...ckage/Runtime/Input/IInputHandler.cs.meta b/...age/Runtime/Input/IUiInputHandler.cs.meta → ...ckage/Runtime/Input/IInputHandler.cs.meta
diff --git a/Assets/Package/Runtime/Input/InputHandler.cs b/Assets/Package/Runtime/Input/InputHandler.cs
@@ -10,7 +10,7 @@ namespace BroWar.UI.Input
     /// </summary>
     [DisallowMultipleComponent]
     [AddComponentMenu("BroWar/UI/Input/Input Handler")]
-    public class InputHandler : UiHandlerBehaviour, IUiInputHandler
+    public class InputHandler : UiHandlerBehaviour, IInputHandler
     {
         [SerializeField, NotNull]
         private InputSystemUIInputModule inputModule;

diff --git a/.../Package/Runtime/Popup/IUiPopupHandler.cs → ...ts/Package/Runtime/Popup/IPopupHandler.cs b/.../Package/Runtime/Popup/IUiPopupHandler.cs → ...ts/Package/Runtime/Popup/IPopupHandler.cs
@@ -1,5 +1,5 @@
 namespace BroWar.UI.Popup
 {
-    public interface IUiPopupHandler
+    public interface IPopupHandler
     { }
 }
diff --git a/...age/Runtime/Popup/IUiPopupHandler.cs.meta → ...ckage/Runtime/Popup/IPopupHandler.cs.meta b/...age/Runtime/Popup/IUiPopupHandler.cs.meta → ...ckage/Runtime/Popup/IPopupHandler.cs.meta
diff --git a/Assets/Package/Runtime/Popup/PopupHandler.cs b/Assets/Package/Runtime/Popup/PopupHandler.cs
@@ -9,6 +9,6 @@ namespace BroWar.UI.Popup
     /// </summary>
     [DisallowMultipleComponent]
     [AddComponentMenu("BroWar/UI/Popup/Popup Handler")]
-    public class PopupHandler : UiHandlerBehaviour, IUiPopupHandler
+    public class PopupHandler : UiHandlerBehaviour, IPopupHandler
     { }
 }
diff --git a/Assets/Package/Runtime/Tooltip/TooltipHandler.cs b/Assets/Package/Runtime/Tooltip/TooltipHandler.cs
@@ -20,10 +20,10 @@ public class TooltipHandler : UiHandlerBehaviour, ITooltipHandler
         [Tooltip("Currently active tooltip instance.")]
         private TooltipBehaviour activeTooltip;
 
-        private IUiInputHandler inputHandler;
+        private IInputHandler inputHandler;
 
         [Inject]
-        internal void Inject(IUiInputHandler inputHandler)
+        internal void Inject(IInputHandler inputHandler)
         {
             this.inputHandler = inputHandler;
         }

diff --git a/.../Package/Runtime/Views/IUiViewsHandler.cs → ...ts/Package/Runtime/Views/IViewsHandler.cs b/.../Package/Runtime/Views/IUiViewsHandler.cs → ...ts/Package/Runtime/Views/IViewsHandler.cs
@@ -5,7 +5,7 @@ namespace BroWar.UI.Views
 {
     using BroWar.Common;
 
-    public interface IUiViewsHandler : IInitializableWithArgument<ViewsSettings>
+    public interface IViewsHandler : IInitializableWithArgument<ViewsSettings>
     {
         event Action<UiView> OnShowView;
         event Action<UiView> OnHideView;

diff --git a/...age/Runtime/Views/IUiViewsHandler.cs.meta → ...ckage/Runtime/Views/IViewsHandler.cs.meta b/...age/Runtime/Views/IUiViewsHandler.cs.meta → ...ckage/Runtime/Views/IViewsHandler.cs.meta
diff --git a/Assets/Package/Runtime/Views/ViewsHandler.cs b/Assets/Package/Runtime/Views/ViewsHandler.cs
@@ -6,10 +6,10 @@ namespace BroWar.UI.Views
 {
     using BroWar.Common;
 
-    /// <inheritdoc cref="IUiViewsHandler"/>
+    /// <inheritdoc cref="IViewsHandler"/>
     [DisallowMultipleComponent]
     [AddComponentMenu("BroWar/UI/Views/Views Handler")]
-    public class ViewsHandler : UiHandlerBehaviour, IUiViewsHandler
+    public class ViewsHandler : UiHandlerBehaviour, IViewsHandler
     {
         protected readonly IDictionary<Type, UiView> viewsByTypes = new Dictionary<Type, UiView>();
         protected readonly List<UiView> activeViews = new List<UiView>();
@@ -338,7 +338,7 @@ public List<UiView> GetAllViews()
         /// <inheritdoc cref="IInitializable"/>
         public bool IsInitialized { get; private set; }
 
-        /// <inheritdoc cref="IUiViewsHandler"/>
+        /// <inheritdoc cref="IViewsHandler"/>
         public IReadOnlyList<UiView> ActiveViews => activeViews;
     }
 }