From bdeba80797a562eb975497366db841e7bcbcf5e9 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Fri, 4 May 2018 00:23:24 +0200
Subject: [PATCH] Parsing et affichage des vo et alt

---
 AideDeJeu/AideDeJeu/Tools/Converters.cs       | 24 +++++++++++++++++++
 .../AideDeJeu/ViewModels/AboutViewModel.cs    |  2 +-
 .../AideDeJeu/ViewModels/ItemsViewModel.cs    |  6 +++--
 .../AideDeJeu/ViewModels/MonstersViewModel.cs |  2 +-
 AideDeJeu/AideDeJeu/Views/AboutPage.xaml      |  2 +-
 AideDeJeu/AideDeJeu/Views/ItemsPage.xaml      | 12 ++++++----
 AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs   |  5 +++-
 .../AideDeJeu/Views/MonsterDetailPage.xaml    |  2 ++
 .../AideDeJeu/Views/SpellDetailPage.xaml      |  4 +++-
 AideDeJeu/AideDeJeuLib/Monsters/Monster.cs    |  8 ++++++-
 AideDeJeu/AideDeJeuLib/Spells/Spell.cs        |  8 +++++--
 .../AideDeJeuLib/Spells/SpellsScrappers.cs    |  2 +-
 12 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Tools/Converters.cs b/AideDeJeu/AideDeJeu/Tools/Converters.cs
index f1ebc5b7..beb77505 100644
--- a/AideDeJeu/AideDeJeu/Tools/Converters.cs
+++ b/AideDeJeu/AideDeJeu/Tools/Converters.cs
@@ -108,6 +108,30 @@ namespace AideDeJeu.Tools
         }
     }
 
+    public class ItemTypeConverter<T> : IValueConverter
+    {
+        public T Spells { get; set; }
+        public T Monsters { get; set; }
 
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var itemType = value as ViewModels.ItemsViewModel.ItemType?;
+            if (itemType == ViewModels.ItemsViewModel.ItemType.Spell)
+            {
+                return Spells;
+            }
+            if (itemType == ViewModels.ItemsViewModel.ItemType.Monster)
+            {
+                return Monsters;
+            }
+            return null;
+        }
 
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
+
+    public class ItemTypeToStringConverter : ItemTypeConverter<string> { }
 }
diff --git a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs
index 38c37365..92b1022d 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs
@@ -11,7 +11,7 @@ namespace AideDeJeu.ViewModels
         {
             Title = "À propos de ...";
 
-            OpenWebCommand = new Command(() => Device.OpenUri(new Uri("https://github.com/Nioux/AideDeJeu")));
+            OpenWebCommand = new Command(() => Device.OpenUri(new Uri("https://nioux.github.io/AideDeJeu/")));
         }
 
         public ICommand OpenWebCommand { get; }
diff --git a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
index acd46f56..354ba66c 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs
@@ -56,14 +56,16 @@ namespace AideDeJeu.ViewModels
 
         public Command SwitchToSpells { get; set; }
         public Command SwitchToMonsters { get; set; }
+        public Command AboutCommand { get; set; }
 
-        public ItemsViewModel()
+        public ItemsViewModel(INavigation navigation)
         {
             //Title = "Browse";
             //Items = new ObservableCollection<Item>();
             LoadItemsCommand = new Command(async () => await ExecuteLoadItemsCommand());
             SwitchToSpells = new Command(() => ItemsType = ItemType.Spell);
             SwitchToMonsters = new Command(() => ItemsType = ItemType.Monster);
+            AboutCommand = new Command(async() => await navigation.PushAsync(new Views.AboutPage()));
         }
 
         async Task ExecuteLoadItemsCommand()
@@ -72,7 +74,7 @@ namespace AideDeJeu.ViewModels
             {
                 await Spells.ExecuteLoadItemsCommand();
             }
-            if (ItemsType == ItemType.Monster)
+            else if (ItemsType == ItemType.Monster)
             {
                 await Monsters.ExecuteLoadItemsCommand();
             }
diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
index 80364c65..27643f8e 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs
@@ -128,7 +128,7 @@ namespace AideDeJeu.ViewModels
                 LoadItemsCommand.Execute(null);
             }
         }
