Bug Fixes and Improvements

- Added OP.GG (ARAM, URF, NORMAL) - Added skill path and skill order (U.GG & OP.GG) - Added Rune view - Added Spell view - Fixed some async problems - Fixed crashes caused by NullException in many places XD - Runes and spells are now imported upon selection, rather than upon locking the champion - Getting ready for item set importer
Rokuazery · May 10, 2023 · 3b03f84 · 3b03f84
1 parent 2632e2e
commit 3b03f84
Show file tree

Hide file tree

Showing 55 changed files with 1,699 additions and 466 deletions.
diff --git a/LoL Assist/BuildEditorWindow.xaml b/LoL Assist/BuildEditorWindow.xaml
@@ -97,16 +97,16 @@
                     </StackPanel>
 
                     <StackPanel Margin="10, 5">
-                        <Button Template="{DynamicResource FlatStyleButton}" Grid.Column="1" x:Name="ClearDefaultSourceBtn" Height="23" Command="{Binding Path=ClearDefaultSourceCommand}"
+                        <Button Template="{DynamicResource FlatStyleButton}" Grid.Column="1" x:Name="ClearDefaultSourceBtn" Command="{Binding Path=ClearDefaultSourceCommand}"
                         IsEnabled="{Binding ElementName=GameModeList, Path=SelectedItem, Converter={StaticResource ItemToBoolConverter}}" Content="Clear Current Default Source"/>
 
-                        <Button Template="{DynamicResource FlatStyleButton}" Margin="0,10,0,0" x:Name="SetDefaultBtn" Height="23" Command="{Binding Path=SetAsDefaultCommand}"
+                        <Button Template="{DynamicResource FlatStyleButton}" Margin="0,10,0,0" x:Name="SetDefaultBtn" Command="{Binding Path=SetAsDefaultCommand}"
                         IsEnabled="{Binding ElementName=BuildNameList, Path=SelectedIndex, Converter={StaticResource IndexToBoolConverter}}" Content="Set as Default Source"/>
 
-                        <Button Template="{DynamicResource FlatStyleButton}"  Margin="0,10,0,10" x:Name="SaveBtn" Height="23" Command="{Binding Path=SaveCommand}"
+                        <Button Template="{DynamicResource FlatStyleButton}"  Margin="0,10,0,10" x:Name="SaveBtn" Command="{Binding Path=SaveCommand}"
                         IsEnabled="{Binding ElementName=BuildNameList, Path=SelectedIndex, Converter={StaticResource IndexToBoolConverter}}" Content="Save Config"/>
 
-                        <Button Template="{DynamicResource FlatStyleButton}" x:Name="DeleteBtn" Height="23" Click="DeleteBtn_Click"
+                        <Button Template="{DynamicResource FlatStyleButton}" x:Name="DeleteBtn" Click="DeleteBtn_Click"
                         IsEnabled="{Binding ElementName=BuildNameList, Path=SelectedIndex, Converter={StaticResource IndexToBoolConverter}}" Content="Delete Config"/>
 
                         <TextBlock Text="{Binding Path=WarningTxt}" Foreground="#E74856" HorizontalAlignment="Center"/>
@@ -283,8 +283,8 @@
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="1*"/>
                     </Grid.ColumnDefinitions>
-                    <Button x:Name="CancelImportBtn" Template="{DynamicResource FlatStyleButton}" Height="23" Content="Cancel" Margin="0,0,2.5,0" Click="CancelImportBtn_Click"/>
-                    <Button x:Name="ImportBtn" Grid.Column="1" Margin="2.5,0,0,0" Template="{DynamicResource FlatStyleButton}" Height="23" Content="Import" Click="ImportBtn_Click"/>
+                    <Button x:Name="CancelImportBtn" Template="{DynamicResource FlatStyleButton}" Content="Cancel" Margin="0,0,2.5,0" Click="CancelImportBtn_Click"/>
+                    <Button x:Name="ImportBtn" Grid.Column="1" Margin="2.5,0,0,0" Template="{DynamicResource FlatStyleButton}" Content="Import" Click="ImportBtn_Click"/>
                 </Grid>
             </StackPanel>
         </Grid>

diff --git a/LoL Assist/BuildEditorWindow.xaml.cs b/LoL Assist/BuildEditorWindow.xaml.cs
@@ -11,6 +11,7 @@
 using System.IO;
 using System;
 using LoLA;
