mirror of
				https://github.com/Nioux/AideDeJeu.git
				synced 2025-10-31 07:26:09 +00:00 
			
		
		
		
	Intégration pc editor dans le shell
This commit is contained in:
		
							parent
							
								
									5cb823b074
								
							
						
					
					
						commit
						d0a63a8e40
					
				
					 17 changed files with 148 additions and 112 deletions
				
			
		|  | @ -123,6 +123,21 @@ | ||||||
|     <Compile Update="Views\Pickers\ItemPickerView.xaml.cs"> |     <Compile Update="Views\Pickers\ItemPickerView.xaml.cs"> | ||||||
|       <DependentUpon>ItemPickerView.xaml</DependentUpon> |       <DependentUpon>ItemPickerView.xaml</DependentUpon> | ||||||
|     </Compile> |     </Compile> | ||||||
|  |     <Compile Update="Views\PlayerCharacter\AbilitiesPage.xaml.cs"> | ||||||
|  |       <DependentUpon>AbilitiesPage.xaml</DependentUpon> | ||||||
|  |     </Compile> | ||||||
|  |     <Compile Update="Views\PlayerCharacter\BackgroundPage.xaml.cs"> | ||||||
|  |       <DependentUpon>BackgroundPage.xaml</DependentUpon> | ||||||
|  |     </Compile> | ||||||
|  |     <Compile Update="Views\PlayerCharacter\ClassPage.xaml.cs"> | ||||||
|  |       <DependentUpon>ClassPage.xaml</DependentUpon> | ||||||
|  |     </Compile> | ||||||
|  |     <Compile Update="Views\PlayerCharacter\FinalizePage.xaml.cs"> | ||||||
|  |       <DependentUpon>FinalizePage.xaml</DependentUpon> | ||||||
|  |     </Compile> | ||||||
|  |     <Compile Update="Views\PlayerCharacter\RacePage.xaml.cs"> | ||||||
|  |       <DependentUpon>RacePage.xaml</DependentUpon> | ||||||
|  |     </Compile> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
| 
 | 
 | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|  | @ -167,7 +182,7 @@ | ||||||
|     <EmbeddedResource Update="Views\Pickers\AbilityPickerView.xaml"> |     <EmbeddedResource Update="Views\Pickers\AbilityPickerView.xaml"> | ||||||
|       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> |       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\AbilitiesView.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\AbilitiesPage.xaml"> | ||||||
|       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> |       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\AbilityBaseValueView.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\AbilityBaseValueView.xaml"> | ||||||
|  | @ -176,16 +191,16 @@ | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\AbilityRacialBonusView.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\AbilityRacialBonusView.xaml"> | ||||||
|       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> |       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\BackgroundView.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\BackgroundPage.xaml"> | ||||||
|       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> |       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\ClassView.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\ClassPage.xaml"> | ||||||
|       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> |       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\EquipmentView.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\EquipmentView.xaml"> | ||||||
|       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> |       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\FinalizeView.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\FinalizePage.xaml"> | ||||||
|       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> |       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\PdfViewPage.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\PdfViewPage.xaml"> | ||||||
|  | @ -200,7 +215,7 @@ | ||||||
|     <EmbeddedResource Update="Views\Pickers\StringPickerView.xaml"> |     <EmbeddedResource Update="Views\Pickers\StringPickerView.xaml"> | ||||||
|       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> |       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\RaceView.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\RacePage.xaml"> | ||||||
|       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> |       <Generator>MSBuild:UpdateDesignTimeXaml</Generator> | ||||||
|     </EmbeddedResource> |     </EmbeddedResource> | ||||||
|     <EmbeddedResource Update="Views\PlayerCharacter\ResumeView.xaml"> |     <EmbeddedResource Update="Views\PlayerCharacter\ResumeView.xaml"> | ||||||
|  |  | ||||||
|  | @ -17,7 +17,7 @@ | ||||||
|     <ContentPage.ToolbarItems> |     <ContentPage.ToolbarItems> | ||||||
|         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" /> |         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" /> | ||||||
|         <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding Main.Navigator.GeneratePDFCommand}" CommandParameter="{Binding Item.Markdown}" /> |         <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding Main.Navigator.GeneratePDFCommand}" CommandParameter="{Binding Item.Markdown}" /> | ||||||
|         <ToolbarItem Name="Speak" Text="Écouter / Arrêter" Order="Primary" Icon="round_star.png" Command="{Binding Main.Speech.SpeakItemCommand}" CommandParameter="{Binding Item}}" /> |         <ToolbarItem Name="Speak" Text="Écouter / Arrêter" Order="Primary" Icon="round_star.png" Command="{Binding Main.Speech.SpeakItemCommand}" CommandParameter="{Binding Item}" /> | ||||||
|     </ContentPage.ToolbarItems> |     </ContentPage.ToolbarItems> | ||||||
|     <Grid> |     <Grid> | ||||||
|         <!--<ScrollView Orientation="Vertical" BackgroundColor="{StaticResource HDWhite}"> |         <!--<ScrollView Orientation="Vertical" BackgroundColor="{StaticResource HDWhite}"> | ||||||
|  |  | ||||||
|  | @ -131,7 +131,16 @@ | ||||||
|     </Shell.FlyoutHeader> |     </Shell.FlyoutHeader> | ||||||
| 
 | 
 | ||||||
