From 3e0b3ca36bbade2a117b768de532f4c435c50612 Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Sat, 27 Apr 2019 23:37:14 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20refonte=20background=20+=20ajout?= =?UTF-8?q?=20greetings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlayerCharacter/BackgroundViewModel.cs | 16 +++++++++ .../PlayerCharacterViewModel.cs | 13 +++++++ .../PlayerCharacter/RaceViewModel.cs | 7 ++-- AideDeJeu/AideDeJeu/Views/AboutPage.xaml | 36 +++++++++++++++++++ 4 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs new file mode 100644 index 00000000..40934613 --- /dev/null +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs @@ -0,0 +1,16 @@ +using AideDeJeuLib; +using System; +using System.Collections.Generic; +using System.Text; + +namespace AideDeJeu.ViewModels.PlayerCharacter +{ + public class BackgroundViewModel : BaseViewModel + { + private BackgroundItem _Background = null; + public BackgroundItem Background { get { return _Background; } set { SetProperty(ref _Background, value); } } + + private SubBackgroundItem _SubBackground = null; + public SubBackgroundItem SubBackground { get { return _SubBackground; } set { SetProperty(ref _SubBackground, value); } } + } +} diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterViewModel.cs index f6d0566f..1fd81d58 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterViewModel.cs @@ -44,6 +44,19 @@ namespace AideDeJeu.ViewModels.PlayerCharacter _Class.LoadDetailsAsync().ConfigureAwait(true); } } + //private BackgroundViewModel _Background = null; + //public BackgroundViewModel Background + //{ + // get + // { + // return _Background; + // } + // set + // { + // SetProperty(ref _Background, value); + // _Background.LoadDetailsAsync().ConfigureAwait(true); + // } + //} diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/RaceViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/RaceViewModel.cs index 3b81e156..83ef9dc6 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/RaceViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/RaceViewModel.cs @@ -9,8 +9,11 @@ namespace AideDeJeu.ViewModels.PlayerCharacter { public class RaceViewModel : BaseViewModel { - public RaceItem Race { get; set; } - public SubRaceItem SubRace { get; set; } + private RaceItem _Race = null; + public RaceItem Race { get { return _Race; } set { SetProperty(ref _Race, value); } } + + private SubRaceItem _SubRace = null; + public SubRaceItem SubRace { get { return _SubRace; } set { SetProperty(ref _SubRace, value); } } private RaceItem RaceOrSubRace { get { return SubRace ?? Race; } } public string Name { get { return RaceOrSubRace.Name; } } diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml index 6d9919a0..9772be8e 100644 --- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml @@ -70,6 +70,42 @@ + + + + + +