-        private int _MaxPower = 9;
+        private int _MaxPower = 11;
         public int MaxPower
         {
             get
diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
index f233c2dd..8ed667ce 100644
--- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
@@ -27,7 +27,7 @@
                             <FormattedString.Spans>
                                 <Span Text="Aide de Jeu" FontAttributes="Bold" FontSize="22" />
                                 <Span Text=" " />
-                                <Span Text="1.0" ForegroundColor="{StaticResource LightTextColor}" />
+                                <Span Text="1.01" ForegroundColor="{StaticResource LightTextColor}" />
                             </FormattedString.Spans>
                         </FormattedString>
                     </Label.FormattedText>
diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
index d3e504c6..bf6f733f 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
@@ -6,7 +6,7 @@
                 x:Class="AideDeJeu.Views.ItemsPage"
                   x:Name="This"
                 IsPresented="False"
-                  Title="Liste des sorts"
+                  Title="{Binding ItemsType,Converter={StaticResource ItemTypeToStringConverter}}"
                 >
     <MasterDetailPage.Resources>
         <ResourceDictionary>
@@ -67,6 +67,10 @@
                     </StackLayout>
                 </ScrollView>
             </ControlTemplate>
+            <tools:ItemTypeToStringConverter 
+                x:Key="ItemTypeToStringConverter" 
+                Spells="Sorts" 
+                Monsters="Monstres" />
             <tools:ItemsTypeTemplateConverter 
                 x:Key="ItemsTypeTemplateConverter" 
                 SpellsTemplate="{StaticResource SpellsMasterDataTemplate}" 
@@ -74,17 +78,17 @@
         </ResourceDictionary>
     </MasterDetailPage.Resources>
     <MasterDetailPage.Master>
-        <ContentPage Title="Liste des sorts">
+        <ContentPage Title="Liste des sorts 3">
             <ContentView ControlTemplate="{Binding ItemsType, Converter={StaticResource ItemsTypeTemplateConverter}}" BindingContext="{Binding}" />
             <!--<ContentView ControlTemplate="{StaticResource SpellsMasterDataTemplate}" BindingContext="{Binding}" />-->
         </ContentPage>
     </MasterDetailPage.Master>
     <MasterDetailPage.Detail>
-        <ContentPage Title="Liste des sorts">
+        <ContentPage Title="Liste des sorts 2">
             <ContentPage.ToolbarItems>
                 <ToolbarItem Name="Spells" Text="Sorts" Order="Primary" Icon="spell_book.png" Command="{Binding SwitchToSpells}" />
                 <ToolbarItem Name="Monsters" Text="Monstres" Order="Primary" Icon="dragon_head.png" Command="{Binding SwitchToMonsters}" />
-                <ToolbarItem Name="About" Text="A propos de" Order="Primary" Icon="wooden_sign.png" Command="{Binding SwitchToMonsters}" />
+                <ToolbarItem Name="About" Text="À propos de..." Order="Primary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
                 <!--<ToolbarItem Name="Home" Text="Accueil" Order="Primary" Icon="ic_home.png" Command="{Binding OpenUrl}" CommandParameter="http://www.pathfinder-fr.org/" />
                 <ToolbarItem Name="Spells" Text="Sorts" Order="Primary" Icon="ic_home.png" Command="{Binding OpenUrl}" CommandParameter="http://www.pathfinder-fr.org/" />-->
                 <!--<ToolbarItem Name="Blog" Text="Blog" Order="Primary" Icon="ic_blog.png" Command="{Binding OpenUrl}" CommandParameter="http://www.pathfinder-fr.org/Blog/" />
diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs
index 49b5b6b2..1af69009 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs
@@ -17,7 +17,8 @@ namespace AideDeJeu.Views
 		{
 			InitializeComponent ();
 
-            BindingContext = viewModel = new ItemsViewModel();
+            BindingContext = viewModel = new ItemsViewModel(Navigation);
+            
         }
 
         async void OnItemSelected(object sender, SelectedItemChangedEventArgs args)
@@ -54,5 +55,7 @@ namespace AideDeJeu.Views
             if (viewModel.Items.Count == 0)
                 viewModel.LoadItemsCommand.Execute(null);
         }
+
+        
     }
 }
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
index a4056fcc..df6d439b 100644
--- a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
@@ -18,6 +18,8 @@
             <skia:SKCanvasView PaintSurface="PaintHeaderBar" HorizontalOptions="FillAndExpand" HeightRequest="8" />
             
             <Label Text="{Binding Item.Name}" Style="{StaticResource Key=subsection}" />
