Nettoyage

AideDeJeu/AideDeJeu/Models/Item.cs

@@ -15,13 +15,6 @@ namespace AideDeJeuLib
 
     public class Item
     {
-        public string Id
-        {
-            get
-            {
-                return AideDeJeu.Tools.Helpers.IdFromName(Name);
-            }
-        }
         public string Name { get; set; }
         public string NameVO { get; set; }
 

AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs

@@ -452,11 +452,11 @@ namespace AideDeJeu.Tools
                 }
                 else if (block is Markdig.Syntax.LinkReferenceDefinition)
                 {
-                    Debug.WriteLine(block.GetType());
+                    //Debug.WriteLine(block.GetType());
                 }
                 else
                 {
-                    Debug.WriteLine(block.GetType());
+                    //Debug.WriteLine(block.GetType());
                 }
             }
             if (monster != null)
@@ -635,18 +635,6 @@ namespace AideDeJeu.Tools
             md += "### Description\n\n";
             md += spell
                 .DescriptionHtml
-                .Replace("<div class=\"description \">", "")
-                .Replace("</div>", "")
-                .Replace("<strong>", "**")
-                .Replace("</strong>", "**")
-                .Replace("<em>", "_")
-                .Replace("</em>", "_")
-                .Replace("<li>", "* ")
-                .Replace("</li>", "")
-                //.Replace("\n", "\n\n")
-                //.Replace("<br/>", "\n\n")
-                .Replace("\n", "\n")
-                .Replace("<br/>", "\n")
                 ;
             md += string.Format("[{0}]: spells_hd.md#{1}\n", spell.NameVO, Helpers.IdFromName(spell.NameVO));
             md += "\n\n";
@@ -686,16 +674,7 @@ namespace AideDeJeu.Tools
             if (monster.DamageImmunities!= null) md += string.Format("- **Damage Immunities** {0}\n", monster.DamageImmunities?.Trim());
             if (monster.DamageResistances != null) md += string.Format("- **Damage Resistances** {0}\n", monster.DamageResistances?.Trim());
             if (monster.DamageVulnerabilities != null) md += string.Format("- **Damage Vulnerabilities** {0}\n", monster.DamageVulnerabilities?.Trim());
-            //md += string.Format("- Components: {0}\n", monster.Components);
+
-            //md += string.Format("- Duration: {0}\n", monster.Duration);
-            //md += string.Format("- LevelType: {0}\n", monster.LevelType);
-            //md += string.Format("- Range: {0}\n", monster.Range);
-            //var regex = new Regex("(?<source>\\(.*\\)) (?<classes>.*)");
-            //var match = regex.Match(monster.Source);
-            //var source = match.Groups["source"].Value;
-            //var classes = match.Groups["classes"].Value;
-            //md += string.Format("- Source: {0}\n", source);
-            //md += string.Format("- Classes: {0}\n", classes.Replace(" ;", ",").Trim().Trim(','));
             md += "\n";
 
             if (monster.SpecialFeatures != null)
@@ -734,17 +713,6 @@ namespace AideDeJeu.Tools
                 }
             }
 
-            //md += monster
-            //    .Description
-            //    .Replace("<strong>", "**")
-            //    .Replace("</strong>", "**")
-            //    .Replace("<em>", "_")
-            //    .Replace("</em>", "_")
-            //    .Replace("<li>", "* ")
-            //    .Replace("</li>", "")
-            //    .Replace("\n", "\n\n")
-            //    .Replace("<br/>", "\n\n")
-            //    ;
             md += string.Format("[{0}]: monsters_hd.md#{1}\n", monster.NameVO, Helpers.IdFromName(monster.NameVO));
             md += "\n\n";
             return md;
@@ -752,21 +720,8 @@ namespace AideDeJeu.Tools
 
         public static string HtmlToMarkdownString(string html)
         {
-            var regex = new Regex("(<a .*?>)");
-            html = regex.Replace(html, "[");
             return html
-                .Replace("</a>", "]")
-                .Replace("<strong>", "**")
-                .Replace("</strong>", "**")
-                .Replace("<em>", "_")
-                .Replace("</em>", "_")
-                .Replace("<li>", "* ")
-                .Replace("</li>", "")
                 .Replace("\n", "\n\n")
-                .Replace("<br/>", "\n\n")
-                .Replace("<br />", "\n\n")
-                .Replace("<p>", "")
-                .Replace("</p>", "\n\n")
                 ;
         }
 

AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs

@@ -23,7 +23,6 @@ namespace AideDeJeu.ViewModels
             LoadItemsCommand = new Command(async () => await ExecuteLoadItemsCommandAsync().ConfigureAwait(false));
         }
         public ICommand LoadItemsCommand { get; protected set; }
