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

Navigation shell ok, reste à nettoyer

Browse source
This commit is contained in:
Yan Maniez 2019-10-13 01:03:21 +02:00
parent 2b333a1c97
commit 5cb823b074
2 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
View file

@ -42,7 +42,8 @@ namespace AideDeJeu.ViewModels
public async Task GotoAboutPageAsync() public async Task GotoAboutPageAsync()
{ {
await Navigation.PushAsync(new Views.AboutPage(), true); //await Navigation.PushAsync(new Views.AboutPage(), true);
await Shell.Current.GoToAsync("//about", true);
} }
private Command _LibraryCommand = null; private Command _LibraryCommand = null;
@ -78,7 +79,8 @@ namespace AideDeJeu.ViewModels
{ {
//await Navigation.PushAsync(new Views.ItemDetailPage(),true); //await Navigation.PushAsync(new Views.ItemDetailPage(),true);
//await Navigation.PushAsync(new Views.Library.MainTabbedPage(), true); //await Navigation.PushAsync(new Views.Library.MainTabbedPage(), true);
await Navigation.PushAsync(new Views.Library.ItemPage("index.md"), true); //await Navigation.PushAsync(new Views.Library.ItemPage("index.md"), true);
await Shell.Current.GoToAsync("//library", true);
//TestNotify = new NotifyTaskCompletion<bool>(TestGotoAsync(), true); //TestNotify = new NotifyTaskCompletion<bool>(TestGotoAsync(), true);
} }
@ -93,7 +95,8 @@ namespace AideDeJeu.ViewModels
public async Task GotoBookmarksPageAsync() public async Task GotoBookmarksPageAsync()
{ {
await Navigation.PushAsync(new Views.Library.BookmarksPage(), true); //await Navigation.PushAsync(new Views.Library.BookmarksPage(), true);
await Shell.Current.GoToAsync("//bookmarks", true);
} }
@ -118,12 +121,14 @@ namespace AideDeJeu.ViewModels
public async Task GotoPlayerCharacterEditorPageAsync() public async Task GotoPlayerCharacterEditorPageAsync()
{ {
await Navigation.PushAsync(new Views.PlayerCharacter.PlayerCharacterEditorPage(), true); //await Navigation.PushAsync(new Views.PlayerCharacter.PlayerCharacterEditorPage(), true);
await Shell.Current.GoToAsync("//pceditor", true);
} }
public async Task GotoDicesPageAsync() public async Task GotoDicesPageAsync()
{ {
await Navigation.PushAsync(new Views.DicesPage(), true); //await Navigation.PushAsync(new Views.DicesPage(), true);
await Shell.Current.GoToAsync("//dices", true);
} }
private Command _DeepSearchCommand = null; private Command _DeepSearchCommand = null;
@ -137,7 +142,8 @@ namespace AideDeJeu.ViewModels
public async Task GotoDeepSearchPageAsync() public async Task GotoDeepSearchPageAsync()
{ {
await Navigation.PushAsync(new Views.Library.DeepSearchPage(), true); //await Navigation.PushAsync(new Views.Library.DeepSearchPage(), true);
await Shell.Current.GoToAsync("//deepsearch", true);
} }
private Command _AddToFavoritesCommand = null; private Command _AddToFavoritesCommand = null;

14
AideDeJeu/AideDeJeu/Views/MainShell.xaml
View file

@ -130,11 +130,11 @@
<!--</StackLayout>--> <!--</StackLayout>-->
</Shell.FlyoutHeader> </Shell.FlyoutHeader>
<ShellContent Title="Accueil" ContentTemplate="{DataTemplate local:MainPage}" /> <ShellContent Title="Accueil" Route="home" ContentTemplate="{DataTemplate local:MainPage}" />
<ShellContent Title="Personnages" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" /> <ShellContent Title="Personnages" Route="pceditor" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" />
<ShellContent Title="Dés" Icon="d20.png" 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" Icon="spell_book.png"> <ShellContent Title="Bibliothèque" Route="library" Icon="spell_book.png">
<ShellContent.ContentTemplate> <ShellContent.ContentTemplate>
<DataTemplate> <DataTemplate>
<library:ItemPage> <library:ItemPage>
@ -145,10 +145,10 @@
</DataTemplate> </DataTemplate>
</ShellContent.ContentTemplate> </ShellContent.ContentTemplate>
</ShellContent> </ShellContent>
<ShellContent Title="Favoris" ContentTemplate="{DataTemplate library:BookmarksPage}" Icon="stars_stack.png" /> <ShellContent Title="Favoris" Route="bookmarks" ContentTemplate="{DataTemplate library:BookmarksPage}" Icon="stars_stack.png" />
<ShellContent Title="Recherche" ContentTemplate="{DataTemplate library:DeepSearchPage}" Icon="crystal_ball.png" /> <ShellContent Title="Recherche" Route="deepsearch" ContentTemplate="{DataTemplate library:DeepSearchPage}" Icon="crystal_ball.png" />
</FlyoutItem> </FlyoutItem>
<ShellContent Title="A propos de..." Icon="wooden_sign.png" ContentTemplate="{DataTemplate local:AboutPage}" /> <ShellContent Title="A propos de..." Route="about" Icon="wooden_sign.png" ContentTemplate="{DataTemplate local:AboutPage}" />
<!--<ShellItem Title="Accueil" FlyoutDisplayOptions="AsSingleItem"> <!--<ShellItem Title="Accueil" FlyoutDisplayOptions="AsSingleItem">
<ShellContent Title="Accueil" ContentTemplate="{DataTemplate local:MainPage}" /> <ShellContent Title="Accueil" ContentTemplate="{DataTemplate local:MainPage}" />
<ShellContent Title="Personnages" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" /> <ShellContent Title="Personnages" Icon="battle_axe.png" ContentTemplate="{DataTemplate pc:PlayerCharacterEditorPage}" />