+            <Label Text="{Binding Item.NameVO}" Style="{StaticResource Key=content}" />
+            <Label Text="{Binding Item.NamePHB}" Style="{StaticResource Key=content}" />
 
             <!--<Label Text=" " />-->
 
diff --git a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
index 50b7c49b..d4405615 100644
--- a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
@@ -5,7 +5,9 @@
              Title="{Binding Title}">
     <ScrollView>
         <StackLayout Orientation="Vertical" Padding="15">
-            <Label Text="{Binding Item.Name}" Style="{StaticResource Key=subsubsection}" />
+            <Label Text="{Binding Item.Name}" Style="{StaticResource Key=subsection}" />
+            <Label Text="{Binding Item.NameVO}" Style="{StaticResource Key=content}" />
+            <Label Text="{Binding Item.NamePHB}" Style="{StaticResource Key=content}" />
 
             <Label Text=" " />
 
diff --git a/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs b/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
index 5cda2238..e16c2f1b 100644
--- a/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
+++ b/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
@@ -11,6 +11,7 @@ namespace AideDeJeuLib.Monsters
         public string Id { get; set; }
         public string Name { get; set; }
         public string NameVO { get; set; }
+        public string NamePHB { get; set; }
         public string Power { get; set; }
         public string Type { get; set; }
         public string Size { get; set; }
@@ -48,7 +49,12 @@ namespace AideDeJeuLib.Monsters
             var monster = new Monster();
             var divMonster = divBloc?.SelectSingleNode("div[contains(@class,'monstre')]");
             monster.Name = divMonster?.SelectSingleNode("h1").InnerText;
-            monster.NameVO = divMonster?.SelectSingleNode("div[contains(@class,'trad')]/a")?.InnerText;
+
+            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;
+
             var divSansSerif = divMonster?.SelectSingleNode("div[contains(@class,'sansSerif')]");
             var typeSizeAlignment = divSansSerif?.SelectSingleNode("h2/em")?.InnerText;
             if (typeSizeAlignment != null)
diff --git a/AideDeJeu/AideDeJeuLib/Spells/Spell.cs b/AideDeJeu/AideDeJeuLib/Spells/Spell.cs
index 5df01d90..10eb5615 100644
--- a/AideDeJeu/AideDeJeuLib/Spells/Spell.cs
+++ b/AideDeJeu/AideDeJeuLib/Spells/Spell.cs
@@ -11,7 +11,8 @@ namespace AideDeJeuLib.Spells
     {
         public string Id { get; set; }
         public string Name { get; set; }
-        public string NameUS { get; set; }
+        public string NameVO { get; set; }
+        public string NamePHB { get; set; }
         public string LevelType { get; set; }
         public string Level { get; set; }
         public string Type { get; set; }
@@ -51,7 +52,10 @@ namespace AideDeJeuLib.Spells
         {
             var spell = new Spell();
             spell.Name = nodeSpell.SelectSingleNode("h1").InnerText;
-            spell.NameUS = nodeSpell.SelectSingleNode("div[@class='trad']").InnerText;
+            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.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];
diff --git a/AideDeJeu/AideDeJeuLib/Spells/SpellsScrappers.cs b/AideDeJeu/AideDeJeuLib/Spells/SpellsScrappers.cs
index ecd22f83..e382da89 100644
--- a/AideDeJeu/AideDeJeuLib/Spells/SpellsScrappers.cs
+++ b/AideDeJeu/AideDeJeuLib/Spells/SpellsScrappers.cs
@@ -109,7 +109,7 @@ namespace AideDeJeuLib.Spells
             {
                 var newSpell = new Spell();
                 newSpell.Name = spell.SelectSingleNode("h1").InnerText;
-                newSpell.NameUS = spell.SelectSingleNode("div[@class='trad']").InnerText;
+                newSpell.NameVO = spell.SelectSingleNode("div[@class='trad']").InnerText;
                 newSpell.LevelType = spell.SelectSingleNode("h2/em").InnerText;
                 newSpell.Level = newSpell.LevelType.Split(new string[] { " - " }, StringSplitOptions.None)[0].Split(' ')[1];
                 newSpell.Type = newSpell.LevelType.Split(new string[] { " - " }, StringSplitOptions.None)[1];