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

Changement de l'endroit où la NavigationPage est incluse dans l'arbo

Browse source
This commit is contained in:
Yan Maniez 2018-05-18 23:24:35 +02:00
parent e9a4a2264f
commit 3033b60368
4 changed files with 34 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AideDeJeu/AideDeJeu/App.xaml.cs
View file

@ -14,7 +14,7 @@ namespace AideDeJeu
{ {
InitializeComponent(); InitializeComponent();
MainPage = new NavigationPage(new MainPage()); MainPage = new MainPage();
} }
protected override void OnStart () protected override void OnStart ()

4
AideDeJeu/AideDeJeu/Views/AboutPage.xaml
View file

@ -8,9 +8,9 @@
<ContentPage.BindingContext> <ContentPage.BindingContext>
<vm:AboutViewModel /> <vm:AboutViewModel />
</ContentPage.BindingContext> </ContentPage.BindingContext>
<ContentPage.ToolbarItems> <!--<ContentPage.ToolbarItems>
<ToolbarItem Text="truc" /> <ToolbarItem Text="truc" />
</ContentPage.ToolbarItems> </ContentPage.ToolbarItems>-->
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />

4
AideDeJeu/AideDeJeu/Views/MainPage.xaml
View file

@ -82,6 +82,8 @@
</ContentPage> </ContentPage>
</MasterDetailPage.Master> </MasterDetailPage.Master>
<MasterDetailPage.Detail> <MasterDetailPage.Detail>
<NavigationPage>
<x:Arguments>
<ContentPage Title=""> <ContentPage Title="">
<ContentPage.ToolbarItems> <ContentPage.ToolbarItems>
<ToolbarItem Name="Spells" Text="Sorts" Order="Primary" Icon="spell_book.png" Command="{Binding SwitchToSpells}" /> <ToolbarItem Name="Spells" Text="Sorts" Order="Primary" Icon="spell_book.png" Command="{Binding SwitchToSpells}" />
@ -120,5 +122,7 @@
</ListView> </ListView>
</StackLayout> </StackLayout>
</ContentPage> </ContentPage>
</x:Arguments>
</NavigationPage>
</MasterDetailPage.Detail> </MasterDetailPage.Detail>
</MasterDetailPage> </MasterDetailPage>

8
AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs
View file

@ -17,16 +17,10 @@ namespace AideDeJeu.Views
public MainPage () public MainPage ()
{ {
InitializeComponent (); InitializeComponent ();
Navigator = new Navigator(Navigation); Navigator = new Navigator((Detail as NavigationPage).Navigation);
BindingContext = viewModel = new MainViewModel(Navigator); BindingContext = viewModel = new MainViewModel(Navigator);
} }
protected override bool OnBackButtonPressed()
{
IsPresented = !IsPresented;
return true;
}
protected override void OnAppearing() protected override void OnAppearing()
{ {
base.OnAppearing(); base.OnAppearing();