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 : 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 { } } 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(); 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 @@ - + 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}}" > @@ -67,6 +67,10 @@ + - + - + - + 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}"> -