diff --git a/AideDeJeu/AideDeJeu/Tools/Converters.cs b/AideDeJeu/AideDeJeu/Tools/Converters.cs
index 25252701..e203187f 100644
--- a/AideDeJeu/AideDeJeu/Tools/Converters.cs
+++ b/AideDeJeu/AideDeJeu/Tools/Converters.cs
@@ -34,33 +34,7 @@ namespace AideDeJeu.Tools
}
}
- public class HtmlNodeToFormattedStringConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- var str = value as string;
- if (str != null)
- {
- var doc = new XmlDocument();
- doc.LoadXml("
" + str + "
");
-
- var fs = new FormattedString();
- FormatedTextHelpers.HtmlNodeToFormatedString(doc.DocumentElement, fs);
- return fs;
- }
- else
- {
- return null;
- }
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return null;
- }
- }
-
- public class HtmlNodesToFormattedStringConverter : IValueConverter
+ public class StringListToStringConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
@@ -73,20 +47,6 @@ namespace AideDeJeu.Tools
cstring += str + "\n\n";
}
return cstring;
- // var fs = new FormattedString();
- // foreach (var str in strings)
- // {
- // var doc = new XmlDocument();
- // doc.LoadXml("" + str + "
");
-
- // FormatedTextHelpers.HtmlNodeToFormatedString(doc.DocumentElement, fs);
- // fs.Spans.Add(new Span() { Text = "\n" });
- // }
- // return fs;
- //}
- //else
- //{
- // return null;
}
return null;
}
@@ -100,20 +60,14 @@ namespace AideDeJeu.Tools
public class ItemSourceTypeConverter : IValueConverter
{
- //public T SpellVF { get; set; }
public T SpellVO { get; set; }
public T SpellHD { get; set; }
- //public T MonsterVF { get; set; }
public T MonsterVO { get; set; }
public T MonsterHD { get; set; }
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var itemType = value as ItemSourceType?;
- //if (itemType == ItemSourceType.SpellVF)
- //{
- // return SpellVF;
- //}
if (itemType == ItemSourceType.SpellVO)
{
return SpellVO;
@@ -122,10 +76,6 @@ namespace AideDeJeu.Tools
{
return SpellHD;
}
- //if (itemType == ItemSourceType.MonsterVF)
- //{
- // return MonsterVF;
- //}
if (itemType == ItemSourceType.MonsterVO)
{
return MonsterVO;
@@ -145,21 +95,6 @@ namespace AideDeJeu.Tools
public class ItemSourceTypeToStringConverter : ItemSourceTypeConverter { }
- public class ItemSourceTypeToItemsConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- var vm = DependencyService.Get();
- var itemSourceType = vm.ItemSourceType;
- return vm.GetItemsViewModel(itemSourceType);
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return null;
- }
- }
-
public class ItemSourceTypeToFilterConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
index 54e4ab81..494ae1c1 100644
--- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
@@ -3,7 +3,6 @@
-
diff --git a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
index 76a4a92d..c6a8ec1a 100644
--- a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml
@@ -10,8 +10,7 @@
-
-
+
@@ -74,16 +73,16 @@
-
+
-
+
-
+
-
+
diff --git a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
index 56fccff4..45a808dc 100644
--- a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml
@@ -9,8 +9,7 @@
-
-
+