From fd82b9fa5161cac7e50fa6d9fd3c67fc44e68e9e Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Wed, 23 May 2018 22:24:25 +0200
Subject: [PATCH] Monstres encore

---
 .../AideDeJeu/Views/MonsterDetailPage.xaml    |  8 +-
 AideDeJeu/AideDeJeuLib/Monsters/Monster.cs    | 76 ++++++++++++++-----
 2 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
index 708b9572..34dc3be1 100644
--- a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
@@ -77,14 +77,14 @@
 
             <skia:SKCanvasView PaintSurface="PaintRedBar" HorizontalOptions="FillAndExpand" HeightRequest="8"/>
 
-            <Label FormattedText="{Binding Item.SpecialFeatures, Converter={StaticResource HtmlNodesToFormattedStringConverter}}" />
+            <Label FormattedText="{Binding Item.SpecialFeaturesNodes, Converter={StaticResource HtmlNodesToFormattedStringConverter}}" IsVisible="{Binding Item.SpecialFeatures, Converter={StaticResource NullToFalseConverter}}" />
 
             <Label Text="Actions" Style="{StaticResource Key=subsubsection}" IsVisible="{Binding Item.Actions, Converter={StaticResource NullToFalseConverter}}" />
-            <Label FormattedText="{Binding Item.Actions, Converter={StaticResource HtmlNodesToFormattedStringConverter}}" IsVisible="{Binding Item.Actions, Converter={StaticResource NullToFalseConverter}}" />
+            <Label FormattedText="{Binding Item.ActionsNodes, Converter={StaticResource HtmlNodesToFormattedStringConverter}}" IsVisible="{Binding Item.Actions, Converter={StaticResource NullToFalseConverter}}" />
 
             <Label Text="Actions légendaires" Style="{StaticResource Key=subsubsection}" IsVisible="{Binding Item.LegendaryActions, Converter={StaticResource NullToFalseConverter}}" />
-            <Label FormattedText="{Binding Item.LegendaryActions, Converter={StaticResource HtmlNodesToFormattedStringConverter}}" IsVisible="{Binding Item.LegendaryActions, Converter={StaticResource NullToFalseConverter}}" />
-            <!--<ListView ItemsSource="{Binding Item.SpecialFeatures}">
+            <Label FormattedText="{Binding Item.LegendaryActionsNodes, Converter={StaticResource HtmlNodesToFormattedStringConverter}}" IsVisible="{Binding Item.LegendaryActions, Converter={StaticResource NullToFalseConverter}}" />
+            <!--<ListView ItemsSource="{Binding Item.SpecialFeaturesNodes}">
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <Label BindingContext="{Binding}" FormattedText="{Binding Converter={StaticResource HtmlNodeToFormattedStringConverter}}" />
diff --git a/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs b/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
index 54156460..53f24579 100644
--- a/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
+++ b/AideDeJeu/AideDeJeuLib/Monsters/Monster.cs
@@ -50,35 +50,71 @@ namespace AideDeJeuLib.Monsters
             }
         }
 
-        public List<string> SpecialFeatures { get; set; }
+        private IEnumerable<string> NodeListToStringList(IEnumerable<HtmlNode> nodes)
+        {
+            if (nodes == null) return null;
+            var strings = new List<string>();
+            foreach (var node in nodes)
+            {
+                strings.Add(node.OuterHtml);
+            }
+            return strings;
+        }
+
+        private IEnumerable<HtmlNode> StringListToNodeList(IEnumerable<string> strings)
+        {
+            if (strings == null) return null;
+            var nodes = new List<HtmlNode>();
+            foreach (var str in strings)
+            {
+                var doc = new HtmlDocument();
+                doc.LoadHtml(str);
+                nodes.Add(doc.DocumentNode);
+            }
+            return nodes;
+        }
+
+        public IEnumerable<string> SpecialFeatures { get; set; }
         [IgnoreDataMember]
-        public List<HtmlNode> SpecialFeaturesNodes
+        public IEnumerable<HtmlNode> SpecialFeaturesNodes
         {
             get
             {
-                var doc = new HtmlDocument();
-                var nodes = new List<HtmlNode>();
-                foreach(var specialFeature in SpecialFeatures)
-                {
-                    doc.LoadHtml(specialFeature);
-                    nodes.Add(doc.DocumentNode);
-                }
-                return nodes;
+                return StringListToNodeList(SpecialFeatures);
             }
             set
             {
-                var specialFeatures = new List<string>();
-                foreach(var node in value)
-                {
-                    specialFeatures.Add(node.OuterHtml);
-                }
-                SpecialFeatures = specialFeatures;
+                SpecialFeatures = NodeListToStringList(value);
             }
         }
+
+        public IEnumerable<string> Actions { get; set; }
         [IgnoreDataMember]
-        public List<HtmlNode> Actions { get; set; }
+        public IEnumerable<HtmlNode> ActionsNodes
+        {
+            get
+            {
+                return StringListToNodeList(Actions);
+            }
+            set
+            {
+                Actions = NodeListToStringList(value);
+            }
+        }
+
+        public IEnumerable<string> LegendaryActions { get; set; }
         [IgnoreDataMember]
-        public List<HtmlNode> LegendaryActions { get; set; }
+        public IEnumerable<HtmlNode> LegendaryActionsNodes
+        {
+            get
+            {
+                return StringListToNodeList(LegendaryActions);
+            }
+            set
+            {
+                LegendaryActions = NodeListToStringList(value);
+            }
+        }
 
 
         public void ParseHtml()
@@ -203,8 +239,8 @@ namespace AideDeJeuLib.Monsters
             }
 
             this.SpecialFeaturesNodes = specialFeatures;
-            this.Actions = actions;
-            this.LegendaryActions = legendaryActions;
+            this.ActionsNodes = actions;
+            this.LegendaryActionsNodes = legendaryActions;
 
             var divDescription = divBloc?.SelectSingleNode("div[contains(@class,'description')]");
             this.Description = divDescription?.InnerText;