diff --git a/AideDeJeu/AideDeJeu/Tools/Converters.cs b/AideDeJeu/AideDeJeu/Tools/Converters.cs index beb77505..2ea3ef70 100644 --- a/AideDeJeu/AideDeJeu/Tools/Converters.cs +++ b/AideDeJeu/AideDeJeu/Tools/Converters.cs @@ -90,12 +90,12 @@ namespace AideDeJeu.Tools public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var itemType = value as ViewModels.ItemsViewModel.ItemType?; - if (itemType == ViewModels.ItemsViewModel.ItemType.Spell) + var itemType = value as ViewModels.MainViewModel.ItemType?; + if (itemType == ViewModels.MainViewModel.ItemType.Spell) { return SpellsTemplate; } - if (itemType == ViewModels.ItemsViewModel.ItemType.Monster) + if (itemType == ViewModels.MainViewModel.ItemType.Monster) { return MonstersTemplate; } @@ -115,12 +115,12 @@ namespace AideDeJeu.Tools public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var itemType = value as ViewModels.ItemsViewModel.ItemType?; - if (itemType == ViewModels.ItemsViewModel.ItemType.Spell) + var itemType = value as ViewModels.MainViewModel.ItemType?; + if (itemType == ViewModels.MainViewModel.ItemType.Spell) { return Spells; } - if (itemType == ViewModels.ItemsViewModel.ItemType.Monster) + if (itemType == ViewModels.MainViewModel.ItemType.Monster) { return Monsters; } diff --git a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs similarity index 95% rename from AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs rename to AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs index 354ba66c..2289848d 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs @@ -11,7 +11,7 @@ using AideDeJeuLib; namespace AideDeJeu.ViewModels { - public class ItemsViewModel : BaseViewModel + public class MainViewModel : BaseViewModel { public enum ItemType { @@ -58,7 +58,7 @@ namespace AideDeJeu.ViewModels public Command SwitchToMonsters { get; set; } public Command AboutCommand { get; set; } - public ItemsViewModel(INavigation navigation) + public MainViewModel(INavigation navigation) { //Title = "Browse"; //Items = new ObservableCollection(); diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml index 2dd62baa..955cf39f 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml @@ -104,7 +104,9 @@ --> - + + + - + diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs index dc5c89d9..2cb186d9 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs @@ -11,12 +11,12 @@ namespace AideDeJeu.Views [XamlCompilation(XamlCompilationOptions.Compile)] public partial class ItemsPage : MasterDetailPage //TabbedPage { - ItemsViewModel viewModel; + MainViewModel viewModel; public ItemsPage () { InitializeComponent (); - BindingContext = viewModel = new ItemsViewModel(Navigation); + BindingContext = viewModel = new MainViewModel(Navigation); } protected override bool OnBackButtonPressed()