5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-31 23:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Suppression des notify backgrounds

Browse source
This commit is contained in:
Yan Maniez 2019-04-28 20:55:00 +02:00
parent 9cf62f4de3
commit 6d110c08bc
3 changed files with 42 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs
View file

@ -8,12 +8,12 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
public class BackgroundViewModel : BaseViewModel public class BackgroundViewModel : BaseViewModel
{ {
private BackgroundItem _Background = null; private BackgroundItem _Background = null;
public BackgroundItem Background { get { return _Background; } set { SetProperty(ref _Background, value); OnPropertyChanged(nameof(SelectedBackground)); } } public BackgroundItem Background { get { return _Background; } set { SetProperty(ref _Background, value); OnPropertyChanged(nameof(BackgroundOrSubBackground)); } }
private SubBackgroundItem _SubBackground = null; private SubBackgroundItem _SubBackground = null;
public SubBackgroundItem SubBackground { get { return _SubBackground; } set { SetProperty(ref _SubBackground, value); OnPropertyChanged(nameof(SelectedBackground)); } } public SubBackgroundItem SubBackground { get { return _SubBackground; } set { SetProperty(ref _SubBackground, value); OnPropertyChanged(nameof(BackgroundOrSubBackground)); } }
public BackgroundItem SelectedBackground public BackgroundItem BackgroundOrSubBackground
{ {
get get
{ {

95
AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs
View file

@ -27,10 +27,10 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
Backgrounds = new NotifyTaskCompletion<List<BackgroundItem>>(Task.Run(() => LoadBackgroundsAsync())); Backgrounds = new NotifyTaskCompletion<List<BackgroundItem>>(Task.Run(() => LoadBackgroundsAsync()));
SelectedBackground = null; SelectedBackground = null;
NotifySelectedBackground = new NotifyTaskCompletion<BackgroundItem>(null); //NotifySelectedBackground = new NotifyTaskCompletion<BackgroundItem>(null);
SubBackgrounds = null; SubBackgrounds = null;
SelectedSubBackground = null; SelectedSubBackground = null;
NotifySelectedSubBackground = new NotifyTaskCompletion<SubBackgroundItem>(null); //NotifySelectedSubBackground = new NotifyTaskCompletion<SubBackgroundItem>(null);
PersonalityTraits = null; PersonalityTraits = null;
PersonalityIdeals = null; PersonalityIdeals = null;
PersonalityLinks = null; PersonalityLinks = null;
@ -75,43 +75,6 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
} }
} }
private int _AlignmentSelectedIndex = -1;
public int AlignmentSelectedIndex
{
get
{
return _AlignmentSelectedIndex;
}
set
{
SetProperty(ref _AlignmentSelectedIndex, value);
if (0 <= _AlignmentSelectedIndex && _AlignmentSelectedIndex < Alignments.Result.Count)
{
SelectedAlignment = Alignments.Result[_AlignmentSelectedIndex];
}
else
{
SelectedAlignment = null;
}
}
}
private AlignmentItem _SelectedAlignment = null;
public AlignmentItem SelectedAlignment
{
get
{
return _SelectedAlignment;
}
set
{
SetProperty(ref _SelectedAlignment, value);
//if (0 <= _AlignmentSelectedIndex && _AlignmentSelectedIndex < Alignments.Result.Count)
//{
SelectedPlayerCharacter.Alignment = SelectedAlignment;
//}
}
}
public async Task<List<AlignmentItem>> LoadAlignmentsAsync(string alignment = null) public async Task<List<AlignmentItem>> LoadAlignmentsAsync(string alignment = null)
{ {
using (var context = await StoreViewModel.GetLibraryContextAsync()) using (var context = await StoreViewModel.GetLibraryContextAsync())
@ -222,21 +185,21 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
{ {
SetProperty(ref _SelectedBackground, value); SetProperty(ref _SelectedBackground, value);
OnPropertyChanged(nameof(PreferedBackground)); OnPropertyChanged(nameof(PreferedBackground));
NotifySelectedBackground = new NotifyTaskCompletion<BackgroundItem>(Task.Run(() => LoadBackgroundAsync(_SelectedBackground))); //NotifySelectedBackground = new NotifyTaskCompletion<BackgroundItem>(Task.Run(() => LoadBackgroundAsync(_SelectedBackground)));
}
}
private NotifyTaskCompletion<BackgroundItem> _NotifySelectedBackground = null;
public NotifyTaskCompletion<BackgroundItem> NotifySelectedBackground
{
get
{
return _NotifySelectedBackground;
}
private set
{
SetProperty(ref _NotifySelectedBackground, value);
} }
} }
//private NotifyTaskCompletion<BackgroundItem> _NotifySelectedBackground = null;
//public NotifyTaskCompletion<BackgroundItem> NotifySelectedBackground
//{
// get
// {
// return _NotifySelectedBackground;
// }
// private set
// {
// SetProperty(ref _NotifySelectedBackground, value);
// }
//}
private async Task<BackgroundItem> LoadBackgroundAsync(BackgroundItem background) private async Task<BackgroundItem> LoadBackgroundAsync(BackgroundItem background)
{ {
@ -252,7 +215,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
{ {
SubBackgrounds = await LoadSubBackgroundsAsync(background); SubBackgrounds = await LoadSubBackgroundsAsync(background);
SelectedSubBackground = null; SelectedSubBackground = null;
NotifySelectedSubBackground = new NotifyTaskCompletion<SubBackgroundItem>(null); //NotifySelectedSubBackground = new NotifyTaskCompletion<SubBackgroundItem>(null);
PersonalityTraits = await LoadPersonalityTraitsAsync(background); PersonalityTraits = await LoadPersonalityTraitsAsync(background);
PersonalityIdeals = await LoadPersonalityIdealsAsync(background); PersonalityIdeals = await LoadPersonalityIdealsAsync(background);
PersonalityLinks = await LoadPersonalityLinksAsync(background); PersonalityLinks = await LoadPersonalityLinksAsync(background);
@ -318,21 +281,21 @@ namespace AideDeJeu.ViewModels.PlayerCharacter
{ {
SetProperty(ref _SelectedSubBackground, value); SetProperty(ref _SelectedSubBackground, value);
OnPropertyChanged(nameof(PreferedBackground)); OnPropertyChanged(nameof(PreferedBackground));
NotifySelectedSubBackground = new NotifyTaskCompletion<SubBackgroundItem>(Task.Run(() => LoadSubBackgroundAsync(SelectedSubBackground))); //NotifySelectedSubBackground = new NotifyTaskCompletion<SubBackgroundItem>(Task.Run(() => LoadSubBackgroundAsync(SelectedSubBackground)));
}
}
private NotifyTaskCompletion<SubBackgroundItem> _NotifySelectedSubBackground = null;
public NotifyTaskCompletion<SubBackgroundItem> NotifySelectedSubBackground
{
get
{
return _NotifySelectedSubBackground;
}
private set
{
SetProperty(ref _NotifySelectedSubBackground, value);
} }
} }
//private NotifyTaskCompletion<SubBackgroundItem> _NotifySelectedSubBackground = null;
//public NotifyTaskCompletion<SubBackgroundItem> NotifySelectedSubBackground
//{
// get
// {
// return _NotifySelectedSubBackground;
// }
// private set
// {
// SetProperty(ref _NotifySelectedSubBackground, value);
// }
//}
private async Task<SubBackgroundItem> LoadSubBackgroundAsync(SubBackgroundItem subbackground) private async Task<SubBackgroundItem> LoadSubBackgroundAsync(SubBackgroundItem subbackground)
{ {

20
AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml
View file

@ -153,27 +153,27 @@
<views:ItemPickerView BindingContext="{Binding}" Title="Variante" ItemsSource="{Binding SubBackgrounds}" SelectedItem="{Binding SelectedSubBackground, Mode=TwoWay}" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" /> <views:ItemPickerView BindingContext="{Binding}" Title="Variante" ItemsSource="{Binding SubBackgrounds}" SelectedItem="{Binding SelectedSubBackground, Mode=TwoWay}" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
<!-- test --> <!-- test -->
<!--<views:StringPickerView BindingContext="{Binding}" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}" Title="Compétences" SelectedItem="{Binding PreferedBackground.Abilities}" />--> <!--<views:StringPickerView BindingContext="{Binding}" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" Title="Compétences" SelectedItem="{Binding PreferedBackground.Abilities}" />-->
<Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}"> <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}">
<StackLayout Padding="0"> <StackLayout Padding="0">
<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Compétences" /> <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Compétences" />
<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.Abilities}" /> <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.Abilities}" />
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}"> <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}">
<StackLayout Padding="0"> <StackLayout Padding="0">
<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Outils maîtrisés" /> <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Outils maîtrisés" />
<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.MasteredTools}" /> <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.MasteredTools}" />
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}"> <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}">
<StackLayout Padding="0"> <StackLayout Padding="0">
<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Langues maîtrisées" /> <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Langues maîtrisées" />
<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.MasteredLanguages}" /> <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.MasteredLanguages}" />
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}"> <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}">
<StackLayout Padding="0"> <StackLayout Padding="0">
<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Équipement" /> <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Équipement" />
<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.Equipment}" /> <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding PreferedBackground.Equipment}" />
@ -188,13 +188,13 @@
<views:StringPickerView BindingContext="{Binding}" IsVisible="{Binding HasBackgroundSpecialties}" Title="{Binding PreferedBackgroundSpecialties.Name}" Description="{Binding PreferedBackgroundSpecialties.Description}" ItemsSource="{Binding PreferedBackgroundSpecialties.BindableTable}" SelectedItem="{Binding BackgroundSpecialty, Mode=TwoWay}" /> <views:StringPickerView BindingContext="{Binding}" IsVisible="{Binding HasBackgroundSpecialties}" Title="{Binding PreferedBackgroundSpecialties.Name}" Description="{Binding PreferedBackgroundSpecialties.Description}" ItemsSource="{Binding PreferedBackgroundSpecialties.BindableTable}" SelectedItem="{Binding BackgroundSpecialty, Mode=TwoWay}" />
<views:StringPickerView BindingContext="{Binding}" Title="Trait de personnalité" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}" ItemsSource="{Binding PersonalityTraits}" SelectedItem="{Binding SelectedPersonalityTrait, Mode=TwoWay}" /> <views:StringPickerView BindingContext="{Binding}" Title="Trait de personnalité" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" ItemsSource="{Binding PersonalityTraits}" SelectedItem="{Binding SelectedPersonalityTrait, Mode=TwoWay}" />
<views:StringPickerView BindingContext="{Binding}" Title="Idéal" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}" ItemsSource="{Binding PersonalityIdeals}" SelectedItem="{Binding SelectedPersonalityIdeal, Mode=TwoWay}" /> <views:StringPickerView BindingContext="{Binding}" Title="Idéal" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" ItemsSource="{Binding PersonalityIdeals}" SelectedItem="{Binding SelectedPersonalityIdeal, Mode=TwoWay}" />
<views:StringPickerView BindingContext="{Binding}" Title="Lien" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}" ItemsSource="{Binding PersonalityLinks}" SelectedItem="{Binding SelectedPersonalityLink, Mode=TwoWay}" /> <views:StringPickerView BindingContext="{Binding}" Title="Lien" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" ItemsSource="{Binding PersonalityLinks}" SelectedItem="{Binding SelectedPersonalityLink, Mode=TwoWay}" />
<views:StringPickerView BindingContext="{Binding}" Title="Défaut" IsVisible="{Binding NotifySelectedBackground.IsSuccessfullyCompleted}" ItemsSource="{Binding PersonalityDefects}" SelectedItem="{Binding SelectedPersonalityDefect, Mode=TwoWay}" /> <views:StringPickerView BindingContext="{Binding}" Title="Défaut" IsVisible="{Binding SelectedBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" ItemsSource="{Binding PersonalityDefects}" SelectedItem="{Binding SelectedPersonalityDefect, Mode=TwoWay}" />
</StackLayout> </StackLayout>
</ScrollView> </ScrollView>
@ -225,7 +225,7 @@
<StackLayout> <StackLayout>
<Entry Placeholder="Nom" Text="{Binding Name}" Keyboard="Text" /> <Entry Placeholder="Nom" Text="{Binding Name}" Keyboard="Text" />
<!--<Picker Title="Alignement" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Alignments.IsSuccessfullyCompleted}" ItemsSource="{Binding Alignments.Result}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding AlignmentSelectedIndex, Mode=TwoWay}" />--> <!--<Picker Title="Alignement" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Alignments.IsSuccessfullyCompleted}" ItemsSource="{Binding Alignments.Result}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding AlignmentSelectedIndex, Mode=TwoWay}" />-->
<views:ItemPickerView BindingContext="{Binding}" IsEnabled="{Binding Alignments.IsSuccessfullyCompleted}" Title="Alignement" ItemsSource="{Binding Alignments.Result}" SelectedItem="{Binding SelectedAlignment, Mode=TwoWay}" /> <views:ItemPickerView BindingContext="{Binding}" IsEnabled="{Binding Alignments.IsSuccessfullyCompleted}" Title="Alignement" ItemsSource="{Binding Alignments.Result}" SelectedItem="{Binding SelectedPlayerCharacter.Alignment, Mode=TwoWay}" />
<!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Alignment.Description}" />--> <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Alignment.Description}" />-->
<Picker Title="Niveau" HorizontalOptions="FillAndExpand" ItemsSource="{Binding Levels}" ItemDisplayBinding="{Binding StringFormat='Niveau : {0}'}" /> <Picker Title="Niveau" HorizontalOptions="FillAndExpand" ItemsSource="{Binding Levels}" ItemDisplayBinding="{Binding StringFormat='Niveau : {0}'}" />