ref: namespaces

SinlessDevil · SinlessDevil · commit e0fa4676d9c1 · 2025-07-28T15:48:20.000+03:00
diff --git a/.idea/.idea.Inventory_System/.idea/workspace.xml b/.idea/.idea.Inventory_System/.idea/workspace.xml
diff --git a/Assets/Code/Infrastructure/BootstrapInstaller.cs b/Assets/Code/Infrastructure/BootstrapInstaller.cs
@@ -10,7 +10,6 @@
 using Code.UI.InventoryViewModel.Factory;
 using Code.UI.InventoryViewModel.Services.InventoryViewInitializer;
 using Services.Factories.Inventory;
-using Services.PersistenceProgress;
 using UnityEngine.SceneManagement;
 using Zenject;
 
diff --git a/Assets/Code/Infrastructure/GameInstaller.cs b/Assets/Code/Infrastructure/GameInstaller.cs
@@ -2,7 +2,7 @@
 using Code.Infrastructure.Services.GameStater;
 using Zenject;
 
-namespace CodeBase.Infrastructure
+namespace Code.Infrastructure
 {
     public class GameInstaller : MonoInstaller, IInitializable, IDisposable
     {
diff --git a/Assets/Code/Infrastructure/Services/GameStater/GameStarter.cs b/Assets/Code/Infrastructure/Services/GameStater/GameStarter.cs
@@ -103,7 +103,7 @@ private PlayerData SetUpBaseProgress()
         {
             Debug.Log("InitializeProgress");
 
-            var progress = new PlayerData(
+            PlayerData progress = new PlayerData(
                 columns: InventorySize.Columns,
                 rows: InventorySize.Rows);
             
diff --git a/Assets/Code/Infrastructure/Services/PersistenceProgress/IPersistenceProgressService.cs b/Assets/Code/Infrastructure/Services/PersistenceProgress/IPersistenceProgressService.cs
@@ -1,5 +1,4 @@
 using Code.Infrastructure.Services.PersistenceProgress.Player;
-using Services.PersistenceProgress.Player;
 
 namespace Code.Infrastructure.Services.PersistenceProgress
 {
diff --git a/Assets/Code/Infrastructure/Services/PersistenceProgress/PersistenceProgressService.cs b/Assets/Code/Infrastructure/Services/PersistenceProgress/PersistenceProgressService.cs
@@ -1,8 +1,6 @@
-﻿using Code.Infrastructure.Services.PersistenceProgress;
-using Code.Infrastructure.Services.PersistenceProgress.Player;
-using Services.PersistenceProgress.Player;
+﻿using Code.Infrastructure.Services.PersistenceProgress.Player;
 
-namespace Services.PersistenceProgress
+namespace Code.Infrastructure.Services.PersistenceProgress
 {
     public class PersistenceProgressService : IPersistenceProgressService
     {
diff --git a/Assets/Code/Infrastructure/Services/PersistenceProgress/Player/InventoryData.cs b/Assets/Code/Infrastructure/Services/PersistenceProgress/Player/InventoryData.cs
@@ -1,9 +1,7 @@
 ﻿using System;
-using Code.Infrastructure.Services.PersistenceProgress.Player;
-using Code.Inventory;
 using Code.InventoryModel;
 
-namespace Services.PersistenceProgress.Player
+namespace Code.Infrastructure.Services.PersistenceProgress.Player
 {
     [Serializable]
     public class InventoryData
diff --git a/Assets/Code/Infrastructure/Services/PersistenceProgress/Player/InventoryOpeningData.cs b/Assets/Code/Infrastructure/Services/PersistenceProgress/Player/InventoryOpeningData.cs
@@ -10,7 +10,6 @@ public class InventoryOpeningData
 
         public void SetBought(int index)
         {
-          //  Debug.Log($"Bougth index {index}");
             BoughtIndexes.Add(index);
         }
 
diff --git a/Assets/Code/Infrastructure/Services/PersistenceProgress/Player/PlayerData.cs b/Assets/Code/Infrastructure/Services/PersistenceProgress/Player/PlayerData.cs
@@ -1,7 +1,6 @@
 using System;
 using Code.InventoryModel;
 using JetBrains.Annotations;
-using Services.PersistenceProgress.Player;
 using UnityEngine;
 
 namespace Code.Infrastructure.Services.PersistenceProgress.Player
diff --git a/Assets/Code/Infrastructure/Services/StaticData/IStaticDataService.cs b/Assets/Code/Infrastructure/Services/StaticData/IStaticDataService.cs
@@ -1,4 +1,4 @@
-using StaticData;
+using Code.Infrastructure.StaticData;
 
 namespace Code.Infrastructure.Services.StaticData
 {
diff --git a/Assets/Code/Infrastructure/Services/StaticData/StaticDataService.cs b/Assets/Code/Infrastructure/Services/StaticData/StaticDataService.cs
@@ -1,4 +1,4 @@
-using StaticData;
+using Code.Infrastructure.StaticData;
 using UnityEngine;
 
 namespace Code.Infrastructure.Services.StaticData
diff --git a/Assets/Code/Infrastructure/StaticData/BalanceStaticData.cs b/Assets/Code/Infrastructure/StaticData/BalanceStaticData.cs
@@ -1,7 +1,7 @@
 using Code.InventoryModel.Data;
 using UnityEngine;
 
-namespace StaticData
+namespace Code.Infrastructure.StaticData
 {
     [CreateAssetMenu(menuName = "StaticData/Balance", fileName = "Balance", order = 0)]
     public class BalanceStaticData : ScriptableObject
diff --git a/Assets/Code/InventoryModel/Items/Data/Weapon.cs b/Assets/Code/InventoryModel/Items/Data/Weapon.cs
@@ -1,5 +1,5 @@
 using System;
-using Utilities.Attributes;
+using Code.Utilities.Attributes;
 
 namespace Code.InventoryModel.Items.Data
 {
diff --git a/Assets/Code/InventoryModel/Services/InventoryInitializer/IInventorySaveInitializer.cs b/Assets/Code/InventoryModel/Services/InventoryInitializer/IInventorySaveInitializer.cs
@@ -1,5 +1,5 @@
+using Code.Infrastructure.Services.PersistenceProgress.Player;
 using Code.InventoryModel.Data;
-using Services.PersistenceProgress.Player;
 
 namespace Services.Factories.Inventory
 {
diff --git a/Assets/Code/InventoryModel/Services/InventoryInitializer/InventorySaveInitializer.cs b/Assets/Code/InventoryModel/Services/InventoryInitializer/InventorySaveInitializer.cs
@@ -1,11 +1,11 @@
 using System;
 using Code.Infrastructure.Services.PersistenceProgress;
+using Code.Infrastructure.Services.PersistenceProgress.Player;
 using Code.Inventory.Services.InventoryExpand;
 using Code.InventoryModel;
 using Code.InventoryModel.Data;
 using Code.InventoryModel.Items.Data;
 using Code.InventoryModel.Items.Factory;
-using Services.PersistenceProgress.Player;
 
 namespace Services.Factories.Inventory
 {
diff --git a/Assets/Code/UI/ButtonScaler.cs b/Assets/Code/UI/ButtonScaler.cs
@@ -1,18 +1,17 @@
 using System;
 using System.Threading;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.EventSystems;
-using Cysharp.Threading.Tasks;
 
-namespace UI.Effects
+namespace Code.UI
 {
     public class ButtonScaler : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
     {
         [SerializeField] private RectTransform _rectTransform;
-
         [Header("Setup")]
-        [SerializeField] private float ScaleAmount = 0.8f;
-        [SerializeField] private float ScaleDuration = 0.2f;
+        [SerializeField] private float _scaleAmount = 0.8f;
+        [SerializeField] private float _scaleDuration = 0.2f;
 
         private Vector3 _originalScale;
         private CancellationTokenSource _scaleCts;
@@ -33,15 +32,15 @@ public void OnPointerDown(PointerEventData eventData)
             _scaleCts?.Cancel();
             _scaleCts = new CancellationTokenSource();
             
-            ScaleToAsync(_originalScale * ScaleAmount, ScaleDuration, _scaleCts.Token).Forget();
+            ScaleToAsync(_originalScale * _scaleAmount, _scaleDuration, _scaleCts.Token).Forget();
         }
 
         public void OnPointerUp(PointerEventData eventData)
         {
             _scaleCts?.Cancel();
             _scaleCts = new CancellationTokenSource();
             
-            ScaleToAsync(_originalScale, ScaleDuration, _scaleCts.Token).Forget();
+            ScaleToAsync(_originalScale, _scaleDuration, _scaleCts.Token).Forget();
         }
 
         private async UniTaskVoid ScaleToAsync(Vector3 targetScale, float duration, CancellationToken token)
diff --git a/Assets/Code/Utilities/Attributes/WeaponIdSelectorAttribute.cs b/Assets/Code/Utilities/Attributes/WeaponIdSelectorAttribute.cs
@@ -1,6 +1,4 @@
-﻿using Code.Utilities.Attributes;
-
-namespace Utilities.Attributes
+﻿namespace Code.Utilities.Attributes
 {
     public class WeaponIdSelectorAttribute : IdSelectorAttribute
     {
diff --git a/Assets/Code/Utilities/Editor/IdSelectorAttributeDrawer.cs b/Assets/Code/Utilities/Editor/IdSelectorAttributeDrawer.cs
@@ -1,12 +1,12 @@
-using System;
 using System.Linq;
+using Code.Utilities.Attributes;
+using Code.Utilities.Extensions;
 using Sirenix.OdinInspector.Editor;
 using Sirenix.Utilities.Editor;
 using UnityEditor;
 using UnityEngine;
-using Code.Utilities.Attributes;
 
-namespace Utilities.Editor
+namespace Code.Utilities.Editor
 {
     public abstract class IdSelectorAttributeDrawer<TAttribute, TData> : OdinAttributeDrawer<TAttribute, string>
         where TAttribute : IdSelectorAttribute
diff --git a/Assets/Code/Utilities/Editor/ItemIdSelectorAttributeDrawer.cs b/Assets/Code/Utilities/Editor/ItemIdSelectorAttributeDrawer.cs
@@ -3,7 +3,7 @@
 using Code.Utilities.Attributes;
 using JetBrains.Annotations;
 
-namespace Utilities.Editor
+namespace Code.Utilities.Editor
 {
     [UsedImplicitly]
     public class ItemIdSelectorAttributeDrawer : IdSelectorAttributeDrawer<ItemIdSelectorAttribute, ItemData>
diff --git a/Assets/Code/Utilities/Editor/WeaponIdSelectorAttributeDrawer.cs b/Assets/Code/Utilities/Editor/WeaponIdSelectorAttributeDrawer.cs
@@ -1,9 +1,9 @@
 ﻿using System.Linq;
 using Code.InventoryModel.Items.Data;
+using Code.Utilities.Attributes;
 using JetBrains.Annotations;
-using Utilities.Attributes;
 
-namespace Utilities.Editor
+namespace Code.Utilities.Editor
 {
     [UsedImplicitly]
     public class WeaponIdSelectorAttributeDrawer : IdSelectorAttributeDrawer<WeaponIdSelectorAttribute, WeaponData>
diff --git a/Assets/Code/Utilities/Extensions/ArrayExtensions.cs b/Assets/Code/Utilities/Extensions/ArrayExtensions.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Utilities.Editor
+namespace Code.Utilities.Extensions
 {
     public static class ArrayExtensions
     {
diff --git a/Assets/Code/Utilities/Extensions/CameraExtensions.cs b/Assets/Code/Utilities/Extensions/CameraExtensions.cs
@@ -1,22 +1,14 @@
 ﻿using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
-namespace Utilities.Extensions
+namespace Code.Utilities.Extensions
 {
     public static class CameraExtensions
     {
-        public static List<T> GetVisibleTargets<T>(Camera camera, List<T> targets, float visibilityOffset = 0f) where T : Component
-        {
-            List<T> visibleTargets = new List<T>();
-    
-            foreach (T target in targets)
-            {
-                if (IsTargetVisible(camera, target, visibilityOffset)) 
-                    visibleTargets.Add(target);
-            }
-
-            return visibleTargets;
-        }
+        public static List<T> GetVisibleTargets<T>(Camera camera, List<T> targets, float visibilityOffset = 0f) 
+            where T : Component => 
+            targets.Where(target => IsTargetVisible(camera, target, visibilityOffset)).ToList();
 
         public static bool IsTargetVisible<T>(Camera camera, T target, float visibilityOffset = 0f) where T : Component
         {
diff --git a/Assets/Code/Utilities/Extensions/FunctionalExtensions.cs b/Assets/Code/Utilities/Extensions/FunctionalExtensions.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Extensions
+namespace Code.Utilities.Extensions
 {
     public static class FunctionalExtensions
     {
diff --git a/Assets/Code/Utilities/Extensions/IEmumerableExtentions.cs b/Assets/Code/Utilities/Extensions/IEmumerableExtentions.cs
@@ -1,14 +1,14 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 
-namespace Extensions
+namespace Code.Utilities.Extensions
 {
-  public static class IEmumerableExtentions
-  {
-    public static T Random<T>(this IEnumerable<T> enumerable)
+    public static class IEmumerableExtentions
     {
-      var items = enumerable.ToArray();
-      return items[UnityEngine.Random.Range(0, items.Length)];
+        public static T Random<T>(this IEnumerable<T> enumerable)
+        {
+            var items = enumerable.ToArray();
+            return items[UnityEngine.Random.Range(0, items.Length)];
+        }
     }
-  }
 }
diff --git a/Assets/Code/Utilities/Extensions/VectorExtensions.cs b/Assets/Code/Utilities/Extensions/VectorExtensions.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace Extensions
+namespace Code.Utilities.Extensions
 {
     public static class VectorExtensions
     {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Code.Infrastructure.Services.GameStater;`
`3`	`3`	`using Zenject;`
`4`	`4`
`5`		`-namespace CodeBase.Infrastructure`
	`5`	`+namespace Code.Infrastructure`
`6`	`6`	`{`
`7`	`7`	`public class GameInstaller : MonoInstaller, IInitializable, IDisposable`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ private PlayerData SetUpBaseProgress()`
`103`	`103`	`{`
`104`	`104`	`Debug.Log("InitializeProgress");`
`105`	`105`
`106`		`- var progress = new PlayerData(`
	`106`	`+ PlayerData progress = new PlayerData(`
`107`	`107`	`columns: InventorySize.Columns,`
`108`	`108`	`rows: InventorySize.Rows);`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Code.Infrastructure.Services.PersistenceProgress.Player;`
`2`		`-using Services.PersistenceProgress.Player;`
`3`	`2`
`4`	`3`	`namespace Code.Infrastructure.Services.PersistenceProgress`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`		`-using Code.Infrastructure.Services.PersistenceProgress;`
`2`		`-using Code.Infrastructure.Services.PersistenceProgress.Player;`
`3`		`-using Services.PersistenceProgress.Player;`
	`1`	`+using Code.Infrastructure.Services.PersistenceProgress.Player;`
`4`	`2`
`5`		`-namespace Services.PersistenceProgress`
	`3`	`+namespace Code.Infrastructure.Services.PersistenceProgress`
`6`	`4`	`{`
`7`	`5`	`public class PersistenceProgressService : IPersistenceProgressService`
`8`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ public class InventoryOpeningData`
`10`	`10`
`11`	`11`	`public void SetBought(int index)`
`12`	`12`	`{`
`13`		`- // Debug.Log($"Bougth index {index}");`
`14`	`13`	`BoughtIndexes.Add(index);`
`15`	`14`	`}`
`16`	`15`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using StaticData;`
	`1`	`+using Code.Infrastructure.StaticData;`
`2`	`2`
`3`	`3`	`namespace Code.Infrastructure.Services.StaticData`
`4`	`4`	`{`