+using LoLA.DataProviders;
 
 namespace LoL_Assist_WAPP
 {

diff --git a/LoL Assist/Converters/ProviderToAvailabilityConverter.cs b/LoL Assist/Converters/ProviderToAvailabilityConverter.cs
@@ -0,0 +1,36 @@
+using LoLA.Data.Enums;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace LoL_Assist_WAPP.Converters
+{
+    public class ProviderToAvailabilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var provider = (Provider)value;
+            switch (provider)
+            {
+                case Provider.UGG:
+                    return "NORMAL - ARAM";
+                case Provider.OPGG:
+                    return "NORMAL - ARAM - URF";
+                case Provider.METAsrc:
+                    return "NORMAL - ARAM - ARURF - URF";
+                case Provider.Local:
+                    return null;
+            }
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/LoL Assist/Converters/ProviderToImageConverter.cs b/LoL Assist/Converters/ProviderToImageConverter.cs
@@ -0,0 +1,36 @@
+using LoL_Assist_WAPP.Utils;
+using LoLA.Data.Enums;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace LoL_Assist_WAPP.Converters
+{
+    public class ProviderToImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var provider = (Provider)value;
+            switch (provider)
+            {
+                case Provider.UGG:
+                    return Helper.ImageSrc("ugg");
+                case Provider.OPGG:
+                    return Helper.ImageSrc("opgg");
+                case Provider.METAsrc:
+                    return Helper.ImageSrc("metasrc");
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/LoL Assist/Converters/ProviderToNameConverter.cs b/LoL Assist/Converters/ProviderToNameConverter.cs
@@ -0,0 +1,36 @@
+using LoLA.Data.Enums;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace LoL_Assist_WAPP.Converters
+{
+    public class ProviderToNameConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var provider = (Provider)value;
+            switch(provider)
+            {
+                case Provider.UGG:
+                    return "U.GG";
+                case Provider.OPGG:
+                    return "OP.GG";
+                case Provider.METAsrc:
+                    return "METASrc.com";
+                case Provider.Local:
+                    return "Local";
+            }
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/LoL Assist/Converters/RoleImageConverter.cs b/LoL Assist/Converters/RoleImageConverter.cs
@@ -14,9 +14,15 @@ public class RoleImageConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var role = (Role)value;
-            if(role == Role.RECOMENDED) return $"{ConfigModel.RESOURCE_PATH}fill.png";
-            return $"{ConfigModel.RESOURCE_PATH}{role.ToString().Replace("BOTTOM", "adc")}.png";
+            if (value is Enum)
+            {
+                var role = (Role)value;
+                if (role == Role.RECOMENDED) return $"{ConfigModel.RESOURCE_PATH}fill.png";
+                string roleName = Enum.GetName(typeof(Role), role);
+                return $"{ConfigModel.RESOURCE_PATH}{roleName}.png";
+            }
+
+            return null;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

diff --git a/LoL Assist/LoL Assist.csproj b/LoL Assist/LoL Assist.csproj
@@ -6,7 +6,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{0BD0D0DA-C57A-43F1-A986-0B92F2235045}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <RootNamespace>LoL_Assist_WAPP</RootNamespace>
     <AssemblyName>LoL Assist</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
@@ -104,6 +104,9 @@
     <Compile Include="Commands\ItemRemovedCommand.cs" />
     <Compile Include="Converters\ChampionToImageConverter.cs" />
     <Compile Include="Converters\EmptyToNoneConverter.cs" />
+    <Compile Include="Converters\ProviderToAvailabilityConverter.cs" />
+    <Compile Include="Converters\ProviderToImageConverter.cs" />
+    <Compile Include="Converters\ProviderToNameConverter.cs" />
     <Compile Include="Converters\RoleImageConverter.cs" />
     <Compile Include="Converters\NullToCollapseConverter.cs" />
     <Compile Include="Converters\NullToVisibleConverter.cs" />
@@ -147,6 +150,9 @@
     <Compile Include="Views\ChampionPickerPanel.xaml.cs">
       <DependentUpon>ChampionPickerPanel.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ChampionSkillView.xaml.cs">
+      <DependentUpon>ChampionSkillView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ConfigPanel.xaml.cs">
       <DependentUpon>ConfigPanel.xaml</DependentUpon>
     </Compile>
@@ -171,6 +177,12 @@
     <Compile Include="Views\RuneEditorPanel.xaml.cs">
       <DependentUpon>RuneEditorPanel.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\RuneView.xaml.cs">
+      <DependentUpon>RuneView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SpellView.xaml.cs">
+      <DependentUpon>SpellView.xaml</DependentUpon>
+    </Compile>
     <Page Include="BuildEditorWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -207,6 +219,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\ChampionSkillView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\ConfigPanel.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -239,6 +255,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\RuneView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\SpellView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -803,6 +827,8 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Resources\opgg.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>