From 13e47a36f9be525a1b23c40d2d881aa763b5ae5b Mon Sep 17 00:00:00 2001
From: Aaron Schultz <schultzaaron@web.de>
Date: Sun, 2 Feb 2020 16:23:54 +0100
Subject: [PATCH] Unused class removed + LocalizedNameAndEnglish fix

---
 .../StatisticsAnalysisTool/MainWindow.xaml    |  4 +--
 .../Models/ItemWithMarketInformation.cs       | 32 -------------------
 .../StatisticsAnalysisManager.cs              |  2 +-
 .../StatisticsAnalysisTool.csproj             |  1 -
 4 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 StatisticsAnalysisTool/StatisticsAnalysisTool/Models/ItemWithMarketInformation.cs

diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/MainWindow.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/MainWindow.xaml
index 64db0f9ec..06723b531 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/MainWindow.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/MainWindow.xaml
@@ -23,7 +23,7 @@
                 <fa:ImageAwesome x:Name="FaLoadIcon" Visibility="Hidden" Icon="CircleOutlineNotch" Spin="True" SpinDuration="4" Foreground="{StaticResource SolidColorBrush.Foreground.First}" />
             </Grid>
         </Grid>
-        <Grid x:Name="GridNormalMode" Margin="0,80,0,0" Visibility="Hidden">
+        <Grid x:Name="GridNormalMode" Margin="0,80,0,0" Visibility="Visible">
             <TextBox x:Name="TxtSearch" HorizontalAlignment="Left" Height="23" Margin="10,10,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="299" KeyUp="TxtSearch_KeyUp"/>
             <Label x:Name="LblItemCounter" Content="0/0" Height="26" Margin="0,6,10,0" VerticalAlignment="Top" Foreground="{StaticResource SolidColorBrush.Foreground.First}" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Width="110" />
 
@@ -68,7 +68,7 @@
                     (<Hyperlink NavigateUri="{Binding Path=DonateUrl}" RequestNavigate="Hyperlink_RequestNavigate"><TextBlock Foreground="{StaticResource SolidColorBrush.Hyperlink.First}" Text="Donate" /></Hyperlink>)</TextBlock>
             </Grid>
         </Grid>
-        <Grid x:Name="GridPlayerMode" Margin="0,80,0,0" Visibility="Visible">
+        <Grid x:Name="GridPlayerMode" Margin="0,80,0,0" Visibility="Hidden">
             <TextBox x:Name="TxtBoxPlayerModeUsername" Text="{Binding Path=SavedPlayerInformationName, ElementName=window}" HorizontalAlignment="Left" Height="25" Margin="10,10,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="200" KeyDown="TxtBoxPlayerModeUsername_KeyDown"/>
             <Button x:Name="BtnPlayerModeSave" Content="{Binding Path=SaveTranslation}" Style="{StaticResource ButtonStyle}" HorizontalAlignment="Left" Margin="215,10,0,0" VerticalAlignment="Top" Width="110" Height="25" Click="BtnPlayerModeSave_Click"/>
             <ScrollViewer  Margin="0,40,0,20" HorizontalScrollBarVisibility="Disabled">
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/ItemWithMarketInformation.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/ItemWithMarketInformation.cs
deleted file mode 100644
index dfedc6ab9..000000000
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/Models/ItemWithMarketInformation.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using StatisticsAnalysisTool.Common;
-using System.Windows.Media.Imaging;
-
-namespace StatisticsAnalysisTool.Models
-{
-    public class ItemWithMarketInformation
-    {
-        private readonly Item _item;
-
-        public ItemWithMarketInformation(Item item)
-        {
-            _item = item;
-        }
-
-        public string LocalizationNameVariable => _item.LocalizationNameVariable;
-        public string LocalizationDescriptionVariable => _item.LocalizationDescriptionVariable;
-        public Item.LocalizedNamesStruct? LocalizedNames => _item.LocalizedNames;
-        public int Index => _item.Index;
-        public string UniqueName => _item.UniqueName;
-        public string LocalizedName(string language = null) => _item.LocalizedName(language);
-        public string LocalizedNameAndEnglish => _item.LocalizedNameAndEnglish;
-        public BitmapImage Icon => _item.Icon;
-
-        public decimal PriceAvgCaerleon => ApiController.GetMarketStatAvgPriceFromJsonAsync(_item.UniqueName, Location.Caerleon).Result;
-        public decimal PriceAvgBridgewatch => ApiController.GetMarketStatAvgPriceFromJsonAsync(_item.UniqueName, Location.Bridgewatch).Result;
-        public decimal PriceAvgFortSterling => ApiController.GetMarketStatAvgPriceFromJsonAsync(_item.UniqueName, Location.FortSterling).Result;
-        public decimal PriceAvgLymhurst => ApiController.GetMarketStatAvgPriceFromJsonAsync(_item.UniqueName, Location.Lymhurst).Result;
-        public decimal PriceAvgMartlock => ApiController.GetMarketStatAvgPriceFromJsonAsync(_item.UniqueName, Location.Martlock).Result;
-        public decimal PriceAvgThetford => ApiController.GetMarketStatAvgPriceFromJsonAsync(_item.UniqueName, Location.Thetford).Result;
-
-    }
-}
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisManager.cs b/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisManager.cs
index 595a568b4..f5c25de61 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisManager.cs
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisManager.cs
@@ -104,7 +104,7 @@ public static async Task<List<Item>> FindItemsAsync(string searchText)
             {
                 try
                 {
-                    return Items?.FindAll(s => (s.LocalizedNameAndEnglish().ToLower().Contains(searchText.ToLower())));
+                    return Items?.FindAll(s => (s.LocalizedNameAndEnglish.ToLower().Contains(searchText.ToLower())));
                 }
                 catch (Exception ex)
                 {
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisTool.csproj b/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisTool.csproj
index d2e8a146c..b09849de3 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisTool.csproj
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/StatisticsAnalysisTool.csproj
@@ -100,7 +100,6 @@
     <Compile Include="Models\Guild.cs" />
     <Compile Include="Models\GameInfoPlayers.cs" />
     <Compile Include="Models\SearchInfos.cs" />
-    <Compile Include="Models\ItemWithMarketInformation.cs" />
     <Compile Include="Models\MarketOrder.cs" />
     <Compile Include="Models\MarketStats.cs" />
     <Compile Include="Properties\Resources.Designer.cs">