-        //public abstract void ExecuteLoadItemsCommand();
         public abstract Task ExecuteGotoItemCommandAsync(Item item);
         protected ItemSourceType ItemSourceType;
 
@@ -77,24 +76,9 @@ namespace AideDeJeu.ViewModels
             Main.IsLoading = true;
             try
             {
-                // Yan : c'est pas plutôt cette partie qui devrait être dans une autre Task ?
                 var filterViewModel = Main.GetFilterViewModel(ItemSourceType);
                 var items = await filterViewModel.FilterItems(await GetAllItemsAsync(), token);
                 Main.Items = items.ToList();
-                //await Task.Run(async () => {
-                // Yan : plus besoin de boucle si on change toute la liste d'un coup ;)
-                // Yan : indispensable de repasser sur l'ui thread pour la version uwp
-                //Device.BeginInvokeOnMainThread(() => Main.Items = items);
-                //Main.Items.Clear();
-                //foreach (var item in items)
-                //{
-                //    token.ThrowIfCancellationRequested();
-                //    Main.Items.Add(item);
-                //}
-                //}, cancellationToken: token); // Yan : c'est ici qu'il faudrait coller le token non ?
-
-                //On arrete le loading ici car on annule toujours avant de lancer une nouvelle opération
-                // Yan : ?? du coup le IsLoading repasse pas à false en cas de cancel ou d'autre exception ?
                 Main.IsLoading = false;
             }
             catch (OperationCanceledException ex)

AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs

@@ -168,7 +168,7 @@ namespace AideDeJeu.ViewModels
                 if (file == "spells_hd")
                 {
                     var spells = await GetItemsViewModel(ItemSourceType.SpellHD).GetAllItemsAsync();
-                    var spell = spells.Where(i => i.Id == anchor).FirstOrDefault();
+                    var spell = spells.Where(i => Tools.Helpers.IdFromName(i.Name) == anchor).FirstOrDefault();
                     if (spell != null)
                     {
                         await Navigator.GotoSpellDetailPageAsync(spell);
@@ -177,7 +177,7 @@ namespace AideDeJeu.ViewModels
                 else if (file == "spells_vo")
                 {
                     var spells = await GetItemsViewModel(ItemSourceType.SpellVO).GetAllItemsAsync();
-                    var spell = spells.Where(i => i.Id == anchor).FirstOrDefault();
+                    var spell = spells.Where(i => Tools.Helpers.IdFromName(i.Name) == anchor).FirstOrDefault();
                     if (spell != null)
                     {
                         await Navigator.GotoSpellDetailPageAsync(spell);
@@ -186,7 +186,7 @@ namespace AideDeJeu.ViewModels
                 else if (file == "monsters_hd")
                 {
                     var monsters = await GetItemsViewModel(ItemSourceType.MonsterHD).GetAllItemsAsync();
-                    var monster = monsters.Where(i => i.Id == anchor).FirstOrDefault();
+                    var monster = monsters.Where(i => Tools.Helpers.IdFromName(i.Name) == anchor).FirstOrDefault();
                     if (monster != null)
                     {
                         await Navigator.GotoMonsterDetailPageAsync(monster);
@@ -195,7 +195,7 @@ namespace AideDeJeu.ViewModels
                 else if (file == "monsters_vo")
                 {
                     var monsters = await GetItemsViewModel(ItemSourceType.MonsterVO).GetAllItemsAsync();
-                    var monster = monsters.Where(i => i.Id == anchor).FirstOrDefault();
+                    var monster = monsters.Where(i => Tools.Helpers.IdFromName(i.Name) == anchor).FirstOrDefault();
                     if (monster != null)
                     {
                         await Navigator.GotoMonsterDetailPageAsync(monster);

AideDeJeu/AideDeJeu/Views/AboutPage.xaml

@@ -8,9 +8,6 @@
     <ContentPage.BindingContext>
         <vm:AboutViewModel />
     </ContentPage.BindingContext>
-    <!--<ContentPage.ToolbarItems>
-        <ToolbarItem Text="truc" />
-    </ContentPage.ToolbarItems>-->
     <Grid ColumnSpacing="0">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />

AideDeJeu/AideDeJeu/Views/MainPage.xaml

@@ -54,7 +54,6 @@
                             </ListView.ItemTemplate>
                         </ListView>
                     </StackLayout>
-                    <!--<ActivityIndicator AbsoluteLayout.LayoutBounds="0.5,0.5" AbsoluteLayout.LayoutFlags="XProportional, YProportional" IsRunning="{x:Binding IsLoading}" Color="Olive" />-->
                 </ContentPage>
             </x:Arguments>
         </NavigationPage>