diff --git a/src/StatisticsAnalysisTool/Common/Alert.cs b/src/StatisticsAnalysisTool/Common/Alert.cs index 1525fb1bc..06d3921fd 100644 --- a/src/StatisticsAnalysisTool/Common/Alert.cs +++ b/src/StatisticsAnalysisTool/Common/Alert.cs @@ -1,5 +1,4 @@ using log4net; -using StatisticsAnalysisTool.Annotations; using StatisticsAnalysisTool.Exceptions; using StatisticsAnalysisTool.Models; using StatisticsAnalysisTool.Views; @@ -10,6 +9,7 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Threading.Tasks; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Common { diff --git a/src/StatisticsAnalysisTool/Common/ExtensionMethod.cs b/src/StatisticsAnalysisTool/Common/ExtensionMethod.cs index dd26f02cf..ec5ed66a8 100644 --- a/src/StatisticsAnalysisTool/Common/ExtensionMethod.cs +++ b/src/StatisticsAnalysisTool/Common/ExtensionMethod.cs @@ -192,7 +192,6 @@ public static double ToPositiveFromNegativeOrZero(this double healthChange) return healthChange >= 0d ? 0d : healthChange.ToPositive(); } - #endregion #region Player Objects diff --git a/src/StatisticsAnalysisTool/Common/ItemController.cs b/src/StatisticsAnalysisTool/Common/ItemController.cs index a9ef6180f..0d8c5cc0a 100644 --- a/src/StatisticsAnalysisTool/Common/ItemController.cs +++ b/src/StatisticsAnalysisTool/Common/ItemController.cs @@ -115,14 +115,13 @@ public static ulong GetMinPrice(List list) return min; } - #endregion #region Item specific public static int GetItemLevel(string uniqueName) { - if (uniqueName == null || !uniqueName.Contains("@")) + if (uniqueName == null || !uniqueName.Contains('@')) { return 0; } @@ -138,7 +137,7 @@ public static int GetItemTier(Item item) } var itemNameTierText = item.UniqueName.Split('_')[0]; - if (itemNameTierText[..1] == "T" && int.TryParse(itemNameTierText.Substring(1, 1), out var result)) + if (itemNameTierText[..1] == "T" && int.TryParse(itemNameTierText.AsSpan(1, 1), out var result)) { return result; } diff --git a/src/StatisticsAnalysisTool/Common/TextBoxHelper.cs b/src/StatisticsAnalysisTool/Common/TextBoxHelper.cs index 12caa8376..05d311b91 100644 --- a/src/StatisticsAnalysisTool/Common/TextBoxHelper.cs +++ b/src/StatisticsAnalysisTool/Common/TextBoxHelper.cs @@ -49,8 +49,10 @@ public enum EvenOddConstraint private static void DependencyPropertiesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { - if (!(d is TextBox textBox)) + if (d is not TextBox textBox) + { throw new Exception("Attached property must be used with TextBox."); + } switch (e.Property.Name) { @@ -267,13 +269,19 @@ private static void TextBox_PasteEventHandler(object sender, DataObjectPastingEv case EvenOddConstraint.OnlyEven: if (number % 2 != 0) + { e.CancelCommand(); + } + break; case EvenOddConstraint.OnlyOdd: if (number % 2 == 0) + { e.CancelCommand(); + } + break; } } @@ -291,15 +299,18 @@ private static void TextBox_PasteEventHandler(object sender, DataObjectPastingEv case EvenOddConstraint.OnlyEven: if (number % 2 != 0) + { e.CancelCommand(); + } break; case EvenOddConstraint.OnlyOdd: if (number % 2 == 0) + { e.CancelCommand(); - + } break; } @@ -320,15 +331,18 @@ private static void TextBox_PasteEventHandler(object sender, DataObjectPastingEv case EvenOddConstraint.OnlyEven: if (number % 2 != 0) + { e.CancelCommand(); + } break; case EvenOddConstraint.OnlyOdd: if (number % 2 == 0) + { e.CancelCommand(); - + } break; } @@ -353,14 +367,18 @@ private static void TextBox_PasteEventHandler(object sender, DataObjectPastingEv case EvenOddConstraint.OnlyEven: if (number % 2 != 0) + { e.CancelCommand(); + } break; case EvenOddConstraint.OnlyOdd: if (number % 2 == 0) + { e.CancelCommand(); + } break; } @@ -399,14 +417,18 @@ private static void TextBox_TextChanged(object sender, TextChangedEventArgs e) case EvenOddConstraint.OnlyEven: if (number % 2 != 0) + { textBox.Text = defaultValue; + } break; case EvenOddConstraint.OnlyOdd: if (number % 2 == 0) + { textBox.Text = defaultValue; + } break; } @@ -426,14 +448,18 @@ private static void TextBox_TextChanged(object sender, TextChangedEventArgs e) case EvenOddConstraint.OnlyEven: if (number % 2 != 0) + { textBox.Text = defaultValue; + } break; case EvenOddConstraint.OnlyOdd: if (number % 2 == 0) + { textBox.Text = defaultValue; + } break; } @@ -453,14 +479,18 @@ private static void TextBox_TextChanged(object sender, TextChangedEventArgs e) case EvenOddConstraint.OnlyEven: if (number % 2 != 0) + { textBox.Text = defaultValue; + } break; case EvenOddConstraint.OnlyOdd: if (number % 2 == 0) + { textBox.Text = defaultValue; + } break; } @@ -484,14 +514,18 @@ private static void TextBox_TextChanged(object sender, TextChangedEventArgs e) case EvenOddConstraint.OnlyEven: if (number % 2 != 0) + { textBox.Text = defaultValue; + } break; case EvenOddConstraint.OnlyOdd: if (number % 2 == 0) + { textBox.Text = defaultValue; + } break; } diff --git a/src/StatisticsAnalysisTool/Common/Utilities.cs b/src/StatisticsAnalysisTool/Common/Utilities.cs index a6bb3b3d4..6c57f68da 100644 --- a/src/StatisticsAnalysisTool/Common/Utilities.cs +++ b/src/StatisticsAnalysisTool/Common/Utilities.cs @@ -100,7 +100,6 @@ private struct FlashInfo public uint cbSize; //The size of the structure in bytes. public IntPtr hwnd; //A Handle to the Window to be Flashed. The window can be either opened or minimized. - public uint dwFlags; //The Flash Status. public uint uCount; // number of times to flash the window diff --git a/src/StatisticsAnalysisTool/Models/AllResponse.cs b/src/StatisticsAnalysisTool/Models/AllResponse.cs new file mode 100644 index 000000000..e59e8b87b --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/AllResponse.cs @@ -0,0 +1,8 @@ +namespace StatisticsAnalysisTool.Models; + +public class AllResponse +{ + public ulong Total { get; set; } + public ulong Royal { get; set; } + public ulong Outlands { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/CraftingResponse.cs b/src/StatisticsAnalysisTool/Models/CraftingResponse.cs new file mode 100644 index 000000000..9bd50097c --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/CraftingResponse.cs @@ -0,0 +1,8 @@ +namespace StatisticsAnalysisTool.Models; + +public class CraftingResponse +{ + public ulong Total { get; set; } + public ulong Royal { get; set; } + public ulong Outlands { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/DashboardObject.cs b/src/StatisticsAnalysisTool/Models/DashboardObject.cs index 8b1e0bf5a..b5b25bedb 100644 --- a/src/StatisticsAnalysisTool/Models/DashboardObject.cs +++ b/src/StatisticsAnalysisTool/Models/DashboardObject.cs @@ -1,12 +1,11 @@ -using StatisticsAnalysisTool.Annotations; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Runtime.CompilerServices; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Models { - public class DashboardObject : INotifyPropertyChanged { private double _famePerHour; diff --git a/src/StatisticsAnalysisTool/Models/DungeonStats.cs b/src/StatisticsAnalysisTool/Models/DungeonStats.cs index 053f749ad..fe8d9c2e3 100644 --- a/src/StatisticsAnalysisTool/Models/DungeonStats.cs +++ b/src/StatisticsAnalysisTool/Models/DungeonStats.cs @@ -1,7 +1,7 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Common; using System.ComponentModel; using System.Runtime.CompilerServices; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Models { @@ -137,17 +137,17 @@ public string TranslationTitle { } } - public string TranslationEnteredDungeon => LanguageController.Translation("ENTERED_DUNGEON"); - public string TranslationOpenedStandardChests => LanguageController.Translation("OPENED_STANDARD_CHESTS"); - public string TranslationOpenedUncommonChests => LanguageController.Translation("OPENED_UNCOMMON_CHESTS"); - public string TranslationOpenedRareChests => LanguageController.Translation("OPENED_RARE_CHESTS"); - public string TranslationOpenedLegendaryChests => LanguageController.Translation("OPENED_LEGENDARY_CHESTS"); - public string TranslationFame => LanguageController.Translation("FAME"); - public string TranslationReSpec => LanguageController.Translation("RESPEC"); - public string TranslationSilver => LanguageController.Translation("SILVER"); - public string TranslationAverageFame => LanguageController.Translation("AVERAGE_FAME"); - public string TranslationAverageReSpec => LanguageController.Translation("AVERAGE_RESPEC"); - public string TranslationAverageSilver => LanguageController.Translation("AVERAGE_SILVER"); + public static string TranslationEnteredDungeon => LanguageController.Translation("ENTERED_DUNGEON"); + public static string TranslationOpenedStandardChests => LanguageController.Translation("OPENED_STANDARD_CHESTS"); + public static string TranslationOpenedUncommonChests => LanguageController.Translation("OPENED_UNCOMMON_CHESTS"); + public static string TranslationOpenedRareChests => LanguageController.Translation("OPENED_RARE_CHESTS"); + public static string TranslationOpenedLegendaryChests => LanguageController.Translation("OPENED_LEGENDARY_CHESTS"); + public static string TranslationFame => LanguageController.Translation("FAME"); + public static string TranslationReSpec => LanguageController.Translation("RESPEC"); + public static string TranslationSilver => LanguageController.Translation("SILVER"); + public static string TranslationAverageFame => LanguageController.Translation("AVERAGE_FAME"); + public static string TranslationAverageReSpec => LanguageController.Translation("AVERAGE_RESPEC"); + public static string TranslationAverageSilver => LanguageController.Translation("AVERAGE_SILVER"); public event PropertyChangedEventHandler PropertyChanged; diff --git a/src/StatisticsAnalysisTool/Models/DungeonStatsFilter.cs b/src/StatisticsAnalysisTool/Models/DungeonStatsFilter.cs index 51e75c119..1c3b7bad9 100644 --- a/src/StatisticsAnalysisTool/Models/DungeonStatsFilter.cs +++ b/src/StatisticsAnalysisTool/Models/DungeonStatsFilter.cs @@ -1,10 +1,10 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Common; using StatisticsAnalysisTool.Enumerations; using StatisticsAnalysisTool.Network.Manager; using System.Collections.Generic; using System.ComponentModel; using System.Runtime.CompilerServices; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Models { @@ -17,7 +17,7 @@ public class DungeonStatsFilter : INotifyPropertyChanged private bool? _expeditionCheckbox = true; private bool? _corruptedCheckbox = true; private bool? _unknownCheckbox = true; - private List _dungeonModeFilters = new List() + private List _dungeonModeFilters = new () { DungeonMode.Solo, DungeonMode.Standard, @@ -146,20 +146,20 @@ private void RemoveDungeonMode(DungeonMode dungeonMode) } } - public string TranslationFilter => LanguageController.Translation("FILTER"); - public string TranslationSolo => LanguageController.Translation("SOLO"); - public string TranslationSoloDungeon => LanguageController.Translation("SOLO_DUNGEON"); - public string TranslationStandard => LanguageController.Translation("STANDARD"); - public string TranslationStandardDungeon => LanguageController.Translation("STANDARD_DUNGEON"); - public string TranslationAva => LanguageController.Translation("AVA"); - public string TranslationAvalonianDungeon => LanguageController.Translation("AVALONIAN_DUNGEON"); - public string TranslationHg => LanguageController.Translation("HG"); - public string TranslationHellGate => LanguageController.Translation("HELLGATE"); - public string TranslationCorrupted => LanguageController.Translation("CORRUPTED"); - public string TranslationCorruptedDungeon => LanguageController.Translation("CORRUPTED_LAIR"); - public string TranslationExped => LanguageController.Translation("EXPED"); - public string TranslationExpedition => LanguageController.Translation("EXPEDITION"); - public string TranslationUnknown => LanguageController.Translation("UNKNOWN"); + public static string TranslationFilter => LanguageController.Translation("FILTER"); + public static string TranslationSolo => LanguageController.Translation("SOLO"); + public static string TranslationSoloDungeon => LanguageController.Translation("SOLO_DUNGEON"); + public static string TranslationStandard => LanguageController.Translation("STANDARD"); + public static string TranslationStandardDungeon => LanguageController.Translation("STANDARD_DUNGEON"); + public static string TranslationAva => LanguageController.Translation("AVA"); + public static string TranslationAvalonianDungeon => LanguageController.Translation("AVALONIAN_DUNGEON"); + public static string TranslationHg => LanguageController.Translation("HG"); + public static string TranslationHellGate => LanguageController.Translation("HELLGATE"); + public static string TranslationCorrupted => LanguageController.Translation("CORRUPTED"); + public static string TranslationCorruptedDungeon => LanguageController.Translation("CORRUPTED_LAIR"); + public static string TranslationExped => LanguageController.Translation("EXPED"); + public static string TranslationExpedition => LanguageController.Translation("EXPEDITION"); + public static string TranslationUnknown => LanguageController.Translation("UNKNOWN"); public event PropertyChangedEventHandler PropertyChanged; diff --git a/src/StatisticsAnalysisTool/Models/EquipmentResponse.cs b/src/StatisticsAnalysisTool/Models/EquipmentResponse.cs new file mode 100644 index 000000000..b675a7684 --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/EquipmentResponse.cs @@ -0,0 +1,15 @@ +namespace StatisticsAnalysisTool.Models; + +public class EquipmentResponse +{ + public object MainHand { get; set; } + public object OffHand { get; set; } + public object Head { get; set; } + public object Armor { get; set; } + public object Shoes { get; set; } + public object Bag { get; set; } + public object Cape { get; set; } + public object Mount { get; set; } + public object Potion { get; set; } + public object Food { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/FiberResponse.cs b/src/StatisticsAnalysisTool/Models/FiberResponse.cs new file mode 100644 index 000000000..bd89b7f34 --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/FiberResponse.cs @@ -0,0 +1,8 @@ +namespace StatisticsAnalysisTool.Models; + +public class FiberResponse +{ + public ulong Total { get; set; } + public ulong Royal { get; set; } + public ulong Outlands { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/GameInfoPlayers.cs b/src/StatisticsAnalysisTool/Models/GameInfoPlayers.cs index 8aaa18306..9d7033402 100644 --- a/src/StatisticsAnalysisTool/Models/GameInfoPlayers.cs +++ b/src/StatisticsAnalysisTool/Models/GameInfoPlayers.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace StatisticsAnalysisTool.Models { @@ -22,94 +21,4 @@ public class GameInfoPlayersResponse public double FameRatio { get; set; } public LifetimeStatisticsResponse LifetimeStatistics { get; set; } } - - public class EquipmentResponse - { - public object MainHand { get; set; } - public object OffHand { get; set; } - public object Head { get; set; } - public object Armor { get; set; } - public object Shoes { get; set; } - public object Bag { get; set; } - public object Cape { get; set; } - public object Mount { get; set; } - public object Potion { get; set; } - public object Food { get; set; } - } - - public class PvEResponse - { - public ulong Total { get; set; } - public ulong Royal { get; set; } - public ulong Outlands { get; set; } - public ulong Hellgate { get; set; } - } - - public class FiberResponse - { - public ulong Total { get; set; } - public ulong Royal { get; set; } - public ulong Outlands { get; set; } - } - - public class HideResponse - { - public ulong Total { get; set; } - public ulong Royal { get; set; } - public ulong Outlands { get; set; } - } - - public class OreResponse - { - public ulong Total { get; set; } - public ulong Royal { get; set; } - public ulong Outlands { get; set; } - } - - public class RockResponse - { - public ulong Total { get; set; } - public ulong Royal { get; set; } - public ulong Outlands { get; set; } - } - - public class WoodResponse - { - public ulong Total { get; set; } - public ulong Royal { get; set; } - public ulong Outlands { get; set; } - } - - public class AllResponse - { - public ulong Total { get; set; } - public ulong Royal { get; set; } - public ulong Outlands { get; set; } - } - - public class GatheringResponse - { - public FiberResponse Fiber { get; set; } - public HideResponse Hide { get; set; } - public OreResponse Ore { get; set; } - public RockResponse Rock { get; set; } - public WoodResponse Wood { get; set; } - public AllResponse All { get; set; } - } - - public class CraftingResponse - { - public ulong Total { get; set; } - public ulong Royal { get; set; } - public ulong Outlands { get; set; } - } - - public class LifetimeStatisticsResponse - { - public PvEResponse PvE { get; set; } - public GatheringResponse Gathering { get; set; } - public CraftingResponse Crafting { get; set; } - public int CrystalLeague { get; set; } - public DateTime Timestamp { get; set; } - } } \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/GatheringResponse.cs b/src/StatisticsAnalysisTool/Models/GatheringResponse.cs new file mode 100644 index 000000000..a830b6365 --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/GatheringResponse.cs @@ -0,0 +1,11 @@ +namespace StatisticsAnalysisTool.Models; + +public class GatheringResponse +{ + public FiberResponse Fiber { get; set; } + public HideResponse Hide { get; set; } + public OreResponse Ore { get; set; } + public RockResponse Rock { get; set; } + public WoodResponse Wood { get; set; } + public AllResponse All { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/HideResponse.cs b/src/StatisticsAnalysisTool/Models/HideResponse.cs new file mode 100644 index 000000000..bb098ed91 --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/HideResponse.cs @@ -0,0 +1,8 @@ +namespace StatisticsAnalysisTool.Models; + +public class HideResponse +{ + public ulong Total { get; set; } + public ulong Royal { get; set; } + public ulong Outlands { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/LifetimeStatisticsResponse.cs b/src/StatisticsAnalysisTool/Models/LifetimeStatisticsResponse.cs new file mode 100644 index 000000000..303214ff0 --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/LifetimeStatisticsResponse.cs @@ -0,0 +1,12 @@ +using System; + +namespace StatisticsAnalysisTool.Models; + +public class LifetimeStatisticsResponse +{ + public PvEResponse PvE { get; set; } + public GatheringResponse Gathering { get; set; } + public CraftingResponse Crafting { get; set; } + public int CrystalLeague { get; set; } + public DateTime Timestamp { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/LoggingFilterObject.cs b/src/StatisticsAnalysisTool/Models/LoggingFilterObject.cs index 79bc04734..a7868965b 100644 --- a/src/StatisticsAnalysisTool/Models/LoggingFilterObject.cs +++ b/src/StatisticsAnalysisTool/Models/LoggingFilterObject.cs @@ -1,9 +1,9 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common.UserSettings; +using StatisticsAnalysisTool.Common.UserSettings; using StatisticsAnalysisTool.Enumerations; using StatisticsAnalysisTool.Network.Manager; using System.ComponentModel; using System.Runtime.CompilerServices; +using StatisticsAnalysisTool.Properties; using StatisticsAnalysisTool.ViewModels; namespace StatisticsAnalysisTool.Models diff --git a/src/StatisticsAnalysisTool/Models/MainStatObject.cs b/src/StatisticsAnalysisTool/Models/MainStatObject.cs index ee1431efe..370d3782b 100644 --- a/src/StatisticsAnalysisTool/Models/MainStatObject.cs +++ b/src/StatisticsAnalysisTool/Models/MainStatObject.cs @@ -1,9 +1,9 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Common; using StatisticsAnalysisTool.Enumerations; using System.ComponentModel; using System.Runtime.CompilerServices; using System.Windows; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Models { @@ -12,7 +12,7 @@ public class MainStatObject : INotifyPropertyChanged private CityFaction _cityFaction = CityFaction.Unknown; private double _value; private double _valuePerHour; - private Visibility visibility = Visibility.Hidden; + private Visibility _visibility = Visibility.Hidden; public CityFaction CityFaction { get => _cityFaction; @@ -43,15 +43,15 @@ public double ValuePerHour { } public Visibility Visibility { - get => visibility; + get => _visibility; set { - visibility = value; + _visibility = value; OnPropertyChanged(); } } - public string TranslationTotalFactionPoints => LanguageController.Translation("TOTAL_FACTION_POINTS"); + public static string TranslationTotalFactionPoints => LanguageController.Translation("TOTAL_FACTION_POINTS"); public event PropertyChangedEventHandler PropertyChanged; diff --git a/src/StatisticsAnalysisTool/Models/MarketHistoriesResponse.cs b/src/StatisticsAnalysisTool/Models/MarketHistoriesResponse.cs index 1eef490d0..fb8b0bd57 100644 --- a/src/StatisticsAnalysisTool/Models/MarketHistoriesResponse.cs +++ b/src/StatisticsAnalysisTool/Models/MarketHistoriesResponse.cs @@ -1,6 +1,6 @@ -using StatisticsAnalysisTool.Annotations; -using System.Collections.Generic; +using System.Collections.Generic; using System.Text.Json.Serialization; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Models { diff --git a/src/StatisticsAnalysisTool/Models/NetworkModel/DungeonCloseTimer.cs b/src/StatisticsAnalysisTool/Models/NetworkModel/DungeonCloseTimer.cs index c420b8347..18315164d 100644 --- a/src/StatisticsAnalysisTool/Models/NetworkModel/DungeonCloseTimer.cs +++ b/src/StatisticsAnalysisTool/Models/NetworkModel/DungeonCloseTimer.cs @@ -1,10 +1,10 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Common; using System; using System.ComponentModel; using System.Runtime.CompilerServices; using System.Windows; using System.Windows.Input; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Models.NetworkModel { @@ -75,9 +75,9 @@ private void PerformRefreshDungeonTimer() public ICommand RefreshDungeonTimer => _refreshDungeonTimer ??= new CommandHandler(PerformRefreshDungeonTimer, true); - public string TranslationSafe => LanguageController.Translation("SAFE"); - public string TranslationDungeonTimer => LanguageController.Translation("DUNGEON_TIMER"); - public string TranslationResetDungeonTimer => LanguageController.Translation("RESET_DUNGEON_TIMER"); + public static string TranslationSafe => LanguageController.Translation("SAFE"); + public static string TranslationDungeonTimer => LanguageController.Translation("DUNGEON_TIMER"); + public static string TranslationResetDungeonTimer => LanguageController.Translation("RESET_DUNGEON_TIMER"); public event PropertyChangedEventHandler PropertyChanged; diff --git a/src/StatisticsAnalysisTool/Models/NetworkModel/PartyMemberCircle.cs b/src/StatisticsAnalysisTool/Models/NetworkModel/PartyMemberCircle.cs index c0da37830..62b7ffedd 100644 --- a/src/StatisticsAnalysisTool/Models/NetworkModel/PartyMemberCircle.cs +++ b/src/StatisticsAnalysisTool/Models/NetworkModel/PartyMemberCircle.cs @@ -1,7 +1,7 @@ -using StatisticsAnalysisTool.Annotations; -using System; +using System; using System.ComponentModel; using System.Runtime.CompilerServices; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Models.NetworkModel { diff --git a/src/StatisticsAnalysisTool/Models/OreResponse.cs b/src/StatisticsAnalysisTool/Models/OreResponse.cs new file mode 100644 index 000000000..f52def22e --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/OreResponse.cs @@ -0,0 +1,8 @@ +namespace StatisticsAnalysisTool.Models; + +public class OreResponse +{ + public ulong Total { get; set; } + public ulong Royal { get; set; } + public ulong Outlands { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/PvEResponse.cs b/src/StatisticsAnalysisTool/Models/PvEResponse.cs new file mode 100644 index 000000000..98e79db95 --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/PvEResponse.cs @@ -0,0 +1,9 @@ +namespace StatisticsAnalysisTool.Models; + +public class PvEResponse +{ + public ulong Total { get; set; } + public ulong Royal { get; set; } + public ulong Outlands { get; set; } + public ulong Hellgate { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/RockResponse.cs b/src/StatisticsAnalysisTool/Models/RockResponse.cs new file mode 100644 index 000000000..4f5818c5e --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/RockResponse.cs @@ -0,0 +1,8 @@ +namespace StatisticsAnalysisTool.Models; + +public class RockResponse +{ + public ulong Total { get; set; } + public ulong Royal { get; set; } + public ulong Outlands { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/TaskTextObject.cs b/src/StatisticsAnalysisTool/Models/TaskTextObject.cs index efa560780..4e8571535 100644 --- a/src/StatisticsAnalysisTool/Models/TaskTextObject.cs +++ b/src/StatisticsAnalysisTool/Models/TaskTextObject.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel; using System.Runtime.CompilerServices; -using StatisticsAnalysisTool.Annotations; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Models { @@ -114,5 +114,5 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } - }; + } } \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Models/TopLooterObject.cs b/src/StatisticsAnalysisTool/Models/TopLooterObject.cs index 5681e1e96..4814b32a7 100644 --- a/src/StatisticsAnalysisTool/Models/TopLooterObject.cs +++ b/src/StatisticsAnalysisTool/Models/TopLooterObject.cs @@ -1,6 +1,6 @@ -using StatisticsAnalysisTool.Annotations; -using System.ComponentModel; +using System.ComponentModel; using System.Runtime.CompilerServices; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Models { diff --git a/src/StatisticsAnalysisTool/Models/WoodResponse.cs b/src/StatisticsAnalysisTool/Models/WoodResponse.cs new file mode 100644 index 000000000..3b705124b --- /dev/null +++ b/src/StatisticsAnalysisTool/Models/WoodResponse.cs @@ -0,0 +1,8 @@ +namespace StatisticsAnalysisTool.Models; + +public class WoodResponse +{ + public ulong Total { get; set; } + public ulong Royal { get; set; } + public ulong Outlands { get; set; } +} \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Network/CountUpTimer.cs b/src/StatisticsAnalysisTool/Network/CountUpTimer.cs index 2216db812..46ac0a58e 100644 --- a/src/StatisticsAnalysisTool/Network/CountUpTimer.cs +++ b/src/StatisticsAnalysisTool/Network/CountUpTimer.cs @@ -171,7 +171,7 @@ public void Reset() CurrentTimerUpdate(); } - private void RemoveValueFromValuePerHour(List valueList, double perHourValue) + private static void RemoveValueFromValuePerHour(List valueList, double perHourValue) { var removeList = valueList.Where(x => x.DateTime < DateTime.UtcNow.AddHours(-1)); @@ -215,7 +215,6 @@ private void CurrentTimerUpdate() factionPointStat.CityFaction = _currentCityFaction; factionPointStat.ValuePerHour = Utilities.GetValuePerHourToDouble(_factionPointsPerHourValue, (DateTime.UtcNow - _startTime).TotalSeconds); factionPointStat.Value = _totalGainedFactionPointsInSession; - } _mainWindowViewModel.DashboardObject.FamePerHour = Utilities.GetValuePerHourToDouble(_famePerHourValue, (DateTime.UtcNow - _startTime).TotalSeconds); diff --git a/src/StatisticsAnalysisTool/Network/Handler/MightFavorPointsEventHandler.cs b/src/StatisticsAnalysisTool/Network/Handler/MightFavorPointsEventHandler.cs index 1415944f9..c91e7d983 100644 --- a/src/StatisticsAnalysisTool/Network/Handler/MightFavorPointsEventHandler.cs +++ b/src/StatisticsAnalysisTool/Network/Handler/MightFavorPointsEventHandler.cs @@ -17,7 +17,6 @@ public MightFavorPointsEventHandler(TrackingController trackingController) public async Task OnActionAsync(MightFavorPointsEvent value) { - if (_trackingController.IsTrackingAllowedByMainCharacter()) { _trackingController.StatisticController?.AddValue(ValueType.Might, value.Might.DoubleValue); diff --git a/src/StatisticsAnalysisTool/Network/Manager/DungeonController.cs b/src/StatisticsAnalysisTool/Network/Manager/DungeonController.cs index 7cf4ac2f7..553f4999e 100644 --- a/src/StatisticsAnalysisTool/Network/Manager/DungeonController.cs +++ b/src/StatisticsAnalysisTool/Network/Manager/DungeonController.cs @@ -59,7 +59,7 @@ public async Task AddDungeonAsync(MapType mapType, Guid? mapGuid) } } // Add new dungeon - else if (IsDungeonCluster(mapType, mapGuid) && !ExistDungeon(_lastMapGuid) || IsDungeonCluster(mapType, mapGuid) && mapType is MapType.CorruptedDungeon or MapType.HellGate) + else if ((IsDungeonCluster(mapType, mapGuid) && !ExistDungeon(_lastMapGuid)) || (IsDungeonCluster(mapType, mapGuid) && mapType is MapType.CorruptedDungeon or MapType.HellGate)) { UpdateDungeonSaveTimerUi(mapType); diff --git a/src/StatisticsAnalysisTool/Network/Manager/EntityController.cs b/src/StatisticsAnalysisTool/Network/Manager/EntityController.cs index aab8ad3ed..752d12b76 100644 --- a/src/StatisticsAnalysisTool/Network/Manager/EntityController.cs +++ b/src/StatisticsAnalysisTool/Network/Manager/EntityController.cs @@ -255,7 +255,7 @@ public void AddSpellEffect(SpellEffect spell) { Application.Current.Dispatcher.Invoke(() => { - if (_spellEffects.Any(x => x == null || x.CauserId.Equals(spell.CauserId) && x.SpellIndex.Equals(spell.SpellIndex))) + if (_spellEffects.Any(x => x == null || (x.CauserId.Equals(spell.CauserId) && x.SpellIndex.Equals(spell.SpellIndex)))) { return; } diff --git a/src/StatisticsAnalysisTool/Network/Manager/ITrackingController.cs b/src/StatisticsAnalysisTool/Network/Manager/ITrackingController.cs index cbca23474..634330515 100644 --- a/src/StatisticsAnalysisTool/Network/Manager/ITrackingController.cs +++ b/src/StatisticsAnalysisTool/Network/Manager/ITrackingController.cs @@ -36,6 +36,5 @@ void NotificationUiFilteringAsync() { } void AddFilterType(NotificationType notificationType) { } void RemoveFilterType(NotificationType notificationType) { } - } } \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/Network/Manager/LootController.cs b/src/StatisticsAnalysisTool/Network/Manager/LootController.cs index cd93abc10..1120b2cc6 100644 --- a/src/StatisticsAnalysisTool/Network/Manager/LootController.cs +++ b/src/StatisticsAnalysisTool/Network/Manager/LootController.cs @@ -141,7 +141,6 @@ private async Task LootMergeAsync() var discoveredLoot = _discoveredLoot.FirstOrDefault(x => x.ObjectId == lootedObject.Key); if (discoveredLoot != null) { - var loot = new Loot() { LootedBody = discoveredLoot.BodyName, diff --git a/src/StatisticsAnalysisTool/Network/Manager/StatisticController.cs b/src/StatisticsAnalysisTool/Network/Manager/StatisticController.cs index f95d17f86..67c54bb3d 100644 --- a/src/StatisticsAnalysisTool/Network/Manager/StatisticController.cs +++ b/src/StatisticsAnalysisTool/Network/Manager/StatisticController.cs @@ -176,13 +176,11 @@ public static SolidColorPaint GetValueTypeBrush(ValueType valueType, bool transp private double GetGainedValue(ValueType type, double gainedValue) { - switch (type) + return type switch { - case ValueType.ReSpec: - return Utilities.AddValue(gainedValue, _lastReSpecValue, out _lastReSpecValue); - default: - return gainedValue; - } + ValueType.ReSpec => Utilities.AddValue(gainedValue, _lastReSpecValue, out _lastReSpecValue), + _ => gainedValue + }; } private class DashboardHourObject diff --git a/src/StatisticsAnalysisTool/Network/Manager/TrackingController.cs b/src/StatisticsAnalysisTool/Network/Manager/TrackingController.cs index 494e8c9b8..00393ec32 100644 --- a/src/StatisticsAnalysisTool/Network/Manager/TrackingController.cs +++ b/src/StatisticsAnalysisTool/Network/Manager/TrackingController.cs @@ -336,7 +336,7 @@ private bool IsRemovesUnnecessaryNotificationsActiveAllowed(int waitTimeInSecond #region Main tracking character name - public void SetMainCharacterNameForTracking(string currentUsername) + public static void SetMainCharacterNameForTracking(string currentUsername) { if (SettingsController.CurrentSettings.MainTrackingCharacterName != null) { diff --git a/src/StatisticsAnalysisTool/Network/Notification/DamageMeterFragment.cs b/src/StatisticsAnalysisTool/Network/Notification/DamageMeterFragment.cs index 355fb3850..b1b36d567 100644 --- a/src/StatisticsAnalysisTool/Network/Notification/DamageMeterFragment.cs +++ b/src/StatisticsAnalysisTool/Network/Notification/DamageMeterFragment.cs @@ -1,9 +1,9 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Common; using StatisticsAnalysisTool.Models; using System; using System.ComponentModel; using System.Runtime.CompilerServices; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Network.Notification { diff --git a/src/StatisticsAnalysisTool/Network/Notification/DungeonEventObjectFragment.cs b/src/StatisticsAnalysisTool/Network/Notification/DungeonEventObjectFragment.cs index 42c4c4e30..7b00ada7b 100644 --- a/src/StatisticsAnalysisTool/Network/Notification/DungeonEventObjectFragment.cs +++ b/src/StatisticsAnalysisTool/Network/Notification/DungeonEventObjectFragment.cs @@ -1,10 +1,10 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Common; using StatisticsAnalysisTool.Enumerations; using System; using System.ComponentModel; using System.Runtime.CompilerServices; using System.Text.Json.Serialization; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Network.Notification { @@ -126,31 +126,31 @@ public bool IsChestOpen public string Hash => $"{Id}{UniqueName}"; [JsonIgnore] - public string TranslationStandard => LanguageController.Translation("STANDARD"); + public static string TranslationStandard => LanguageController.Translation("STANDARD"); [JsonIgnore] - public string TranslationUncommon => LanguageController.Translation("UNCOMMON"); + public static string TranslationUncommon => LanguageController.Translation("UNCOMMON"); [JsonIgnore] - public string TranslationRare => LanguageController.Translation("RARE"); + public static string TranslationRare => LanguageController.Translation("RARE"); [JsonIgnore] - public string TranslationLegendary => LanguageController.Translation("LEGENDARY"); + public static string TranslationLegendary => LanguageController.Translation("LEGENDARY"); [JsonIgnore] - public string TranslationBossChest => LanguageController.Translation("BOSS_CHEST"); + public static string TranslationBossChest => LanguageController.Translation("BOSS_CHEST"); [JsonIgnore] - public string TranslationBookChest => LanguageController.Translation("BOOK_CHEST"); + public static string TranslationBookChest => LanguageController.Translation("BOOK_CHEST"); [JsonIgnore] - public string TranslationCombatBuff => LanguageController.Translation("COMBAT_BUFF"); + public static string TranslationCombatBuff => LanguageController.Translation("COMBAT_BUFF"); [JsonIgnore] - public string TranslationSilverShrine => LanguageController.Translation("SILVER_SHRINE"); + public static string TranslationSilverShrine => LanguageController.Translation("SILVER_SHRINE"); [JsonIgnore] - public string TranslationFameShrine => LanguageController.Translation("FAME_SHRINE"); + public static string TranslationFameShrine => LanguageController.Translation("FAME_SHRINE"); public event PropertyChangedEventHandler PropertyChanged; diff --git a/src/StatisticsAnalysisTool/Network/Notification/DungeonNotificationFragment.cs b/src/StatisticsAnalysisTool/Network/Notification/DungeonNotificationFragment.cs index b4feac3e2..3c616f666 100644 --- a/src/StatisticsAnalysisTool/Network/Notification/DungeonNotificationFragment.cs +++ b/src/StatisticsAnalysisTool/Network/Notification/DungeonNotificationFragment.cs @@ -1,5 +1,4 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Common; using StatisticsAnalysisTool.Enumerations; using StatisticsAnalysisTool.GameData; using StatisticsAnalysisTool.Models.NetworkModel; @@ -11,6 +10,7 @@ using System.Runtime.CompilerServices; using System.Text.Json.Serialization; using System.Windows; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Network.Notification { @@ -255,7 +255,8 @@ public bool DiedInDungeon } } - public string DiedMessage { + public string DiedMessage + { get => _diedMessage; set { @@ -736,28 +737,28 @@ public bool? IsSelectedForDeletion } } - [JsonIgnore] public string TranslationSelectToDelete => LanguageController.Translation("SELECT_TO_DELETE"); - [JsonIgnore] public string TranslationDungeonFame => LanguageController.Translation("DUNGEON_FAME"); - [JsonIgnore] public string TranslationDungeonReSpec => LanguageController.Translation("DUNGEON_RESPEC"); - [JsonIgnore] public string TranslationDungeonSilver => LanguageController.Translation("DUNGEON_SILVER"); - [JsonIgnore] public string TranslationDungeonFamePerHour => LanguageController.Translation("DUNGEON_FAME_PER_HOUR"); - [JsonIgnore] public string TranslationDungeonReSpecPerHour => LanguageController.Translation("DUNGEON_RESPEC_PER_HOUR"); - [JsonIgnore] public string TranslationDungeonSilverPerHour => LanguageController.Translation("DUNGEON_SILVER_PER_HOUR"); - [JsonIgnore] public string TranslationDungeonRunTime => LanguageController.Translation("DUNGEON_RUN_TIME"); - [JsonIgnore] public string TranslationNumberOfDungeonFloors => LanguageController.Translation("NUMBER_OF_DUNGEON_FLOORS"); - [JsonIgnore] public string TranslationExpedition => LanguageController.Translation("EXPEDITION"); - [JsonIgnore] public string TranslationSolo => LanguageController.Translation("SOLO"); - [JsonIgnore] public string TranslationStandard => LanguageController.Translation("STANDARD"); - [JsonIgnore] public string TranslationAvalon => LanguageController.Translation("AVALON"); - [JsonIgnore] public string TranslationUnknown => LanguageController.Translation("UNKNOWN"); - [JsonIgnore] public string TranslationFactionFlags => LanguageController.Translation("FACTION_FLAGS"); - [JsonIgnore] public string TranslationFactionFlagsPerHour => LanguageController.Translation("FACTION_FLAGS_PER_HOUR"); - [JsonIgnore] public string TranslationFactionCoins => LanguageController.Translation("FACTION_COINS"); - [JsonIgnore] public string TranslationFactionCoinsPerHour => LanguageController.Translation("FACTION_COINS_PER_HOUR"); - [JsonIgnore] public string TranslationMight => LanguageController.Translation("MIGHT"); - [JsonIgnore] public string TranslationMightPerHour => LanguageController.Translation("MIGHT_PER_HOUR"); - [JsonIgnore] public string TranslationFavor => LanguageController.Translation("FAVOR"); - [JsonIgnore] public string TranslationFavorPerHour => LanguageController.Translation("FAVOR_PER_HOUR"); + [JsonIgnore] public static string TranslationSelectToDelete => LanguageController.Translation("SELECT_TO_DELETE"); + [JsonIgnore] public static string TranslationDungeonFame => LanguageController.Translation("DUNGEON_FAME"); + [JsonIgnore] public static string TranslationDungeonReSpec => LanguageController.Translation("DUNGEON_RESPEC"); + [JsonIgnore] public static string TranslationDungeonSilver => LanguageController.Translation("DUNGEON_SILVER"); + [JsonIgnore] public static string TranslationDungeonFamePerHour => LanguageController.Translation("DUNGEON_FAME_PER_HOUR"); + [JsonIgnore] public static string TranslationDungeonReSpecPerHour => LanguageController.Translation("DUNGEON_RESPEC_PER_HOUR"); + [JsonIgnore] public static string TranslationDungeonSilverPerHour => LanguageController.Translation("DUNGEON_SILVER_PER_HOUR"); + [JsonIgnore] public static string TranslationDungeonRunTime => LanguageController.Translation("DUNGEON_RUN_TIME"); + [JsonIgnore] public static string TranslationNumberOfDungeonFloors => LanguageController.Translation("NUMBER_OF_DUNGEON_FLOORS"); + [JsonIgnore] public static string TranslationExpedition => LanguageController.Translation("EXPEDITION"); + [JsonIgnore] public static string TranslationSolo => LanguageController.Translation("SOLO"); + [JsonIgnore] public static string TranslationStandard => LanguageController.Translation("STANDARD"); + [JsonIgnore] public static string TranslationAvalon => LanguageController.Translation("AVALON"); + [JsonIgnore] public static string TranslationUnknown => LanguageController.Translation("UNKNOWN"); + [JsonIgnore] public static string TranslationFactionFlags => LanguageController.Translation("FACTION_FLAGS"); + [JsonIgnore] public static string TranslationFactionFlagsPerHour => LanguageController.Translation("FACTION_FLAGS_PER_HOUR"); + [JsonIgnore] public static string TranslationFactionCoins => LanguageController.Translation("FACTION_COINS"); + [JsonIgnore] public static string TranslationFactionCoinsPerHour => LanguageController.Translation("FACTION_COINS_PER_HOUR"); + [JsonIgnore] public static string TranslationMight => LanguageController.Translation("MIGHT"); + [JsonIgnore] public static string TranslationMightPerHour => LanguageController.Translation("MIGHT_PER_HOUR"); + [JsonIgnore] public static string TranslationFavor => LanguageController.Translation("FAVOR"); + [JsonIgnore] public static string TranslationFavorPerHour => LanguageController.Translation("FAVOR_PER_HOUR"); public event PropertyChangedEventHandler PropertyChanged; diff --git a/src/StatisticsAnalysisTool/Network/Notification/TrackingNotification.cs b/src/StatisticsAnalysisTool/Network/Notification/TrackingNotification.cs index 8be9870bf..f97dab703 100644 --- a/src/StatisticsAnalysisTool/Network/Notification/TrackingNotification.cs +++ b/src/StatisticsAnalysisTool/Network/Notification/TrackingNotification.cs @@ -1,16 +1,16 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Common; using StatisticsAnalysisTool.Enumerations; using System; using System.ComponentModel; using System.Runtime.CompilerServices; using System.Windows; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.Network.Notification { public class TrackingNotification : INotifyPropertyChanged { - private const int _setTypesMaxTries = 3; + private const int SetTypesMaxTries = 3; private NotificationType _type; private Visibility _visibility; @@ -60,7 +60,7 @@ public Visibility Visibility public void SetType(bool forceSetType = false) { - if (Type == NotificationType.Unknown && _trySetTypeCounter <= _setTypesMaxTries || forceSetType) + if ((Type == NotificationType.Unknown && _trySetTypeCounter <= SetTypesMaxTries) || forceSetType) { Type = GetNotificationType(ItemController.GetItemType(_itemIndex)); } diff --git a/src/StatisticsAnalysisTool/Properties/Annotations.cs b/src/StatisticsAnalysisTool/Properties/Annotations.cs index 112ff2931..df2fb5fc8 100644 --- a/src/StatisticsAnalysisTool/Properties/Annotations.cs +++ b/src/StatisticsAnalysisTool/Properties/Annotations.cs @@ -24,7 +24,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // ReSharper disable InheritdocConsiderUsage -#pragma warning disable 1591 // ReSharper disable UnusedMember.Global // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedAutoPropertyAccessor.Global @@ -32,7 +31,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // ReSharper disable MemberCanBeProtected.Global // ReSharper disable InconsistentNaming -namespace StatisticsAnalysisTool.Annotations +namespace StatisticsAnalysisTool.Properties { /// /// Indicates that the value of the marked element could be null sometimes, diff --git a/src/StatisticsAnalysisTool/ViewModels/DialogWindowViewModel.cs b/src/StatisticsAnalysisTool/ViewModels/DialogWindowViewModel.cs index 30e002ca9..1f5e7b462 100644 --- a/src/StatisticsAnalysisTool/ViewModels/DialogWindowViewModel.cs +++ b/src/StatisticsAnalysisTool/ViewModels/DialogWindowViewModel.cs @@ -1,7 +1,7 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Models; +using StatisticsAnalysisTool.Models; using System.ComponentModel; using System.Runtime.CompilerServices; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.ViewModels { diff --git a/src/StatisticsAnalysisTool/ViewModels/FooterViewModel.cs b/src/StatisticsAnalysisTool/ViewModels/FooterViewModel.cs index b1ae88c64..5f9d3dad8 100644 --- a/src/StatisticsAnalysisTool/ViewModels/FooterViewModel.cs +++ b/src/StatisticsAnalysisTool/ViewModels/FooterViewModel.cs @@ -1,7 +1,6 @@ using System.ComponentModel; using System.Reflection; using System.Runtime.CompilerServices; -using StatisticsAnalysisTool.Annotations; using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.ViewModels @@ -21,6 +20,5 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); } - } } \ No newline at end of file diff --git a/src/StatisticsAnalysisTool/ViewModels/MainWindowViewModel.cs b/src/StatisticsAnalysisTool/ViewModels/MainWindowViewModel.cs index 15551fd19..525b9be7d 100644 --- a/src/StatisticsAnalysisTool/ViewModels/MainWindowViewModel.cs +++ b/src/StatisticsAnalysisTool/ViewModels/MainWindowViewModel.cs @@ -3,7 +3,6 @@ using LiveChartsCore.SkiaSharpView; using log4net; using Microsoft.Win32; -using StatisticsAnalysisTool.Annotations; using StatisticsAnalysisTool.Common; using StatisticsAnalysisTool.Common.UserSettings; using StatisticsAnalysisTool.Enumerations; diff --git a/src/StatisticsAnalysisTool/ViewModels/PlayerInformationViewModel.cs b/src/StatisticsAnalysisTool/ViewModels/PlayerInformationViewModel.cs index e86935fb0..e266df5bb 100644 --- a/src/StatisticsAnalysisTool/ViewModels/PlayerInformationViewModel.cs +++ b/src/StatisticsAnalysisTool/ViewModels/PlayerInformationViewModel.cs @@ -1,5 +1,4 @@ -using StatisticsAnalysisTool.Annotations; -using StatisticsAnalysisTool.Common; +using StatisticsAnalysisTool.Common; using StatisticsAnalysisTool.Common.UserSettings; using StatisticsAnalysisTool.Models; using System; @@ -7,6 +6,7 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Threading.Tasks; +using StatisticsAnalysisTool.Properties; namespace StatisticsAnalysisTool.ViewModels { diff --git a/src/StatisticsAnalysisTool/Views/ItemWindow.xaml.cs b/src/StatisticsAnalysisTool/Views/ItemWindow.xaml.cs index 42f0d6d71..ed09b2a6c 100644 --- a/src/StatisticsAnalysisTool/Views/ItemWindow.xaml.cs +++ b/src/StatisticsAnalysisTool/Views/ItemWindow.xaml.cs @@ -10,7 +10,6 @@ /// public partial class ItemWindow { - private readonly ItemWindowViewModel _itemWindowViewModel; public ItemWindow(Item item) diff --git a/src/StatisticsAnalysisTool/Views/MainWindow.xaml.cs b/src/StatisticsAnalysisTool/Views/MainWindow.xaml.cs index 8085ff84e..072159954 100644 --- a/src/StatisticsAnalysisTool/Views/MainWindow.xaml.cs +++ b/src/StatisticsAnalysisTool/Views/MainWindow.xaml.cs @@ -128,7 +128,5 @@ private void ToolTasksOpenClose_PreviewMouseDown(object sender, RoutedEventArgs { _mainWindowViewModel?.SwitchToolTasksState(); } - - } }