From 03f54c2c755f802de406b9447f255aa779fe12cd Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Mon, 7 May 2018 00:07:21 +0200
Subject: [PATCH] Utilisation du nom du PHB au lieu de l'ancien d'AideDD

---
 AideDeJeu/AideDeJeu/Tools/Comparers.cs           | 16 ++++++++++++++++
 .../ViewModels/MonsterDetailViewModel.cs         |  2 +-
 .../AideDeJeu/ViewModels/MonstersViewModel.cs    | 12 ++++++++----
 .../AideDeJeu/ViewModels/SpellDetailViewModel.cs |  2 +-
 .../AideDeJeu/ViewModels/SpellsViewModel.cs      |  8 ++++++--
 AideDeJeu/AideDeJeu/Views/MainPage.xaml          |  2 +-
 AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml |  4 ++--
 AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml   |  4 ++--
 AideDeJeu/AideDeJeuLib/Monsters/Monster.cs       |  2 +-
 AideDeJeu/AideDeJeuLib/Spells/Spell.cs           |  2 +-
 10 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 AideDeJeu/AideDeJeu/Tools/Comparers.cs

diff --git a/AideDeJeu/AideDeJeu/Tools/Comparers.cs b/AideDeJeu/AideDeJeu/Tools/Comparers.cs
new file mode 100644
index 00000000..c42fac80
--- /dev/null
+++ b/AideDeJeu/AideDeJeu/Tools/Comparers.cs
@@ -0,0 +1,16 @@
+using AideDeJeuLib;
+using AideDeJeuLib.Spells;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AideDeJeu.Tools
+{
+    public class ItemComparer : Comparer<Item>
+    {
+        public override int Compare(Item x, Item y)
+        {
+            return x.NamePHB.CompareTo(y.NamePHB);
+        }
+    }
+}
diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs
index 04e3c404..8dd415b7 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs
@@ -267,7 +267,7 @@ namespace AideDeJeu.ViewModels
 
         public MonsterDetailViewModel(Monster item = null)
         {
-            Title = item?.Name;
+            Title = item?.NamePHB;
             Item = item;
             LoadItemCommand = new Command(async () => await ExecuteLoadItemCommand());
         }
diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
index 7de0b308..9441e367 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
@@ -1,9 +1,11 @@
-using AideDeJeuLib;
+using AideDeJeu.Tools;
+using AideDeJeuLib;
 using AideDeJeuLib.Monsters;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace AideDeJeu.ViewModels
@@ -197,10 +199,12 @@ namespace AideDeJeu.ViewModels
             try
             {
                 AllItems.Clear();
-                var monsters = await new MonstersScrappers().GetMonsters(category: Categories[Category].Key, type: Types[Type].Key, minPower: Powers[MinPower].Key, maxPower: Powers[MaxPower].Key, size: Sizes[Size].Key, legendary:Legendaries[Legendary].Key, source: Sources[Source].Key);
-                foreach (var monster in monsters)
+                var items = await new MonstersScrappers().GetMonsters(category: Categories[Category].Key, type: Types[Type].Key, minPower: Powers[MinPower].Key, maxPower: Powers[MaxPower].Key, size: Sizes[Size].Key, legendary:Legendaries[Legendary].Key, source: Sources[Source].Key);
+                var aitems = items.ToArray();
+                Array.Sort(aitems, new ItemComparer());
+                foreach (var item in aitems)
                 {
-                    AllItems.Add(monster);
+                    AllItems.Add(item);
                 }
                 FilterItems();
             }
diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs
index 3930cd54..1426c37b 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs
@@ -107,7 +107,7 @@ namespace AideDeJeu.ViewModels
 
         public SpellDetailViewModel(Spell item = null)
         {
-            Title = item?.Name;
+            Title = item?.NamePHB;
             Item = item;
             LoadItemCommand = new Command(async () => await ExecuteLoadItemCommand());
         }
diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs
index 5fa2a8fe..aaf58af6 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs
@@ -1,9 +1,11 @@
-using AideDeJeuLib;
+using AideDeJeu.Tools;
+using AideDeJeuLib;
 using AideDeJeuLib.Spells;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace AideDeJeu.ViewModels
