From 7b740f2297e41432bff72a10fb7d5fc3e188dc72 Mon Sep 17 00:00:00 2001 From: floribe2000 Date: Sat, 28 Oct 2023 22:59:52 +0200 Subject: [PATCH] move data containers into features directory --- .../AccelerationCharts/AccelerationCharts.razor | 2 +- .../Features/BallisticCharts/BallisticHelper.cs | 2 +- .../Features/BallisticCharts/Charts.razor | 2 +- .../Features/BallisticCharts/DispersionPlot.razor | 4 ++-- .../BallisticCharts/ShipAndShellSelectionDialog.razor | 2 +- .../Components/CaptainSkillSelectorImageRender.razor | 5 ++--- .../Components/ConsumableSelectorImageRender.razor | 6 +++--- .../Components/ShipUpgradeSelectorImageRender.razor | 5 +++-- .../Builds/Components/SignalSelectorImageRender.razor | 3 ++- .../Features/Builds/ShipBuildViewModel.cs | 2 +- .../DataContainers/AccelerationCalculator.cs | 2 +- .../DataContainers/Aircraft/AirstrikeDataContainer.cs | 2 +- .../DataContainers/Aircraft/CvAircraftDataContainer.cs | 2 +- .../Armament/DepthChargesLauncherDataContainer.cs | 2 +- .../Armament/MainBatteryDataContainer.cs | 8 ++++---- .../DataContainers/Armament/PingerGunDataContainer.cs | 2 +- .../Armament/SecondaryBatteryDataContainer.cs | 4 ++-- .../Armament/SecondaryBatteryUiDataContainer.cs | 2 +- .../Armament/TorpedoArmamentDataContainer.cs | 2 +- .../{ => Features}/DataContainers/Constants.cs | 2 +- .../DataContainers/DataContainerUtility.cs | 2 +- .../DataContainers/Projectiles/BombDataContainer.cs | 4 ++-- .../Projectiles/DepthChargeDataContainer.cs | 2 +- .../Projectiles/ProjectileDataContainer.cs | 2 +- .../DataContainers/Projectiles/RocketDataContainer.cs | 4 ++-- .../DataContainers/Projectiles/ShellDataContainer.cs | 4 ++-- .../DataContainers/Projectiles/TorpedoDataContainer.cs | 4 ++-- .../DataContainers/Ship/AntiAirDataContainer.cs | 2 +- .../DataContainers/Ship/AuraDataDataContainer.cs | 2 +- .../DataContainers/Ship/ConcealmentDataContainer.cs | 2 +- .../DataContainers/Ship/ConsumableDataContainer.cs | 2 +- .../Ship/ManeuverabilityDataContainer.cs | 2 +- .../DataContainers/Ship/ShipDataContainer.cs | 2 +- .../DataContainers/Ship/SpecialAbilityDataContainer.cs | 2 +- .../DataContainers/Ship/SurvivabilityDataContainer.cs | 2 +- .../ShipComparison/GridData/AswGridDataWrapper.cs | 2 +- .../ShipComparison/GridData/BomberGridDataWrapper.cs | 4 ++-- .../ShipComparison/GridData/GridDataWrapper.cs | 4 ++-- .../GridData/ManeuverabilityGridDataWrapper.cs | 2 +- .../GridData/RocketPlaneGridDataWrapper.cs | 4 ++-- .../GridData/SecondaryGridDataWrapper.cs | 3 +-- .../GridData/TorpedoBomberGridDataWrapper.cs | 4 ++-- .../ShipComparison/GridData/TorpedoGridDataWrapper.cs | 4 ++-- .../Features/ShipComparison/ShipComparisonViewModel.cs | 2 +- .../ShipStats/Components/CaptainSkillSelector.razor | 1 - .../ShipStats/Components/ConsumableSelector.razor | 6 +++--- .../DepthChargeDamageDistributionChart.razor | 5 +++-- .../Features/ShipStats/Components/ShipStatsPanel.razor | 4 ++-- .../Features/ShipStats/Components/ShipStatsTab.razor | 3 +-- .../ShipStats/Components/ShipUpgradeSelector.razor | 9 +++++---- .../Features/ShipStats/Components/SignalSelector.razor | 3 ++- .../Features/ShipStats/ShipStats.razor | 4 ++-- .../ShipStats/ViewModels/ConsumableSlotViewModel.cs | 2 +- .../ShipStats/ViewModels/ConsumableViewModel.cs | 3 +-- .../ShipStats/ViewModels/ShipStatsControlViewModel.cs | 2 +- .../Infrastructure/DataTransfer/ShipBuildContainer.cs | 4 ++-- .../WoWsShipBuilder.Common.csproj.DotSettings | 10 +++++----- WoWsShipBuilder.Web/Features/TestPage/TestPage.razor | 2 +- 58 files changed, 93 insertions(+), 93 deletions(-) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/AccelerationCalculator.cs (99%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Aircraft/AirstrikeDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Aircraft/CvAircraftDataContainer.cs (99%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Armament/DepthChargesLauncherDataContainer.cs (97%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Armament/MainBatteryDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Armament/PingerGunDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Armament/SecondaryBatteryDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Armament/SecondaryBatteryUiDataContainer.cs (88%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Armament/TorpedoArmamentDataContainer.cs (99%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Constants.cs (77%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/DataContainerUtility.cs (92%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Projectiles/BombDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Projectiles/DepthChargeDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Projectiles/ProjectileDataContainer.cs (67%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Projectiles/RocketDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Projectiles/ShellDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Projectiles/TorpedoDataContainer.cs (99%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Ship/AntiAirDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Ship/AuraDataDataContainer.cs (93%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Ship/ConcealmentDataContainer.cs (99%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Ship/ConsumableDataContainer.cs (99%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Ship/ManeuverabilityDataContainer.cs (99%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Ship/ShipDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Ship/SpecialAbilityDataContainer.cs (98%) rename WoWsShipBuilder.Common/{ => Features}/DataContainers/Ship/SurvivabilityDataContainer.cs (99%) diff --git a/WoWsShipBuilder.Common/Features/AccelerationCharts/AccelerationCharts.razor b/WoWsShipBuilder.Common/Features/AccelerationCharts/AccelerationCharts.razor index ce2d2d583..20f77bfc0 100644 --- a/WoWsShipBuilder.Common/Features/AccelerationCharts/AccelerationCharts.razor +++ b/WoWsShipBuilder.Common/Features/AccelerationCharts/AccelerationCharts.razor @@ -1,12 +1,12 @@ @page "/acceleration-charts" -@using WoWsShipBuilder.DataContainers @using WoWsShipBuilder.DataStructures @using WoWsShipBuilder.DataStructures.Ship @using WoWsShipBuilder.Features.BallisticCharts @using WoWsShipBuilder.Features.BallisticCharts.Data @using WoWsShipBuilder.Features.Builds @using WoWsShipBuilder.Features.Builds.Components +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Infrastructure.ApplicationData @using WoWsShipBuilder.Infrastructure.DataTransfer @using WoWsShipBuilder.Infrastructure.GameData diff --git a/WoWsShipBuilder.Common/Features/BallisticCharts/BallisticHelper.cs b/WoWsShipBuilder.Common/Features/BallisticCharts/BallisticHelper.cs index 7d4bd860f..8e16885f7 100644 --- a/WoWsShipBuilder.Common/Features/BallisticCharts/BallisticHelper.cs +++ b/WoWsShipBuilder.Common/Features/BallisticCharts/BallisticHelper.cs @@ -1,6 +1,6 @@ -using WoWsShipBuilder.DataContainers; using WoWsShipBuilder.DataStructures; using WoWsShipBuilder.DataStructures.Projectile; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Features.BallisticCharts; diff --git a/WoWsShipBuilder.Common/Features/BallisticCharts/Charts.razor b/WoWsShipBuilder.Common/Features/BallisticCharts/Charts.razor index ad2eda058..a34137b1c 100644 --- a/WoWsShipBuilder.Common/Features/BallisticCharts/Charts.razor +++ b/WoWsShipBuilder.Common/Features/BallisticCharts/Charts.razor @@ -1,11 +1,11 @@ @page "/charts" -@using WoWsShipBuilder.DataContainers @using WoWsShipBuilder.DataStructures @using WoWsShipBuilder.DataStructures.Ship @using WoWsShipBuilder.DataStructures.Projectile @using WoWsShipBuilder.Features.BallisticCharts.Data @using WoWsShipBuilder.Features.Builds @using WoWsShipBuilder.Features.Builds.Components +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Infrastructure.ApplicationData @using WoWsShipBuilder.Infrastructure.DataTransfer @using WoWsShipBuilder.Infrastructure.GameData diff --git a/WoWsShipBuilder.Common/Features/BallisticCharts/DispersionPlot.razor b/WoWsShipBuilder.Common/Features/BallisticCharts/DispersionPlot.razor index cc5833c92..cb03f252d 100644 --- a/WoWsShipBuilder.Common/Features/BallisticCharts/DispersionPlot.razor +++ b/WoWsShipBuilder.Common/Features/BallisticCharts/DispersionPlot.razor @@ -1,7 +1,7 @@ -@using WoWsShipBuilder.DataContainers -@using WoWsShipBuilder.Features.BallisticCharts.Data +@using WoWsShipBuilder.Features.BallisticCharts.Data @using WoWsShipBuilder.Infrastructure.Localization @using WoWsShipBuilder.Infrastructure.Localization.Resources + @implements IAsyncDisposable @inject IJSRuntime Runtime @inject ILocalizer Localizer diff --git a/WoWsShipBuilder.Common/Features/BallisticCharts/ShipAndShellSelectionDialog.razor b/WoWsShipBuilder.Common/Features/BallisticCharts/ShipAndShellSelectionDialog.razor index 27754d30e..1d9818af1 100644 --- a/WoWsShipBuilder.Common/Features/BallisticCharts/ShipAndShellSelectionDialog.razor +++ b/WoWsShipBuilder.Common/Features/BallisticCharts/ShipAndShellSelectionDialog.razor @@ -2,11 +2,11 @@ @using System.Collections.Specialized @using System.Linq @using DynamicData -@using WoWsShipBuilder.DataContainers @using WoWsShipBuilder.DataStructures @using WoWsShipBuilder.DataStructures.Ship @using WoWsShipBuilder.Features.BallisticCharts.Data @using WoWsShipBuilder.Features.Builds +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Infrastructure.DataTransfer @using WoWsShipBuilder.Infrastructure.Localization.Resources @using WoWsShipBuilder.Infrastructure.Utility diff --git a/WoWsShipBuilder.Common/Features/Builds/Components/CaptainSkillSelectorImageRender.razor b/WoWsShipBuilder.Common/Features/Builds/Components/CaptainSkillSelectorImageRender.razor index bc2bfc0ba..2e7dbc37f 100644 --- a/WoWsShipBuilder.Common/Features/Builds/Components/CaptainSkillSelectorImageRender.razor +++ b/WoWsShipBuilder.Common/Features/Builds/Components/CaptainSkillSelectorImageRender.razor @@ -1,6 +1,5 @@ -@using WoWsShipBuilder.DataStructures -@using System.Text -@using WoWsShipBuilder.DataContainers +@using System.Text +@using WoWsShipBuilder.DataStructures @using WoWsShipBuilder.Features.ShipStats.ViewModels @using WoWsShipBuilder.DataStructures.Captain @using WoWsShipBuilder.Infrastructure.Localization.Resources diff --git a/WoWsShipBuilder.Common/Features/Builds/Components/ConsumableSelectorImageRender.razor b/WoWsShipBuilder.Common/Features/Builds/Components/ConsumableSelectorImageRender.razor index 73fdf31d0..f10c62054 100644 --- a/WoWsShipBuilder.Common/Features/Builds/Components/ConsumableSelectorImageRender.razor +++ b/WoWsShipBuilder.Common/Features/Builds/Components/ConsumableSelectorImageRender.razor @@ -1,8 +1,8 @@ -@using WoWsShipBuilder.DataContainers +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Features.ShipStats.Components @using WoWsShipBuilder.Infrastructure.Localization @using WoWsShipBuilder.Infrastructure.Utility -@using ConsumableDataContainer = WoWsShipBuilder.DataContainers.ConsumableDataContainer + @inherits ReactiveComponentBase @inject ILocalizer Localizer @@ -113,4 +113,4 @@ } } -} \ No newline at end of file +} diff --git a/WoWsShipBuilder.Common/Features/Builds/Components/ShipUpgradeSelectorImageRender.razor b/WoWsShipBuilder.Common/Features/Builds/Components/ShipUpgradeSelectorImageRender.razor index 988fc12a6..0b5335395 100644 --- a/WoWsShipBuilder.Common/Features/Builds/Components/ShipUpgradeSelectorImageRender.razor +++ b/WoWsShipBuilder.Common/Features/Builds/Components/ShipUpgradeSelectorImageRender.razor @@ -1,8 +1,9 @@ @using WoWsShipBuilder.DataStructures.Upgrade -@using WoWsShipBuilder.DataContainers +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Features.ShipStats.ViewModels @using WoWsShipBuilder.Infrastructure.Localization.Resources @using WoWsShipBuilder.Infrastructure.Utility + @inherits ReactiveComponentBase @inject ILocalizer Localizer @@ -99,4 +100,4 @@ return "min-width: 60px; width: 60px; height: 60px; padding: 2px;"; } } -} \ No newline at end of file +} diff --git a/WoWsShipBuilder.Common/Features/Builds/Components/SignalSelectorImageRender.razor b/WoWsShipBuilder.Common/Features/Builds/Components/SignalSelectorImageRender.razor index 89ecb0cce..ad43856ee 100644 --- a/WoWsShipBuilder.Common/Features/Builds/Components/SignalSelectorImageRender.razor +++ b/WoWsShipBuilder.Common/Features/Builds/Components/SignalSelectorImageRender.razor @@ -1,6 +1,7 @@ -@using WoWsShipBuilder.DataContainers +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Infrastructure.Localization.Resources @using WoWsShipBuilder.Infrastructure.Utility + @inherits ReactiveComponentBase @inject ILocalizer Localizer diff --git a/WoWsShipBuilder.Common/Features/Builds/ShipBuildViewModel.cs b/WoWsShipBuilder.Common/Features/Builds/ShipBuildViewModel.cs index bbb93fbab..3c0a6fe3e 100644 --- a/WoWsShipBuilder.Common/Features/Builds/ShipBuildViewModel.cs +++ b/WoWsShipBuilder.Common/Features/Builds/ShipBuildViewModel.cs @@ -1,6 +1,6 @@ using ReactiveUI; -using WoWsShipBuilder.DataContainers; using WoWsShipBuilder.DataStructures.Ship; +using WoWsShipBuilder.Features.DataContainers; using WoWsShipBuilder.Features.ShipStats.ViewModels; using WoWsShipBuilder.Infrastructure.ApplicationData; using WoWsShipBuilder.Infrastructure.DataTransfer; diff --git a/WoWsShipBuilder.Common/DataContainers/AccelerationCalculator.cs b/WoWsShipBuilder.Common/Features/DataContainers/AccelerationCalculator.cs similarity index 99% rename from WoWsShipBuilder.Common/DataContainers/AccelerationCalculator.cs rename to WoWsShipBuilder.Common/Features/DataContainers/AccelerationCalculator.cs index 88c936b98..a73297cc5 100644 --- a/WoWsShipBuilder.Common/DataContainers/AccelerationCalculator.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/AccelerationCalculator.cs @@ -2,7 +2,7 @@ using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Infrastructure.ApplicationData; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; public static class AccelerationCalculator { diff --git a/WoWsShipBuilder.Common/DataContainers/Aircraft/AirstrikeDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Aircraft/AirstrikeDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Aircraft/AirstrikeDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Aircraft/AirstrikeDataContainer.cs index 646c8bfd1..836badf37 100644 --- a/WoWsShipBuilder.Common/DataContainers/Aircraft/AirstrikeDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Aircraft/AirstrikeDataContainer.cs @@ -5,7 +5,7 @@ using WoWsShipBuilder.Infrastructure.ApplicationData; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record AirstrikeDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Aircraft/CvAircraftDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Aircraft/CvAircraftDataContainer.cs similarity index 99% rename from WoWsShipBuilder.Common/DataContainers/Aircraft/CvAircraftDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Aircraft/CvAircraftDataContainer.cs index 7dca33344..0e0feabc5 100644 --- a/WoWsShipBuilder.Common/DataContainers/Aircraft/CvAircraftDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Aircraft/CvAircraftDataContainer.cs @@ -8,7 +8,7 @@ using WoWsShipBuilder.Infrastructure.GameData; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record CvAircraftDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Armament/DepthChargesLauncherDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Armament/DepthChargesLauncherDataContainer.cs similarity index 97% rename from WoWsShipBuilder.Common/DataContainers/Armament/DepthChargesLauncherDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Armament/DepthChargesLauncherDataContainer.cs index 17d36e9ef..5b751b0b2 100644 --- a/WoWsShipBuilder.Common/DataContainers/Armament/DepthChargesLauncherDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Armament/DepthChargesLauncherDataContainer.cs @@ -4,7 +4,7 @@ using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record DepthChargesLauncherDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Armament/MainBatteryDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Armament/MainBatteryDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Armament/MainBatteryDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Armament/MainBatteryDataContainer.cs index d5d3dbe3e..6f73b59e7 100644 --- a/WoWsShipBuilder.Common/DataContainers/Armament/MainBatteryDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Armament/MainBatteryDataContainer.cs @@ -8,7 +8,7 @@ using WoWsShipBuilder.Infrastructure.Utility; // ReSharper disable UnusedAutoPropertyAccessor.Global -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record MainBatteryDataContainer : DataContainerBase @@ -246,16 +246,16 @@ public partial record MainBatteryDataContainer : DataContainerBase private bool ShouldDisplayHeDpm(object obj) { - return DisplayHeDpm; + return this.DisplayHeDpm; } private bool ShouldDisplayApDpm(object obj) { - return DisplayApDpm; + return this.DisplayApDpm; } private bool ShouldDisplaySapDpm(object obj) { - return DisplaySapDpm; + return this.DisplaySapDpm; } } diff --git a/WoWsShipBuilder.Common/DataContainers/Armament/PingerGunDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Armament/PingerGunDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Armament/PingerGunDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Armament/PingerGunDataContainer.cs index 540be959f..dc08fd044 100644 --- a/WoWsShipBuilder.Common/DataContainers/Armament/PingerGunDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Armament/PingerGunDataContainer.cs @@ -5,7 +5,7 @@ using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record PingerGunDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Armament/SecondaryBatteryDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Armament/SecondaryBatteryDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Armament/SecondaryBatteryDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Armament/SecondaryBatteryDataContainer.cs index 4939a0a93..9c623a48c 100644 --- a/WoWsShipBuilder.Common/DataContainers/Armament/SecondaryBatteryDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Armament/SecondaryBatteryDataContainer.cs @@ -7,7 +7,7 @@ using WoWsShipBuilder.Infrastructure.GameData; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record SecondaryBatteryDataContainer : DataContainerBase @@ -142,6 +142,6 @@ public partial record SecondaryBatteryDataContainer : DataContainerBase private bool ShouldDisplayFpm(object obj) { - return DisplayFpm; + return this.DisplayFpm; } } diff --git a/WoWsShipBuilder.Common/DataContainers/Armament/SecondaryBatteryUiDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Armament/SecondaryBatteryUiDataContainer.cs similarity index 88% rename from WoWsShipBuilder.Common/DataContainers/Armament/SecondaryBatteryUiDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Armament/SecondaryBatteryUiDataContainer.cs index 2825a302f..5775dd9e6 100644 --- a/WoWsShipBuilder.Common/DataContainers/Armament/SecondaryBatteryUiDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Armament/SecondaryBatteryUiDataContainer.cs @@ -1,6 +1,6 @@ using WoWsShipBuilder.DataStructures.Ship; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; public record SecondaryBatteryUiDataContainer(List? Secondaries) { diff --git a/WoWsShipBuilder.Common/DataContainers/Armament/TorpedoArmamentDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Armament/TorpedoArmamentDataContainer.cs similarity index 99% rename from WoWsShipBuilder.Common/DataContainers/Armament/TorpedoArmamentDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Armament/TorpedoArmamentDataContainer.cs index bc9990430..d5d3ae641 100644 --- a/WoWsShipBuilder.Common/DataContainers/Armament/TorpedoArmamentDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Armament/TorpedoArmamentDataContainer.cs @@ -6,7 +6,7 @@ using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record TorpedoArmamentDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Constants.cs b/WoWsShipBuilder.Common/Features/DataContainers/Constants.cs similarity index 77% rename from WoWsShipBuilder.Common/DataContainers/Constants.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Constants.cs index 68394100a..f68a19375 100644 --- a/WoWsShipBuilder.Common/DataContainers/Constants.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Constants.cs @@ -1,4 +1,4 @@ -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; public static class Constants { diff --git a/WoWsShipBuilder.Common/DataContainers/DataContainerUtility.cs b/WoWsShipBuilder.Common/Features/DataContainers/DataContainerUtility.cs similarity index 92% rename from WoWsShipBuilder.Common/DataContainers/DataContainerUtility.cs rename to WoWsShipBuilder.Common/Features/DataContainers/DataContainerUtility.cs index 8fa3e98a5..c63f06915 100644 --- a/WoWsShipBuilder.Common/DataContainers/DataContainerUtility.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/DataContainerUtility.cs @@ -1,7 +1,7 @@ using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; public static class DataContainerUtility { diff --git a/WoWsShipBuilder.Common/DataContainers/Projectiles/BombDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/BombDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Projectiles/BombDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Projectiles/BombDataContainer.cs index 5ff69265f..fa4b56486 100644 --- a/WoWsShipBuilder.Common/DataContainers/Projectiles/BombDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/BombDataContainer.cs @@ -5,7 +5,7 @@ using WoWsShipBuilder.Infrastructure.GameData; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record BombDataContainer : ProjectileDataContainer @@ -118,6 +118,6 @@ public static BombDataContainer FromBombName(string name, List<(string name, flo private bool ShouldDisplayBlastPenetration(object obj) { - return ShowBlastPenetration; + return this.ShowBlastPenetration; } } diff --git a/WoWsShipBuilder.Common/DataContainers/Projectiles/DepthChargeDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/DepthChargeDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Projectiles/DepthChargeDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Projectiles/DepthChargeDataContainer.cs index 027b37542..a6d915038 100644 --- a/WoWsShipBuilder.Common/DataContainers/Projectiles/DepthChargeDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/DepthChargeDataContainer.cs @@ -3,7 +3,7 @@ using WoWsShipBuilder.Infrastructure.ApplicationData; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record DepthChargeDataContainer : ProjectileDataContainer diff --git a/WoWsShipBuilder.Common/DataContainers/Projectiles/ProjectileDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/ProjectileDataContainer.cs similarity index 67% rename from WoWsShipBuilder.Common/DataContainers/Projectiles/ProjectileDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Projectiles/ProjectileDataContainer.cs index fe19a2a02..b0e3d390e 100644 --- a/WoWsShipBuilder.Common/DataContainers/Projectiles/ProjectileDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/ProjectileDataContainer.cs @@ -1,5 +1,5 @@ using WoWsShipBuilder.DataElements; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; public abstract record ProjectileDataContainer : DataContainerBase; diff --git a/WoWsShipBuilder.Common/DataContainers/Projectiles/RocketDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/RocketDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Projectiles/RocketDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Projectiles/RocketDataContainer.cs index e432d1a77..f9e201194 100644 --- a/WoWsShipBuilder.Common/DataContainers/Projectiles/RocketDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/RocketDataContainer.cs @@ -5,7 +5,7 @@ using WoWsShipBuilder.Infrastructure.GameData; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record RocketDataContainer : ProjectileDataContainer @@ -112,6 +112,6 @@ public static RocketDataContainer FromRocketName(string name, List<(string name, private bool ShouldDisplayBlastPenetration(object obj) { - return ShowBlastPenetration; + return this.ShowBlastPenetration; } } diff --git a/WoWsShipBuilder.Common/DataContainers/Projectiles/ShellDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/ShellDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Projectiles/ShellDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Projectiles/ShellDataContainer.cs index 65d4b55f5..4adb7361f 100644 --- a/WoWsShipBuilder.Common/DataContainers/Projectiles/ShellDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/ShellDataContainer.cs @@ -8,7 +8,7 @@ using WoWsShipBuilder.Infrastructure.GameData; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record ShellDataContainer : DataContainerBase @@ -216,6 +216,6 @@ private static ShellDataContainer ProcessShell(List<(string Name, float Value)> private bool ShouldDisplayBlastPenetration(object obj) { - return ShowBlastPenetration; + return this.ShowBlastPenetration; } } diff --git a/WoWsShipBuilder.Common/DataContainers/Projectiles/TorpedoDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/TorpedoDataContainer.cs similarity index 99% rename from WoWsShipBuilder.Common/DataContainers/Projectiles/TorpedoDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Projectiles/TorpedoDataContainer.cs index 1753f4ab1..3f034b366 100644 --- a/WoWsShipBuilder.Common/DataContainers/Projectiles/TorpedoDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Projectiles/TorpedoDataContainer.cs @@ -5,7 +5,7 @@ using WoWsShipBuilder.Infrastructure.GameData; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record TorpedoDataContainer : ProjectileDataContainer @@ -205,6 +205,6 @@ public static List FromTorpedoName(List torpedoNam private bool ShouldDisplayName(object obj) { - return IsFromPlane; + return this.IsFromPlane; } } diff --git a/WoWsShipBuilder.Common/DataContainers/Ship/AntiAirDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Ship/AntiAirDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Ship/AntiAirDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Ship/AntiAirDataContainer.cs index 20a364ee2..165e69f1e 100644 --- a/WoWsShipBuilder.Common/DataContainers/Ship/AntiAirDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Ship/AntiAirDataContainer.cs @@ -3,7 +3,7 @@ using WoWsShipBuilder.Infrastructure.Utility; // ReSharper disable InconsistentNaming -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; public record AntiAirDataContainer { diff --git a/WoWsShipBuilder.Common/DataContainers/Ship/AuraDataDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Ship/AuraDataDataContainer.cs similarity index 93% rename from WoWsShipBuilder.Common/DataContainers/Ship/AuraDataDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Ship/AuraDataDataContainer.cs index 5cc0e0d54..4284aa5fd 100644 --- a/WoWsShipBuilder.Common/DataContainers/Ship/AuraDataDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Ship/AuraDataDataContainer.cs @@ -1,7 +1,7 @@ using WoWsShipBuilder.DataElements; using WoWsShipBuilder.DataElements.DataElementAttributes; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record AuraDataDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Ship/ConcealmentDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Ship/ConcealmentDataContainer.cs similarity index 99% rename from WoWsShipBuilder.Common/DataContainers/Ship/ConcealmentDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Ship/ConcealmentDataContainer.cs index 67f40078d..b3cf0f9e3 100644 --- a/WoWsShipBuilder.Common/DataContainers/Ship/ConcealmentDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Ship/ConcealmentDataContainer.cs @@ -4,7 +4,7 @@ using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record ConcealmentDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Ship/ConsumableDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Ship/ConsumableDataContainer.cs similarity index 99% rename from WoWsShipBuilder.Common/DataContainers/Ship/ConsumableDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Ship/ConsumableDataContainer.cs index 60f0a156b..be2c520b9 100644 --- a/WoWsShipBuilder.Common/DataContainers/Ship/ConsumableDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Ship/ConsumableDataContainer.cs @@ -9,7 +9,7 @@ using WoWsShipBuilder.Infrastructure.GameData; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record ConsumableDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Ship/ManeuverabilityDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Ship/ManeuverabilityDataContainer.cs similarity index 99% rename from WoWsShipBuilder.Common/DataContainers/Ship/ManeuverabilityDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Ship/ManeuverabilityDataContainer.cs index 42ce84f70..d590f0a58 100644 --- a/WoWsShipBuilder.Common/DataContainers/Ship/ManeuverabilityDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Ship/ManeuverabilityDataContainer.cs @@ -4,7 +4,7 @@ using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record ManeuverabilityDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Ship/ShipDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Ship/ShipDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Ship/ShipDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Ship/ShipDataContainer.cs index 1b0a9723b..cc12027ea 100644 --- a/WoWsShipBuilder.Common/DataContainers/Ship/ShipDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Ship/ShipDataContainer.cs @@ -1,6 +1,6 @@ using WoWsShipBuilder.DataStructures.Ship; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; public record ShipDataContainer(string Index) { diff --git a/WoWsShipBuilder.Common/DataContainers/Ship/SpecialAbilityDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Ship/SpecialAbilityDataContainer.cs similarity index 98% rename from WoWsShipBuilder.Common/DataContainers/Ship/SpecialAbilityDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Ship/SpecialAbilityDataContainer.cs index 2ae848071..f245ab1bf 100644 --- a/WoWsShipBuilder.Common/DataContainers/Ship/SpecialAbilityDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Ship/SpecialAbilityDataContainer.cs @@ -5,7 +5,7 @@ using WoWsShipBuilder.DataStructures.Ship; // ReSharper disable InconsistentNaming -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record SpecialAbilityDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/DataContainers/Ship/SurvivabilityDataContainer.cs b/WoWsShipBuilder.Common/Features/DataContainers/Ship/SurvivabilityDataContainer.cs similarity index 99% rename from WoWsShipBuilder.Common/DataContainers/Ship/SurvivabilityDataContainer.cs rename to WoWsShipBuilder.Common/Features/DataContainers/Ship/SurvivabilityDataContainer.cs index 9127b08fc..6ac1fb9de 100644 --- a/WoWsShipBuilder.Common/DataContainers/Ship/SurvivabilityDataContainer.cs +++ b/WoWsShipBuilder.Common/Features/DataContainers/Ship/SurvivabilityDataContainer.cs @@ -6,7 +6,7 @@ using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Infrastructure.Utility; -namespace WoWsShipBuilder.DataContainers; +namespace WoWsShipBuilder.Features.DataContainers; [DataContainer] public partial record SurvivabilityDataContainer : DataContainerBase diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/AswGridDataWrapper.cs b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/AswGridDataWrapper.cs index 69a0815b7..ffdf97a8f 100644 --- a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/AswGridDataWrapper.cs +++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/AswGridDataWrapper.cs @@ -1,4 +1,4 @@ -using WoWsShipBuilder.DataContainers; +using WoWsShipBuilder.Features.DataContainers; using WoWsShipBuilder.Infrastructure.Localization.Resources; namespace WoWsShipBuilder.Features.ShipComparison.GridData; diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/BomberGridDataWrapper.cs b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/BomberGridDataWrapper.cs index 81ddfcfca..3edef43b1 100644 --- a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/BomberGridDataWrapper.cs +++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/BomberGridDataWrapper.cs @@ -1,5 +1,5 @@ -using WoWsShipBuilder.DataContainers; -using WoWsShipBuilder.DataStructures; +using WoWsShipBuilder.DataStructures; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Features.ShipComparison.GridData; diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/GridDataWrapper.cs b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/GridDataWrapper.cs index 738d5aa39..373ae3ec8 100644 --- a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/GridDataWrapper.cs +++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/GridDataWrapper.cs @@ -1,7 +1,7 @@ -using WoWsShipBuilder.DataContainers; -using WoWsShipBuilder.DataStructures; +using WoWsShipBuilder.DataStructures; using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Features.Builds; +using WoWsShipBuilder.Features.DataContainers; using WoWsShipBuilder.Infrastructure.DataTransfer; using WoWsShipBuilder.Infrastructure.GameData; diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/ManeuverabilityGridDataWrapper.cs b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/ManeuverabilityGridDataWrapper.cs index 316de20a1..b5c844db8 100644 --- a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/ManeuverabilityGridDataWrapper.cs +++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/ManeuverabilityGridDataWrapper.cs @@ -1,4 +1,4 @@ -using WoWsShipBuilder.DataContainers; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Features.ShipComparison.GridData; diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/RocketPlaneGridDataWrapper.cs b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/RocketPlaneGridDataWrapper.cs index cda2c009e..8a516851e 100644 --- a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/RocketPlaneGridDataWrapper.cs +++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/RocketPlaneGridDataWrapper.cs @@ -1,5 +1,5 @@ -using WoWsShipBuilder.DataContainers; -using WoWsShipBuilder.DataStructures; +using WoWsShipBuilder.DataStructures; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Features.ShipComparison.GridData; diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/SecondaryGridDataWrapper.cs b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/SecondaryGridDataWrapper.cs index 9d1f1dbf4..4d759cd5f 100644 --- a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/SecondaryGridDataWrapper.cs +++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/SecondaryGridDataWrapper.cs @@ -1,5 +1,4 @@ -using SecondaryBatteryDataContainer = WoWsShipBuilder.DataContainers.SecondaryBatteryDataContainer; -using ShellDataContainer = WoWsShipBuilder.DataContainers.ShellDataContainer; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Features.ShipComparison.GridData; diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/TorpedoBomberGridDataWrapper.cs b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/TorpedoBomberGridDataWrapper.cs index cabfa2a0c..36256f437 100644 --- a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/TorpedoBomberGridDataWrapper.cs +++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/TorpedoBomberGridDataWrapper.cs @@ -1,5 +1,5 @@ -using WoWsShipBuilder.DataContainers; -using WoWsShipBuilder.DataStructures; +using WoWsShipBuilder.DataStructures; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Features.ShipComparison.GridData; diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/TorpedoGridDataWrapper.cs b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/TorpedoGridDataWrapper.cs index 2635b0554..f58d321a7 100644 --- a/WoWsShipBuilder.Common/Features/ShipComparison/GridData/TorpedoGridDataWrapper.cs +++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridData/TorpedoGridDataWrapper.cs @@ -1,5 +1,5 @@ -using WoWsShipBuilder.DataContainers; -using WoWsShipBuilder.DataStructures; +using WoWsShipBuilder.DataStructures; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Features.ShipComparison.GridData; diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparisonViewModel.cs b/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparisonViewModel.cs index 5bed49e30..99c74bba4 100644 --- a/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparisonViewModel.cs +++ b/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparisonViewModel.cs @@ -3,9 +3,9 @@ using System.Globalization; using DynamicData; using ReactiveUI; -using WoWsShipBuilder.DataContainers; using WoWsShipBuilder.DataStructures; using WoWsShipBuilder.DataStructures.Ship; +using WoWsShipBuilder.Features.DataContainers; using WoWsShipBuilder.Features.Settings; using WoWsShipBuilder.Features.ShipComparison.GridData; using WoWsShipBuilder.Infrastructure.ApplicationData; diff --git a/WoWsShipBuilder.Common/Features/ShipStats/Components/CaptainSkillSelector.razor b/WoWsShipBuilder.Common/Features/ShipStats/Components/CaptainSkillSelector.razor index 17a0c9f78..e37218322 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/Components/CaptainSkillSelector.razor +++ b/WoWsShipBuilder.Common/Features/ShipStats/Components/CaptainSkillSelector.razor @@ -3,7 +3,6 @@ @using System.Collections.Specialized @using System.Reflection @using System.Reflection.Metadata.Ecma335 -@using WoWsShipBuilder.DataContainers @using WoWsShipBuilder.Features.ShipStats.ViewModels @using WoWsShipBuilder.DataStructures.Captain @using WoWsShipBuilder.Infrastructure.Localization.Resources diff --git a/WoWsShipBuilder.Common/Features/ShipStats/Components/ConsumableSelector.razor b/WoWsShipBuilder.Common/Features/ShipStats/Components/ConsumableSelector.razor index fe33ce149..f147baa1f 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/Components/ConsumableSelector.razor +++ b/WoWsShipBuilder.Common/Features/ShipStats/Components/ConsumableSelector.razor @@ -1,11 +1,11 @@ @using WoWsShipBuilder.DataStructures -@using WoWsShipBuilder.DataContainers @using WoWsShipBuilder.DataElements @using WoWsShipBuilder.Features.ShipStats.ViewModels +@using WoWsShipBuilder.Features.DataContainers; @using WoWsShipBuilder.Infrastructure.Localization.Resources @using WoWsShipBuilder.Infrastructure.Metrics @using WoWsShipBuilder.Infrastructure.Utility -@using ConsumableDataContainer = WoWsShipBuilder.DataContainers.ConsumableDataContainer + @inherits ReactiveComponentBase @inject ILocalizer Localizer @inject MetricsService MetricsService @@ -225,4 +225,4 @@ } } -} \ No newline at end of file +} diff --git a/WoWsShipBuilder.Common/Features/ShipStats/Components/DepthChargeDamageDistributionChart.razor b/WoWsShipBuilder.Common/Features/ShipStats/Components/DepthChargeDamageDistributionChart.razor index 8e3dc7e34..4c028e652 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/Components/DepthChargeDamageDistributionChart.razor +++ b/WoWsShipBuilder.Common/Features/ShipStats/Components/DepthChargeDamageDistributionChart.razor @@ -1,5 +1,6 @@ @using WoWsShipBuilder.DataStructures -@using WoWsShipBuilder.DataContainers +@using WoWsShipBuilder.Features.DataContainers; + @implements IAsyncDisposable @inject IJSRuntime Runtime @@ -40,4 +41,4 @@ } } -} \ No newline at end of file +} diff --git a/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipStatsPanel.razor b/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipStatsPanel.razor index 0557422f2..fa3d6cb15 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipStatsPanel.razor +++ b/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipStatsPanel.razor @@ -4,7 +4,7 @@ @using System.Text @using WoWsShipBuilder.DataStructures.Ship.Components @using System.ComponentModel.DataAnnotations -@using WoWsShipBuilder.DataContainers +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Features.FiringAngleDiagram @using WoWsShipBuilder.Features.Settings @using WoWsShipBuilder.Infrastructure @@ -13,7 +13,7 @@ @using WoWsShipBuilder.Infrastructure.Localization.Resources @using WoWsShipBuilder.Infrastructure.Metrics @using WoWsShipBuilder.Infrastructure.Utility -@using DepthChargeDataContainer = WoWsShipBuilder.DataContainers.DepthChargeDataContainer + @inherits ReactiveComponentBase @inject ILocalizer Localizer @inject NavigationManager NavManager diff --git a/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipStatsTab.razor b/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipStatsTab.razor index fbee02287..8a45d23b2 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipStatsTab.razor +++ b/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipStatsTab.razor @@ -3,8 +3,8 @@ @using Microsoft.Extensions.Hosting @using Microsoft.Extensions.Options @using Prometheus -@using WoWsShipBuilder.DataContainers @using WoWsShipBuilder.Features.Builds.Components +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Features.ShipStats.ViewModels @using WoWsShipBuilder.Features.Builds @using WoWsShipBuilder.Features.LinkShortening @@ -16,7 +16,6 @@ @using WoWsShipBuilder.Infrastructure.Localization.Resources @using WoWsShipBuilder.Infrastructure.Metrics @using WoWsShipBuilder.Infrastructure.Utility -@using ShipViewModel = WoWsShipBuilder.Features.ShipStats.ViewModels.ShipViewModel @using System.Diagnostics @inject IHostEnvironment Environment diff --git a/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipUpgradeSelector.razor b/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipUpgradeSelector.razor index 81a46e862..443e02655 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipUpgradeSelector.razor +++ b/WoWsShipBuilder.Common/Features/ShipStats/Components/ShipUpgradeSelector.razor @@ -1,11 +1,12 @@ -@using WoWsShipBuilder.DataStructures -@using System.Collections.ObjectModel -@using WoWsShipBuilder.DataContainers +@using System.Collections.ObjectModel +@using WoWsShipBuilder.DataStructures +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Features.ShipStats.ViewModels @using WoWsShipBuilder.DataStructures.Upgrade @using WoWsShipBuilder.Infrastructure.Localization @using WoWsShipBuilder.Infrastructure.Localization.Resources @using WoWsShipBuilder.Infrastructure.Utility + @inherits ReactiveComponentBase @inject ILocalizer Localizer @@ -158,4 +159,4 @@ return "min-width: 60px; width: 60px; height: 60px; padding: 2px;"; } } -} \ No newline at end of file +} diff --git a/WoWsShipBuilder.Common/Features/ShipStats/Components/SignalSelector.razor b/WoWsShipBuilder.Common/Features/ShipStats/Components/SignalSelector.razor index e2939ef90..026f1a060 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/Components/SignalSelector.razor +++ b/WoWsShipBuilder.Common/Features/ShipStats/Components/SignalSelector.razor @@ -1,7 +1,8 @@ -@using WoWsShipBuilder.DataContainers +@using WoWsShipBuilder.Features.DataContainers @using WoWsShipBuilder.Features.ShipStats.ViewModels @using WoWsShipBuilder.Infrastructure.Localization.Resources @using WoWsShipBuilder.Infrastructure.Utility + @inherits ReactiveComponentBase @inject ILocalizer Localizer diff --git a/WoWsShipBuilder.Common/Features/ShipStats/ShipStats.razor b/WoWsShipBuilder.Common/Features/ShipStats/ShipStats.razor index ee9ec45d8..a8042b4e1 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/ShipStats.razor +++ b/WoWsShipBuilder.Common/Features/ShipStats/ShipStats.razor @@ -1,9 +1,9 @@ @page "/ship" @using DynamicData -@using WoWsShipBuilder.DataContainers -@using WoWsShipBuilder.Features.ShipStats.Components @using WoWsShipBuilder.Features.Builds +@using WoWsShipBuilder.Features.DataContainers +@using WoWsShipBuilder.Features.ShipStats.Components @using WoWsShipBuilder.Infrastructure.ApplicationData @using WoWsShipBuilder.Infrastructure.DataTransfer @using WoWsShipBuilder.Infrastructure.Localization.Resources diff --git a/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ConsumableSlotViewModel.cs b/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ConsumableSlotViewModel.cs index 8b8cb2238..85570c0e6 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ConsumableSlotViewModel.cs +++ b/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ConsumableSlotViewModel.cs @@ -3,7 +3,7 @@ using ReactiveUI; using WoWsShipBuilder.DataStructures; using WoWsShipBuilder.DataStructures.Ship; -using ConsumableDataContainer = WoWsShipBuilder.DataContainers.ConsumableDataContainer; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Features.ShipStats.ViewModels; diff --git a/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ConsumableViewModel.cs b/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ConsumableViewModel.cs index 4a9ccd798..77f5c2b37 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ConsumableViewModel.cs +++ b/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ConsumableViewModel.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using ReactiveUI; -using WoWsShipBuilder.DataContainers; using WoWsShipBuilder.DataStructures; using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Infrastructure.Utility; @@ -75,7 +74,7 @@ public List SaveBuild() /// /// Updates the consumable data for each slot. - /// This method only replaces the ConsumableDataContainer objects in each slot viewmodel but not the viewmodels themselves. + /// This method only replaces the ConsumableDataContainer objects in each slot viewmodel but not the viewmodels themselves. /// /// The list of modifiers applied to the current ship. /// The HP of the ship after modifiers have been applied. diff --git a/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ShipStatsControlViewModel.cs b/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ShipStatsControlViewModel.cs index 425acb98e..9d43db56c 100644 --- a/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ShipStatsControlViewModel.cs +++ b/WoWsShipBuilder.Common/Features/ShipStats/ViewModels/ShipStatsControlViewModel.cs @@ -1,6 +1,6 @@ using ReactiveUI; -using WoWsShipBuilder.DataContainers; using WoWsShipBuilder.DataStructures.Ship; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Features.ShipStats.ViewModels; diff --git a/WoWsShipBuilder.Common/Infrastructure/DataTransfer/ShipBuildContainer.cs b/WoWsShipBuilder.Common/Infrastructure/DataTransfer/ShipBuildContainer.cs index 9493f7cfe..458c76ee0 100644 --- a/WoWsShipBuilder.Common/Infrastructure/DataTransfer/ShipBuildContainer.cs +++ b/WoWsShipBuilder.Common/Infrastructure/DataTransfer/ShipBuildContainer.cs @@ -1,6 +1,6 @@ -using WoWsShipBuilder.DataContainers; -using WoWsShipBuilder.DataStructures.Ship; +using WoWsShipBuilder.DataStructures.Ship; using WoWsShipBuilder.Features.Builds; +using WoWsShipBuilder.Features.DataContainers; namespace WoWsShipBuilder.Infrastructure.DataTransfer; diff --git a/WoWsShipBuilder.Common/WoWsShipBuilder.Common.csproj.DotSettings b/WoWsShipBuilder.Common/WoWsShipBuilder.Common.csproj.DotSettings index d017b1bcf..378573660 100644 --- a/WoWsShipBuilder.Common/WoWsShipBuilder.Common.csproj.DotSettings +++ b/WoWsShipBuilder.Common/WoWsShipBuilder.Common.csproj.DotSettings @@ -1,6 +1,6 @@  - True - True - True - True - \ No newline at end of file + True + True + True + True + diff --git a/WoWsShipBuilder.Web/Features/TestPage/TestPage.razor b/WoWsShipBuilder.Web/Features/TestPage/TestPage.razor index 6e527fb30..de3eadff1 100644 --- a/WoWsShipBuilder.Web/Features/TestPage/TestPage.razor +++ b/WoWsShipBuilder.Web/Features/TestPage/TestPage.razor @@ -10,7 +10,7 @@ @using WoWsShipBuilder.Infrastructure.Localization @using WoWsShipBuilder.Infrastructure.Localization.Resources @using WoWsShipBuilder.Infrastructure.Utility -@using MainBatteryDataContainer = WoWsShipBuilder.DataContainers.MainBatteryDataContainer +@using MainBatteryDataContainer = WoWsShipBuilder.Features.DataContainers.MainBatteryDataContainer @inject ISettingsAccessor SettingsAccessor @inject AppSettings AppSettings @inject ILocalizer Localizer