|     <ShellContent Title="Accueil" Route="home" ContentTemplate="{DataTemplate local:MainPage}" /> |     <ShellContent Title="Accueil" Route="home" ContentTemplate="{DataTemplate local:MainPage}" /> | ||||||
|     <ShellContent Title="Personnages" Route="pceditor" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" /> |     <!--<ShellContent Title="Personnages" Route="pceditor" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" />--> | ||||||
|  |     <FlyoutItem Title="Personnages" Route="pceditor" Icon="battle_axe.png"> | ||||||
|  |         <Tab Title="Personnages"> | ||||||
|  |             <ShellContent Title="Race" ContentTemplate="{DataTemplate pc:RacePage}" /> | ||||||
|  |             <ShellContent Title="Historique" ContentTemplate="{DataTemplate pc:BackgroundPage}" /> | ||||||
|  |             <ShellContent Title="Classe" ContentTemplate="{DataTemplate pc:ClassPage}" /> | ||||||
|  |             <ShellContent Title="Caractéristiques" ContentTemplate="{DataTemplate pc:AbilitiesPage}" /> | ||||||
|  |             <ShellContent Title="Finalisation" ContentTemplate="{DataTemplate pc:FinalizePage}" /> | ||||||
|  |         </Tab> | ||||||
|  |     </FlyoutItem> | ||||||
|     <ShellContent Title="Dés" Icon="d20.png" Route="dices" ContentTemplate="{DataTemplate local:DicesPage}" /> |     <ShellContent Title="Dés" Icon="d20.png" Route="dices" ContentTemplate="{DataTemplate local:DicesPage}" /> | ||||||
|     <FlyoutItem FlyoutDisplayOptions="AsMultipleItems"> |     <FlyoutItem FlyoutDisplayOptions="AsMultipleItems"> | ||||||
|         <ShellContent Title="Bibliothèque" Route="library" Icon="spell_book.png"> |         <ShellContent Title="Bibliothèque" Route="library" Icon="spell_book.png"> | ||||||
|  |  | ||||||
|  | @ -1,18 +1,22 @@ | ||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <ContentView xmlns="http://xamarin.com/schemas/2014/forms"  | <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"  | ||||||
|              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" |              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||||||
|              xmlns:tools="clr-namespace:AideDeJeu.Tools" |              xmlns:tools="clr-namespace:AideDeJeu.Tools" | ||||||
|              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" |              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" | ||||||
|              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" |              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" | ||||||
|              xmlns:pcviews="clr-namespace:AideDeJeu.Views.PlayerCharacter" |              xmlns:pcviews="clr-namespace:AideDeJeu.Views.PlayerCharacter" | ||||||
|              x:Class="AideDeJeu.Views.PlayerCharacter.AbilitiesView"> |              x:Class="AideDeJeu.Views.PlayerCharacter.AbilitiesPage" | ||||||
|     <ContentView.Resources> |              x:Name="This"> | ||||||
|  |     <ContentPage.Resources> | ||||||
|         <ResourceDictionary> |         <ResourceDictionary> | ||||||
|             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> |             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> | ||||||
|             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> |             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> | ||||||
|         </ResourceDictionary> |         </ResourceDictionary> | ||||||
|     </ContentView.Resources> |     </ContentPage.Resources> | ||||||
|     <ContentView.Content> |     <ContentPage.ToolbarItems> | ||||||
|  |         <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" /> | ||||||
|  |     </ContentPage.ToolbarItems> | ||||||
|  |     <ContentPage.Content> | ||||||
|         <ScrollView Orientation="Vertical"> |         <ScrollView Orientation="Vertical"> | ||||||
|             <Grid> |             <Grid> | ||||||
|                 <Grid.ColumnDefinitions> |                 <Grid.ColumnDefinitions> | ||||||
|  | @ -100,5 +104,5 @@ | ||||||
|                 </Frame> |                 </Frame> | ||||||
|             </Grid> |             </Grid> | ||||||
|         </ScrollView> |         </ScrollView> | ||||||
|     </ContentView.Content> |     </ContentPage.Content> | ||||||
| </ContentView> | </ContentPage> | ||||||
|  | @ -10,11 +10,13 @@ using Xamarin.Forms.Xaml; | ||||||
| namespace AideDeJeu.Views.PlayerCharacter | namespace AideDeJeu.Views.PlayerCharacter | ||||||
| { | { | ||||||
|     [XamlCompilation(XamlCompilationOptions.Compile)] |     [XamlCompilation(XamlCompilationOptions.Compile)] | ||||||
|     public partial class AbilitiesView : ContentView |     public partial class AbilitiesPage : ContentPage | ||||||
|     { |     { | ||||||
|         public AbilitiesView() |         public AbilitiesPage() | ||||||
|         { |         { | ||||||
|             InitializeComponent(); |             InitializeComponent(); | ||||||
|  | 
 | ||||||
|  |             BindingContext = DependencyService.Get<AideDeJeu.ViewModels.PlayerCharacter.PlayerCharacterEditorViewModel>(); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | @ -1,17 +1,21 @@ | ||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <ContentView xmlns="http://xamarin.com/schemas/2014/forms"  | <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"  | ||||||
|              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" |              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||||||
|              xmlns:tools="clr-namespace:AideDeJeu.Tools" |              xmlns:tools="clr-namespace:AideDeJeu.Tools" | ||||||
|              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" |              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" | ||||||
|              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" |              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" | ||||||
|              x:Class="AideDeJeu.Views.PlayerCharacter.BackgroundView"> |              x:Class="AideDeJeu.Views.PlayerCharacter.BackgroundPage" | ||||||
|     <ContentView.Resources> |              x:Name="This"> | ||||||
|  |     <ContentPage.Resources> | ||||||
|         <ResourceDictionary> |         <ResourceDictionary> | ||||||
|             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> |             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> | ||||||
|             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> |             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> | ||||||
|         </ResourceDictionary> |         </ResourceDictionary> | ||||||
|     </ContentView.Resources> |     </ContentPage.Resources> | ||||||
|     <ContentView.Content> |     <ContentPage.ToolbarItems> | ||||||
|  |         <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" /> | ||||||
|  |     </ContentPage.ToolbarItems> | ||||||
|  |     <ContentPage.Content> | ||||||
|         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical"> |         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical"> | ||||||
|             <StackLayout> |             <StackLayout> | ||||||
| 
 | 
 | ||||||
|  | @ -72,5 +76,5 @@ | ||||||
| 
 | 
 | ||||||
|             </StackLayout> |             </StackLayout> | ||||||
|         </ScrollView> |         </ScrollView> | ||||||
|     </ContentView.Content> |     </ContentPage.Content> | ||||||
| </ContentView> | </ContentPage> | ||||||
|  | @ -0,0 +1,16 @@ | ||||||
|  | using Xamarin.Forms; | ||||||
|  | using Xamarin.Forms.Xaml; | ||||||
|  | 
 | ||||||
|  | namespace AideDeJeu.Views.PlayerCharacter | ||||||
|  | { | ||||||
|  |     [XamlCompilation(XamlCompilationOptions.Compile)] | ||||||
|  |     public partial class BackgroundPage : ContentPage | ||||||
|  |     { | ||||||
|  |         public BackgroundPage() | ||||||
|  |         { | ||||||
|  |             InitializeComponent(); | ||||||
|  | 
 | ||||||
|  |             BindingContext = DependencyService.Get<AideDeJeu.ViewModels.PlayerCharacter.PlayerCharacterEditorViewModel>(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | @ -1,20 +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; |  | ||||||
| 
 |  | ||||||
| namespace AideDeJeu.Views.PlayerCharacter |  | ||||||
| { |  | ||||||
|     [XamlCompilation(XamlCompilationOptions.Compile)] |  | ||||||
|     public partial class BackgroundView : ContentView |  | ||||||
|     { |  | ||||||
|         public BackgroundView() |  | ||||||
|         { |  | ||||||
|             InitializeComponent(); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  | @ -1,17 +1,21 @@ | ||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <ContentView xmlns="http://xamarin.com/schemas/2014/forms"  | <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"  | ||||||
|              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" |              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||||||
|              xmlns:tools="clr-namespace:AideDeJeu.Tools" |              xmlns:tools="clr-namespace:AideDeJeu.Tools" | ||||||
|              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" |              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" | ||||||
|              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" |              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" | ||||||
|              x:Class="AideDeJeu.Views.PlayerCharacter.ClassView"> |              x:Class="AideDeJeu.Views.PlayerCharacter.ClassPage" | ||||||
|     <ContentView.Resources> |              x:Name="This"> | ||||||
|  |     <ContentPage.Resources> | ||||||
|         <ResourceDictionary> |         <ResourceDictionary> | ||||||
|             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> |             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> | ||||||
|             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> |             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> | ||||||
|         </ResourceDictionary> |         </ResourceDictionary> | ||||||
|     </ContentView.Resources> |     </ContentPage.Resources> | ||||||
|     <ContentView.Content> |     <ContentPage.ToolbarItems> | ||||||
|  |         <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" /> | ||||||
|  |     </ContentPage.ToolbarItems> | ||||||
|  |     <ContentPage.Content> | ||||||
|         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical"> |         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical"> | ||||||
|             <StackLayout> |             <StackLayout> | ||||||
|                 <pickers:ItemPickerView BindingContext="{Binding}" Title="Classe" ItemsSource="{Binding Classes}" SelectedItem="{Binding SelectedPlayerCharacter.Class, Mode=TwoWay}" /> |                 <pickers:ItemPickerView BindingContext="{Binding}" Title="Classe" ItemsSource="{Binding Classes}" SelectedItem="{Binding SelectedPlayerCharacter.Class, Mode=TwoWay}" /> | ||||||
|  | @ -48,5 +52,5 @@ | ||||||
|                 <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Class.Markdown}" />--> |                 <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Class.Markdown}" />--> | ||||||
|             </StackLayout> |             </StackLayout> | ||||||
|         </ScrollView> |         </ScrollView> | ||||||
|     </ContentView.Content> |     </ContentPage.Content> | ||||||
| </ContentView> | </ContentPage> | ||||||
							
								
								
									
										16
									
								
								AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml.cs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml.cs
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,16 @@ | ||||||
|  | using Xamarin.Forms; | ||||||
|  | using Xamarin.Forms.Xaml; | ||||||
|  | 
 | ||||||
|  | namespace AideDeJeu.Views.PlayerCharacter | ||||||
|  | { | ||||||
|  |     [XamlCompilation(XamlCompilationOptions.Compile)] | ||||||
|  |     public partial class ClassPage : ContentPage | ||||||
|  |     { | ||||||
|  |         public ClassPage() | ||||||
|  |         { | ||||||
|  |             InitializeComponent(); | ||||||
|  | 
 | ||||||
|  |             BindingContext = DependencyService.Get<AideDeJeu.ViewModels.PlayerCharacter.PlayerCharacterEditorViewModel>(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | @ -1,17 +1,21 @@ | ||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <ContentView xmlns="http://xamarin.com/schemas/2014/forms"  | <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"  | ||||||
|              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" |              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||||||
|              xmlns:tools="clr-namespace:AideDeJeu.Tools" |              xmlns:tools="clr-namespace:AideDeJeu.Tools" | ||||||
|              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" |              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" | ||||||
|              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" |              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" | ||||||
|              x:Class="AideDeJeu.Views.PlayerCharacter.FinalizeView"> |              x:Class="AideDeJeu.Views.PlayerCharacter.FinalizePage" | ||||||
|     <ContentView.Resources> |              x:Name="This"> | ||||||
|  |     <ContentPage.Resources> | ||||||
|         <ResourceDictionary> |         <ResourceDictionary> | ||||||
|             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> |             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> | ||||||
|             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> |             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> | ||||||
|         </ResourceDictionary> |         </ResourceDictionary> | ||||||
|     </ContentView.Resources> |     </ContentPage.Resources> | ||||||
|     <ContentView.Content> |     <ContentPage.ToolbarItems> | ||||||
|  |         <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" /> | ||||||
|  |     </ContentPage.ToolbarItems> | ||||||
|  |     <ContentPage.Content> | ||||||
|         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical"> |         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical"> | ||||||
|             <StackLayout> |             <StackLayout> | ||||||
|                 <Frame BorderColor="Black" Padding="2" Margin="10"> |                 <Frame BorderColor="Black" Padding="2" Margin="10"> | ||||||
|  | @ -39,5 +43,5 @@ | ||||||
| 
 | 
 | ||||||
|             </StackLayout> |             </StackLayout> | ||||||
|         </ScrollView> |         </ScrollView> | ||||||
|     </ContentView.Content> |     </ContentPage.Content> | ||||||
| </ContentView> | </ContentPage> | ||||||
|  | @ -10,11 +10,13 @@ using Xamarin.Forms.Xaml; | ||||||
| namespace AideDeJeu.Views.PlayerCharacter | namespace AideDeJeu.Views.PlayerCharacter | ||||||
| { | { | ||||||
|     [XamlCompilation(XamlCompilationOptions.Compile)] |     [XamlCompilation(XamlCompilationOptions.Compile)] | ||||||
|     public partial class ClassView : ContentView |     public partial class FinalizePage : ContentPage | ||||||
|     { |     { | ||||||
|         public ClassView() |         public FinalizePage() | ||||||
|         { |         { | ||||||
|             InitializeComponent(); |             InitializeComponent(); | ||||||
|  | 
 | ||||||
|  |             BindingContext = DependencyService.Get<AideDeJeu.ViewModels.PlayerCharacter.PlayerCharacterEditorViewModel>(); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | @ -1,20 +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; |  | ||||||
| 
 |  | ||||||
| namespace AideDeJeu.Views.PlayerCharacter |  | ||||||
| { |  | ||||||
|     [XamlCompilation(XamlCompilationOptions.Compile)] |  | ||||||
|     public partial class FinalizeView : ContentView |  | ||||||
|     { |  | ||||||
|         public FinalizeView() |  | ||||||
|         { |  | ||||||
|             InitializeComponent(); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  | @ -63,7 +63,7 @@ | ||||||
|                 <RowDefinition Height="auto" /> |                 <RowDefinition Height="auto" /> | ||||||
|             </Grid.RowDefinitions> |             </Grid.RowDefinitions> | ||||||
|              |              | ||||||
|             <pcviews:RaceView Grid.ColumnSpan="2" BindingContext="{Binding}" /> |             <!--<pcviews:RaceView Grid.ColumnSpan="2" BindingContext="{Binding}" />--> | ||||||
| 
 | 
 | ||||||
|             <Button Grid.Column="0" Grid.Row="1" Text="Nouveau" Command="{Binding ResetPlayerCharacterCommand}"/> |             <Button Grid.Column="0" Grid.Row="1" Text="Nouveau" Command="{Binding ResetPlayerCharacterCommand}"/> | ||||||
|             <Button Grid.Column="1" Grid.Row="1" Text="Historique" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Background}"/> |             <Button Grid.Column="1" Grid.Row="1" Text="Historique" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Background}"/> | ||||||
|  | @ -80,7 +80,7 @@ | ||||||
|                 <RowDefinition Height="auto" /> |                 <RowDefinition Height="auto" /> | ||||||
|             </Grid.RowDefinitions> |             </Grid.RowDefinitions> | ||||||
| 
 | 
 | ||||||
|             <pcviews:BackgroundView Grid.ColumnSpan="2" BindingContext="{Binding}" /> |             <!--<pcviews:BackgroundView Grid.ColumnSpan="2" BindingContext="{Binding}" />--> | ||||||
| 
 | 
 | ||||||
|             <Button Grid.Column="0" Grid.Row="1" Text="Race" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Race}"/> |             <Button Grid.Column="0" Grid.Row="1" Text="Race" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Race}"/> | ||||||
|             <Button Grid.Column="1" Grid.Row="1" Text="Classe" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Class}"/> |             <Button Grid.Column="1" Grid.Row="1" Text="Classe" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Class}"/> | ||||||
|  | @ -97,7 +97,7 @@ | ||||||
|                 <RowDefinition Height="auto" /> |                 <RowDefinition Height="auto" /> | ||||||
|             </Grid.RowDefinitions> |             </Grid.RowDefinitions> | ||||||
| 
 | 
 | ||||||
|             <pcviews:ClassView Grid.ColumnSpan="2" BindingContext="{Binding}" /> |             <!--<pcviews:ClassView Grid.ColumnSpan="2" BindingContext="{Binding}" />--> | ||||||
| 
 | 
 | ||||||
|             <Button Grid.Column="0" Grid.Row="1" Text="Historique" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Background}"/> |             <Button Grid.Column="0" Grid.Row="1" Text="Historique" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Background}"/> | ||||||
|             <Button Grid.Column="1" Grid.Row="1" Text="Caractéristiques" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Abilities}"/> |             <Button Grid.Column="1" Grid.Row="1" Text="Caractéristiques" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Abilities}"/> | ||||||
|  | @ -114,7 +114,7 @@ | ||||||
|                 <RowDefinition Height="auto" /> |                 <RowDefinition Height="auto" /> | ||||||
|             </Grid.RowDefinitions> |             </Grid.RowDefinitions> | ||||||
| 
 | 
 | ||||||
|             <pcviews:AbilitiesView Grid.ColumnSpan="2" BindingContext="{Binding}" /> |             <!--<pcviews:AbilitiesView Grid.ColumnSpan="2" BindingContext="{Binding}" />--> | ||||||
| 
 | 
 | ||||||
|             <Button Grid.Column="0" Grid.Row="1" Text="Classe" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Class}"/> |             <Button Grid.Column="0" Grid.Row="1" Text="Classe" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Class}"/> | ||||||
|             <Button Grid.Column="1" Grid.Row="1" Text="Autres" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Others}"/> |             <Button Grid.Column="1" Grid.Row="1" Text="Autres" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Others}"/> | ||||||
|  | @ -131,7 +131,7 @@ | ||||||
|                 <RowDefinition Height="auto" /> |                 <RowDefinition Height="auto" /> | ||||||
|             </Grid.RowDefinitions> |             </Grid.RowDefinitions> | ||||||
| 
 | 
 | ||||||
|             <pcviews:FinalizeView Grid.ColumnSpan="2" BindingContext="{Binding}" /> |             <!--<pcviews:FinalizeView Grid.ColumnSpan="2" BindingContext="{Binding}" />--> | ||||||
| 
 | 
 | ||||||
|             <Button Grid.Column="0" Grid.Row="1" Text="Caractéristiques" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Abilities}"/> |             <Button Grid.Column="0" Grid.Row="1" Text="Caractéristiques" Command="{Binding ChangePageCommand, Source={x:Reference This}}" CommandParameter="{x:Reference Abilities}"/> | ||||||
|             <Button Grid.Column="1" Grid.Row="1" Text="Résumé" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" /> |             <Button Grid.Column="1" Grid.Row="1" Text="Résumé" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" /> | ||||||
|  |  | ||||||
|  | @ -1,20 +1,24 @@ | ||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
| <ContentView xmlns="http://xamarin.com/schemas/2014/forms"  | <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"  | ||||||
|              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" |              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" | ||||||
|              xmlns:tools="clr-namespace:AideDeJeu.Tools" |              xmlns:tools="clr-namespace:AideDeJeu.Tools" | ||||||
|              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" |              xmlns:mdview="clr-namespace:Xam.Forms.Markdown" | ||||||
|              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" |              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers" | ||||||
|              x:Class="AideDeJeu.Views.PlayerCharacter.RaceView"> |              x:Class="AideDeJeu.Views.PlayerCharacter.RacePage" | ||||||
|     <ContentView.Resources> |              x:Name="This"> | ||||||
|  |     <ContentPage.Resources> | ||||||
|         <ResourceDictionary> |         <ResourceDictionary> | ||||||
|             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> |             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" /> | ||||||
|             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> |             <tools:NullToFalseConverter x:Key="NullToFalseConverter" /> | ||||||
|         </ResourceDictionary> |         </ResourceDictionary> | ||||||
|     </ContentView.Resources> |     </ContentPage.Resources> | ||||||
|     <ContentView.Content> |     <ContentPage.ToolbarItems> | ||||||
|  |         <ToolbarItem Name="Print" Text="Générer un PDF" Order="Primary" Icon="scroll_unfurled.png" Command="{Binding PdfViewCommand, Source={x:Reference This}}" CommandParameter="{Binding SelectedPlayerCharacter}" /> | ||||||
|  |     </ContentPage.ToolbarItems> | ||||||
|  |     <ContentPage.Content> | ||||||
|         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical"> |         <ScrollView Grid.ColumnSpan="2" Orientation="Vertical"> | ||||||
|             <StackLayout> |             <StackLayout> | ||||||
|                 <pickers:ItemPickerView BindingContext="{Binding}" Title="Race" ItemsSource="{Binding Races}" SelectedItem="{Binding SelectedPlayerCharacter.Race, Mode=TwoWay}" IsEnabled="{Binding Races, Converter={StaticResource NullToFalseConverter}}}" /> |                 <pickers:ItemPickerView BindingContext="{Binding}" Title="Race" ItemsSource="{Binding Races}" SelectedItem="{Binding SelectedPlayerCharacter.Race, Mode=TwoWay}" IsEnabled="{Binding Races, Converter={StaticResource NullToFalseConverter}}" /> | ||||||
|                 <!--<Picker Title="Race" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Races.IsSuccessfullyCompleted}" ItemsSource="{Binding Races.Result}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding RaceSelectedIndex, Mode=TwoWay}" />--> |                 <!--<Picker Title="Race" HorizontalOptions="FillAndExpand" IsEnabled="{Binding Races.IsSuccessfullyCompleted}" ItemsSource="{Binding Races.Result}" ItemDisplayBinding="{Binding Name}" SelectedIndex="{Binding RaceSelectedIndex, Mode=TwoWay}" />--> | ||||||
| 
 | 
 | ||||||
|                 <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedPlayerCharacter.Race, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" > |                 <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedPlayerCharacter.Race, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" > | ||||||
|  | @ -57,5 +61,5 @@ | ||||||
|                 <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedRace.Markdown}" />--> |                 <!--<mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedRace.Markdown}" />--> | ||||||
|             </StackLayout> |             </StackLayout> | ||||||
|         </ScrollView> |         </ScrollView> | ||||||
|     </ContentView.Content> |     </ContentPage.Content> | ||||||
| </ContentView> | </ContentPage> | ||||||
							
								
								
									
										16
									
								
								AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml.cs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml.cs
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,16 @@ | ||||||
|  | using Xamarin.Forms; | ||||||
|  | using Xamarin.Forms.Xaml; | ||||||
|  | 
 | ||||||
|  | namespace AideDeJeu.Views.PlayerCharacter | ||||||
|  | { | ||||||
|  |     [XamlCompilation(XamlCompilationOptions.Compile)] | ||||||
|  |     public partial class RacePage : ContentPage | ||||||
|  |     { | ||||||
|  |         public RacePage() | ||||||
|  |         { | ||||||
|  |             InitializeComponent(); | ||||||
|  | 
 | ||||||
|  |             BindingContext = DependencyService.Get<AideDeJeu.ViewModels.PlayerCharacter.PlayerCharacterEditorViewModel>(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | @ -1,20 +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; |  | ||||||
| 
 |  | ||||||
| namespace AideDeJeu.Views.PlayerCharacter |  | ||||||
| { |  | ||||||
|     [XamlCompilation(XamlCompilationOptions.Compile)] |  | ||||||
|     public partial class RaceView : ContentView |  | ||||||
|     { |  | ||||||
|         public RaceView() |  | ||||||
|         { |  | ||||||
|             InitializeComponent(); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Yan Maniez
						Yan Maniez