@@ -168,7 +170,9 @@ namespace AideDeJeu.ViewModels
             {
                 AllItems.Clear();
                 var items = await SpellsScrappers.GetSpells(classe: Classes[Classe].Key, niveauMin: Niveaux[NiveauMin].Key, niveauMax: Niveaux[NiveauMax].Key, ecole: Ecoles[Ecole].Key, rituel: Rituels[Rituel].Key, source: Sources[Source].Key);
-                foreach (var item in items)
+                var aitems = items.ToArray();
+                Array.Sort(aitems, new ItemComparer());
+                foreach (var item in aitems)
                 {
                     AllItems.Add(item);
                 }
diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
index 628a482c..4779ea7e 100644
--- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
@@ -124,7 +124,7 @@
                         <DataTemplate>
                             <ViewCell>
                                 <StackLayout Padding="10">
-                                    <Label Text="{Binding Name}" 
+                                    <Label Text="{Binding NamePHB}" 
                        LineBreakMode="NoWrap" 
                        Style="{DynamicResource subsubsection}" 
                        FontSize="16" />
diff --git a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
index df6d439b..0cd8353d 100644
--- a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
@@ -17,9 +17,9 @@
             
             <skia:SKCanvasView PaintSurface="PaintHeaderBar" HorizontalOptions="FillAndExpand" HeightRequest="8" />
             
-            <Label Text="{Binding Item.Name}" Style="{StaticResource Key=subsection}" />
+            <Label Text="{Binding Item.NamePHB}" Style="{StaticResource Key=subsection}" />
             <Label Text="{Binding Item.NameVO}" Style="{StaticResource Key=content}" />
-            <Label Text="{Binding Item.NamePHB}" Style="{StaticResource Key=content}" />
+            <Label Text="{Binding Item.Name}" Style="{StaticResource Key=content}" />
 
             <!--<Label Text=" " />-->
 
diff --git a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
index d4405615..4d798b99 100644
--- a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
@@ -5,9 +5,9 @@
              Title="{Binding Title}">
     <ScrollView>
         <StackLayout Orientation="Vertical" Padding="15">
-            <Label Text="{Binding Item.Name}" Style="{StaticResource Key=subsection}" />
+            <Label Text="{Binding Item.NamePHB}" Style="{StaticResource Key=subsection}" />
             <Label Text="{Binding Item.NameVO}" Style="{StaticResource Key=content}" />
-            <Label Text="{Binding Item.NamePHB}" Style="{StaticResource Key=content}" />
+            <Label Text="{Binding Item.Name}" Style="{StaticResource Key=content}" />
 
             <Label Text=" " />
 
diff --git a/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs b/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
index 4fb7f87b..d75dc4be 100644
--- a/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
+++ b/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
@@ -49,7 +49,7 @@ namespace AideDeJeuLib.Monsters
             var altNames = divMonster.SelectSingleNode("div[@class='trad']").InnerText;
             var matchNames = new Regex(@"\[ (?<vo>.*?) \](?: \[ (?<alt>.*?) \])?").Match(altNames);
             monster.NameVO = matchNames.Groups["vo"].Value;
-            monster.NamePHB = matchNames.Groups["alt"].Value;
+            monster.NamePHB = string.IsNullOrEmpty(matchNames.Groups["alt"].Value) ? monster.Name : matchNames.Groups["alt"].Value;
 
             var divSansSerif = divMonster?.SelectSingleNode("div[contains(@class,'sansSerif')]");
             var typeSizeAlignment = divSansSerif?.SelectSingleNode("h2/em")?.InnerText;
diff --git a/AideDeJeu/AideDeJeuLib/Spells/Spell.cs b/AideDeJeu/AideDeJeuLib/Spells/Spell.cs
index 01a95f9d..4d2a3857 100644
--- a/AideDeJeu/AideDeJeuLib/Spells/Spell.cs
+++ b/AideDeJeu/AideDeJeuLib/Spells/Spell.cs
@@ -51,7 +51,7 @@ namespace AideDeJeuLib.Spells
             var altNames = nodeSpell.SelectSingleNode("div[@class='trad']").InnerText;
             var matchNames = new Regex(@"\[ (?<vo>.*?) \](?: \[ (?<alt>.*?) \])?").Match(altNames);
             spell.NameVO = matchNames.Groups["vo"].Value;
-            spell.NamePHB = matchNames.Groups["alt"].Value;
+            spell.NamePHB = string.IsNullOrEmpty(matchNames.Groups["alt"].Value) ? spell.Name : matchNames.Groups["alt"].Value;
             spell.LevelType = nodeSpell.SelectSingleNode("h2/em").InnerText;
             spell.Level = spell.LevelType.Split(new string[] { " - " }, StringSplitOptions.None)[0].Split(' ')[1];
             spell.Type = spell.LevelType.Split(new string[] { " - " }, StringSplitOptions.None)[1];