diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj index da933556..d2c71390 100644 --- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj +++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj @@ -50,7 +50,7 @@ - + diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj index 2435f7de..0888f0d0 100644 --- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj +++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj @@ -165,8 +165,8 @@ - - + + diff --git a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj index 78b2de52..af17a113 100644 --- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj +++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj @@ -122,7 +122,7 @@ - + diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj index 7f116f65..6c71ef7d 100644 --- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj +++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj @@ -9,7 +9,7 @@ - + @@ -32,19 +32,15 @@ SpellDetailPage.xaml - - Code - - - Code - Code SpellsPage.xaml - - Code - + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Models/Item.cs b/AideDeJeu/AideDeJeu/Models/Item.cs deleted file mode 100644 index af5299b8..00000000 --- a/AideDeJeu/AideDeJeu/Models/Item.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace AideDeJeu.Models -{ - public class Item - { - public string Id { get; set; } - public string Text { get; set; } - public string Description { get; set; } - } -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Services/IDataStore.cs b/AideDeJeu/AideDeJeu/Services/IDataStore.cs deleted file mode 100644 index f57a5901..00000000 --- a/AideDeJeu/AideDeJeu/Services/IDataStore.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace AideDeJeu.Services -{ - public interface IDataStore - { - Task AddItemAsync(T item); - Task UpdateItemAsync(T item); - Task DeleteItemAsync(T item); - Task GetItemAsync(string id); - Task> GetItemsAsync(bool forceRefresh = false); - Task> GetItemsAsync(string classe, int niveauMin, int niveauMax, string ecole, string rituel, string source); - } -} diff --git a/AideDeJeu/AideDeJeu/Services/MockDataStore.cs b/AideDeJeu/AideDeJeu/Services/MockDataStore.cs deleted file mode 100644 index e055b64e..00000000 --- a/AideDeJeu/AideDeJeu/Services/MockDataStore.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -using AideDeJeu.Models; -using AideDeJeuLib; -using AideDeJeuLib.Spells; - -[assembly: Xamarin.Forms.Dependency(typeof(AideDeJeu.Services.MockDataStore))] -namespace AideDeJeu.Services -{ - public class MockDataStore : IDataStore - { - List items; - - public MockDataStore() - { - items = new List(); - var mockItems = new List - { - new Item { Id = Guid.NewGuid().ToString(), Text = "First item", Description="This is an item description." }, - new Item { Id = Guid.NewGuid().ToString(), Text = "Second item", Description="This is an item description." }, - new Item { Id = Guid.NewGuid().ToString(), Text = "Third item", Description="This is an item description." }, - new Item { Id = Guid.NewGuid().ToString(), Text = "Fourth item", Description="This is an item description." }, - new Item { Id = Guid.NewGuid().ToString(), Text = "Fifth item", Description="This is an item description." }, - new Item { Id = Guid.NewGuid().ToString(), Text = "Sixth item", Description="This is an item description." }, - }; - - foreach (var item in mockItems) - { - items.Add(item); - } - } - - public async Task AddItemAsync(Item item) - { - items.Add(item); - - return await Task.FromResult(true); - } - - public async Task UpdateItemAsync(Item item) - { - var _item = items.Where((Item arg) => arg.Id == item.Id).FirstOrDefault(); - items.Remove(_item); - items.Add(item); - - return await Task.FromResult(true); - } - - public async Task DeleteItemAsync(Item item) - { - var _item = items.Where((Item arg) => arg.Id == item.Id).FirstOrDefault(); - items.Remove(_item); - - return await Task.FromResult(true); - } - - public async Task GetItemAsync(string id) - { - return await Task.FromResult(items.FirstOrDefault(s => s.Id == id)); - } - - public async Task> GetItemsAsync(bool forceRefresh = false) - { - var scrapper = new SpellsScrappers(); - var spells = await scrapper.GetSpells(await scrapper.GetSpellIds("c")); - items = spells.Select(spell => new Item() { Text = spell.Title, Description = spell.DescriptionText }).ToList(); - return await Task.FromResult(items); - } - public async Task> GetItemsAsync(string classe, int minLevel, int maxLevel, string ecole, string rituel, string source) - { - return await GetItemsAsync(); - } - - } -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Services/MonsterDataStore.cs b/AideDeJeu/AideDeJeu/Services/MonsterDataStore.cs deleted file mode 100644 index 0f57422c..00000000 --- a/AideDeJeu/AideDeJeu/Services/MonsterDataStore.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -using AideDeJeu.Models; -using AideDeJeuLib; -using AideDeJeuLib.Monsters; -using AideDeJeuLib.Spells; - -[assembly: Xamarin.Forms.Dependency(typeof(AideDeJeu.Services.SpellDataStore))] -namespace AideDeJeu.Services -{ - //public class MonsterDataStore : IDataStore - //{ - // List items; - - // public MonsterDataStore() - // { - // items = new List(); - // var mockItems = new List - // { - // }; - - // foreach (var item in mockItems) - // { - // items.Add(item); - // } - // } - - // public async Task AddItemAsync(Spell item) - // { - // items.Add(item); - - // return await Task.FromResult(true); - // } - - // public async Task UpdateItemAsync(Spell item) - // { - // var _item = items.Where((Spell arg) => arg.Id == item.Id).FirstOrDefault(); - // items.Remove(_item); - // items.Add(item); - - // return await Task.FromResult(true); - // } - - // public async Task DeleteItemAsync(Spell item) - // { - // var _item = items.Where((Spell arg) => arg.Id == item.Id).FirstOrDefault(); - // items.Remove(_item); - - // return await Task.FromResult(true); - // } - - // public async Task GetItemAsync(string id) - // { - // return await Task.FromResult(items.FirstOrDefault(s => s.Id == id)); - // } - - // public async Task> GetItemsAsync(bool forceRefresh = false) - // { - // var scrapper = new MonstersScrappers(); - // //items = (await scrapper.GetSpells(await scrapper.GetSpellIds(""))).ToList(); - // items = (await scrapper.GetMonsters()).ToList(); - - // //items = spells.Select(spell => new Item() { Text = spell.Title, Description = spell.DescriptionText }).ToList(); - // return await Task.FromResult(items); - // } - - // public async Task> GetItemsAsync(string classe, int niveauMin, int niveauMax, string ecole, string rituel, string source) - // { - // var scrapper = new MonstersScrappers(); - // items = (await scrapper.GetMonsters(classe: classe, niveauMin: niveauMin, niveauMax: niveauMax, ecole: ecole, rituel: rituel, source: source)).ToList(); - - // return await Task.FromResult(items); - // } - - //} -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Services/SpellDataStore.cs b/AideDeJeu/AideDeJeu/Services/SpellDataStore.cs deleted file mode 100644 index 55e91586..00000000 --- a/AideDeJeu/AideDeJeu/Services/SpellDataStore.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -using AideDeJeu.Models; -using AideDeJeuLib; -using AideDeJeuLib.Spells; - -[assembly: Xamarin.Forms.Dependency(typeof(AideDeJeu.Services.SpellDataStore))] -namespace AideDeJeu.Services -{ - public class SpellDataStore : IDataStore - { - List items; - - public SpellDataStore() - { - items = new List(); - var mockItems = new List - { - }; - - foreach (var item in mockItems) - { - items.Add(item); - } - } - - public async Task AddItemAsync(Spell item) - { - items.Add(item); - - return await Task.FromResult(true); - } - - public async Task UpdateItemAsync(Spell item) - { - var _item = items.Where((Spell arg) => arg.Id == item.Id).FirstOrDefault(); - items.Remove(_item); - items.Add(item); - - return await Task.FromResult(true); - } - - public async Task DeleteItemAsync(Spell item) - { - var _item = items.Where((Spell arg) => arg.Id == item.Id).FirstOrDefault(); - items.Remove(_item); - - return await Task.FromResult(true); - } - - public async Task GetItemAsync(string id) - { - return await Task.FromResult(items.FirstOrDefault(s => s.Id == id)); - } - - public async Task> GetItemsAsync(bool forceRefresh = false) - { - var scrapper = new SpellsScrappers(); - //items = (await scrapper.GetSpells(await scrapper.GetSpellIds(""))).ToList(); - items = (await scrapper.GetSpells()).ToList(); - - //items = spells.Select(spell => new Item() { Text = spell.Title, Description = spell.DescriptionText }).ToList(); - return await Task.FromResult(items); - } - - public async Task> GetItemsAsync(string classe, int niveauMin, int niveauMax, string ecole, string rituel, string source) - { - var scrapper = new SpellsScrappers(); - items = (await scrapper.GetSpells(classe: classe, niveauMin: niveauMin, niveauMax: niveauMax, ecole: ecole, rituel: rituel, source: source)).ToList(); - - return await Task.FromResult(items); - } - - } -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/ViewModels/BaseViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/BaseViewModel.cs index 7aaba3dd..fae225bd 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/BaseViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/BaseViewModel.cs @@ -5,17 +5,17 @@ using System.Runtime.CompilerServices; using Xamarin.Forms; -using AideDeJeu.Models; -using AideDeJeu.Services; -using AideDeJeuLib; using AideDeJeuLib.Spells; +using AideDeJeuLib.Monsters; namespace AideDeJeu.ViewModels { public class BaseViewModel : INotifyPropertyChanged { - public IDataStore DataStore => DependencyService.Get>() ?? new MockDataStore(); - public IDataStore SpellDataStore => DependencyService.Get>() ?? new SpellDataStore(); + //public IDataStore DataStore => DependencyService.Get>() ?? new MockDataStore(); + //public IDataStore SpellDataStore => DependencyService.Get>() ?? new SpellDataStore(); + public SpellsScrappers SpellsScrappers => DependencyService.Get() ?? new SpellsScrappers(); + public MonstersScrappers MonsterScrappers => DependencyService.Get() ?? new MonstersScrappers(); bool isBusy = false; public bool IsBusy diff --git a/AideDeJeu/AideDeJeu/ViewModels/ItemDetailViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/ItemDetailViewModel.cs deleted file mode 100644 index 7db2c348..00000000 --- a/AideDeJeu/AideDeJeu/ViewModels/ItemDetailViewModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; - -using AideDeJeu.Models; - -namespace AideDeJeu.ViewModels -{ - public class ItemDetailViewModel : BaseViewModel - { - public Item Item { get; set; } - public ItemDetailViewModel(Item item = null) - { - Title = item?.Text; - Item = item; - } - } -} diff --git a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs deleted file mode 100644 index b6225a42..00000000 --- a/AideDeJeu/AideDeJeu/ViewModels/ItemsViewModel.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.ObjectModel; -using System.Diagnostics; -using System.Threading.Tasks; - -using Xamarin.Forms; - -using AideDeJeu.Models; -using AideDeJeu.Views; - -namespace AideDeJeu.ViewModels -{ - public class ItemsViewModel : BaseViewModel - { - public ObservableCollection Items { get; set; } - public Command LoadItemsCommand { get; set; } - - public ItemsViewModel() - { - Title = "Browse"; - Items = new ObservableCollection(); - LoadItemsCommand = new Command(async () => await ExecuteLoadItemsCommand()); - - MessagingCenter.Subscribe(this, "AddItem", async (obj, item) => - { - var _item = item as Item; - Items.Add(_item); - await DataStore.AddItemAsync(_item); - }); - } - - async Task ExecuteLoadItemsCommand() - { - if (IsBusy) - return; - - IsBusy = true; - - try - { - Items.Clear(); - var items = await DataStore.GetItemsAsync(true); - foreach (var item in items) - { - Items.Add(item); - } - } - catch (Exception ex) - { - Debug.WriteLine(ex); - } - finally - { - IsBusy = false; - } - } - } -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs index f4ce40b0..18ba66cf 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs @@ -5,10 +5,6 @@ using System.Threading.Tasks; using Xamarin.Forms; -using AideDeJeu.Models; -using AideDeJeu.Views; -using AideDeJeuLib; -using AideDeJeuLib.Spells; using System.Collections.Generic; using AideDeJeuLib.Monsters; diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs index d67cfad4..97e249f4 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs @@ -5,9 +5,6 @@ using System.Threading.Tasks; using Xamarin.Forms; -using AideDeJeu.Models; -using AideDeJeu.Views; -using AideDeJeuLib; using AideDeJeuLib.Spells; using System.Collections.Generic; @@ -194,7 +191,7 @@ namespace AideDeJeu.ViewModels // Items.Clear(); - var items = await SpellDataStore.GetItemsAsync(classe: Classes[Classe].Key, niveauMin: NiveauMin, niveauMax: NiveauMax, ecole: Ecoles[Ecole].Key, rituel: Rituels[Rituel].Key, source: Sources[Source].Key); + var items = await SpellsScrappers.GetSpells(classe: Classes[Classe].Key, niveauMin: NiveauMin, niveauMax: NiveauMax, ecole: Ecoles[Ecole].Key, rituel: Rituels[Rituel].Key, source: Sources[Source].Key); foreach (var item in items) { Items.Add(item); diff --git a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml deleted file mode 100644 index a045d075..00000000 --- a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs deleted file mode 100644 index 21bb51ee..00000000 --- a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; - -using Xamarin.Forms; -using Xamarin.Forms.Xaml; - -using AideDeJeu.Models; -using AideDeJeu.ViewModels; - -namespace AideDeJeu.Views -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class ItemDetailPage : ContentPage - { - ItemDetailViewModel viewModel; - - public ItemDetailPage(ItemDetailViewModel viewModel) - { - InitializeComponent(); - - BindingContext = this.viewModel = viewModel; - } - - public ItemDetailPage() - { - InitializeComponent(); - - var item = new Item - { - Text = "Item 1", - Description = "This is an item description." - }; - - viewModel = new ItemDetailViewModel(item); - BindingContext = viewModel; - } - } -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml deleted file mode 100644 index ea4d6bbe..00000000 --- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs deleted file mode 100644 index 96fe8f8b..00000000 --- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using Xamarin.Forms; -using Xamarin.Forms.Xaml; - -using AideDeJeu.Models; -using AideDeJeu.Views; -using AideDeJeu.ViewModels; - -namespace AideDeJeu.Views -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class ItemsPage : ContentPage - { - ItemsViewModel viewModel; - - public ItemsPage() - { - InitializeComponent(); - - BindingContext = viewModel = new ItemsViewModel(); - } - - async void OnItemSelected(object sender, SelectedItemChangedEventArgs args) - { - var item = args.SelectedItem as Item; - if (item == null) - return; - - await Navigation.PushAsync(new ItemDetailPage(new ItemDetailViewModel(item))); - - // Manually deselect item. - ItemsListView.SelectedItem = null; - } - - async void AddItem_Clicked(object sender, EventArgs e) - { - await Navigation.PushModalAsync(new NavigationPage(new NewItemPage())); - } - - protected override void OnAppearing() - { - base.OnAppearing(); - - if (viewModel.Items.Count == 0) - viewModel.LoadItemsCommand.Execute(null); - } - } -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml.cs index 60c569f9..66d21451 100644 --- a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml.cs @@ -1,17 +1,12 @@ -using System; - + +using AideDeJeu.ViewModels; +using AideDeJeuLib.Monsters; using Xamarin.Forms; using Xamarin.Forms.Xaml; -using AideDeJeu.Models; -using AideDeJeu.ViewModels; -using AideDeJeuLib; -using AideDeJeuLib.Spells; -using AideDeJeuLib.Monsters; - namespace AideDeJeu.Views { - [XamlCompilation(XamlCompilationOptions.Compile)] + [XamlCompilation(XamlCompilationOptions.Compile)] public partial class MonsterDetailPage : ContentPage { MonsterDetailViewModel viewModel; diff --git a/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml.cs index 69838c20..202082b2 100644 --- a/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml.cs @@ -1,8 +1,5 @@ -using AideDeJeu.Models; -using AideDeJeu.ViewModels; -using AideDeJeuLib; +using AideDeJeu.ViewModels; using AideDeJeuLib.Monsters; -using AideDeJeuLib.Spells; using System; using Xamarin.Forms; @@ -10,7 +7,7 @@ using Xamarin.Forms.Xaml; namespace AideDeJeu.Views { - [XamlCompilation(XamlCompilationOptions.Compile)] + [XamlCompilation(XamlCompilationOptions.Compile)] public partial class MonstersPage : MasterDetailPage //TabbedPage { MonstersViewModel viewModel; diff --git a/AideDeJeu/AideDeJeu/Views/NewItemPage.xaml b/AideDeJeu/AideDeJeu/Views/NewItemPage.xaml deleted file mode 100644 index 77fda276..00000000 --- a/AideDeJeu/AideDeJeu/Views/NewItemPage.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/AideDeJeu/AideDeJeu/Views/NewItemPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/NewItemPage.xaml.cs deleted file mode 100644 index 2471e8b0..00000000 --- a/AideDeJeu/AideDeJeu/Views/NewItemPage.xaml.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; - -using Xamarin.Forms; -using Xamarin.Forms.Xaml; - -using AideDeJeu.Models; - -namespace AideDeJeu.Views -{ - [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class NewItemPage : ContentPage - { - public Item Item { get; set; } - - public NewItemPage() - { - InitializeComponent(); - - Item = new Item - { - Text = "Item name", - Description = "This is an item description." - }; - - BindingContext = this; - } - - async void Save_Clicked(object sender, EventArgs e) - { - MessagingCenter.Send(this, "AddItem", Item); - await Navigation.PopModalAsync(); - } - } -} \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml.cs index 69b36d0c..45a943c5 100644 --- a/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/SpellDetailPage.xaml.cs @@ -1,16 +1,12 @@ -using System; - + +using AideDeJeu.ViewModels; +using AideDeJeuLib.Spells; using Xamarin.Forms; using Xamarin.Forms.Xaml; -using AideDeJeu.Models; -using AideDeJeu.ViewModels; -using AideDeJeuLib; -using AideDeJeuLib.Spells; - namespace AideDeJeu.Views { - [XamlCompilation(XamlCompilationOptions.Compile)] + [XamlCompilation(XamlCompilationOptions.Compile)] public partial class SpellDetailPage : ContentPage { SpellDetailViewModel viewModel; diff --git a/AideDeJeu/AideDeJeu/Views/SpellsPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/SpellsPage.xaml.cs index 0c4fb10e..6e9a810e 100644 --- a/AideDeJeu/AideDeJeu/Views/SpellsPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/SpellsPage.xaml.cs @@ -1,6 +1,4 @@ -using AideDeJeu.Models; -using AideDeJeu.ViewModels; -using AideDeJeuLib; +using AideDeJeu.ViewModels; using AideDeJeuLib.Spells; using System; @@ -9,7 +7,7 @@ using Xamarin.Forms.Xaml; namespace AideDeJeu.Views { - [XamlCompilation(XamlCompilationOptions.Compile)] + [XamlCompilation(XamlCompilationOptions.Compile)] public partial class SpellsPage : MasterDetailPage //TabbedPage { SpellsViewModel viewModel;