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

Refonte nav

Browse source
This commit is contained in:
Yan Maniez 2019-04-17 09:32:33 +02:00
parent 965ffea7ba
commit 9bf9d1a4ea
3 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -132,7 +132,7 @@ namespace AideDeJeu.ViewModels
public async Task ExecuteAddToFavoritesCommandAsync() public async Task ExecuteAddToFavoritesCommandAsync()
{ {
var tabbedPage = App.Current.MainPage as MainTabbedPage; var tabbedPage = App.Current.MainPage as MainTabbedPage;
var navigationPage = tabbedPage.MainNavigationPage; var navigationPage = tabbedPage; //.MainNavigationPage;
var lastPage = navigationPage.Navigation.NavigationStack.LastOrDefault(); var lastPage = navigationPage.Navigation.NavigationStack.LastOrDefault();
var context = lastPage.BindingContext; var context = lastPage.BindingContext;
Item item = null; Item item = null;
@ -189,7 +189,7 @@ namespace AideDeJeu.ViewModels
if (tabbedPage != null) if (tabbedPage != null)
{ {
tabbedPage.SelectedItem = null; tabbedPage.SelectedItem = null;
tabbedPage.SelectedItem = tabbedPage.MainNavigationPage; tabbedPage.SelectedItem = tabbedPage; //.MainNavigationPage;
} }
} }

34
AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml
View file

@ -8,10 +8,10 @@
x:Class="AideDeJeu.Views.MainTabbedPage" x:Class="AideDeJeu.Views.MainTabbedPage"
Padding="0" Padding="0"
IsEnabled="{Binding Main.IsEnabled}" IsEnabled="{Binding Main.IsEnabled}"
android:TabbedPage.ToolbarPlacement="Bottom" SelectedTabColor="{StaticResource HDRed}"
UnselectedTabColor="{StaticResource HDMidGrey}"
android:TabbedPage.IsSwipePagingEnabled="False" android:TabbedPage.IsSwipePagingEnabled="False"
android:TabbedPage.BarItemColor="{StaticResource HDMidGrey}" android:TabbedPage.ToolbarPlacement="Bottom"
android:TabbedPage.BarSelectedItemColor="{StaticResource HDRed}"
windows:TabbedPage.HeaderIconsEnabled="true"> windows:TabbedPage.HeaderIconsEnabled="true">
<windows:TabbedPage.HeaderIconsSize> <windows:TabbedPage.HeaderIconsSize>
<Size> <Size>
@ -21,21 +21,21 @@
</x:Arguments> </x:Arguments>
</Size> </Size>
</windows:TabbedPage.HeaderIconsSize> </windows:TabbedPage.HeaderIconsSize>
<views:MainNavigationPage x:Name="NavigationPage" Title="Bibliothèque" Icon="spell_book.png"> <views:ItemDetailPage x:Name="NavigationPage" Title="Bibliothèque" Icon="spell_book.png">
<x:Arguments> <!--<x:Arguments>
<views:ItemDetailPage /> <views:ItemDetailPage />
</x:Arguments> </x:Arguments>-->
</views:MainNavigationPage> </views:ItemDetailPage>
<views:MainNavigationPage Title="Favoris" Icon="stars_stack.png"> <views:BookmarksPage Title="Favoris" Icon="stars_stack.png">
<x:Arguments> <!--<x:Arguments>
<views:BookmarksPage /> <views:BookmarksPage />
</x:Arguments> </x:Arguments>-->
</views:MainNavigationPage> </views:BookmarksPage>
<views:MainNavigationPage Title="Recherche" Icon="crystal_ball.png"> <views:DeepSearchPage Title="Recherche" Icon="crystal_ball.png">
<x:Arguments> <!--<x:Arguments>
<views:DeepSearchPage /> <views:DeepSearchPage />
</x:Arguments> </x:Arguments>-->
</views:MainNavigationPage> </views:DeepSearchPage>
<views:AboutPage Title="À propos de..." Icon="wooden_sign.png"> <!--<views:AboutPage Title="À propos de..." Icon="wooden_sign.png">
</views:AboutPage> </views:AboutPage>-->
</TabbedPage> </TabbedPage>

22
AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml.cs
View file

@ -13,17 +13,17 @@ namespace AideDeJeu.Views
[XamlCompilation(XamlCompilationOptions.Compile)] [XamlCompilation(XamlCompilationOptions.Compile)]
public partial class MainTabbedPage : TabbedPage public partial class MainTabbedPage : TabbedPage
{ {
public MainNavigationPage MainNavigationPage //public MainNavigationPage MainNavigationPage
{ //{
get // get
{ // {
return this.NavigationPage; // return this.NavigationPage;
} // }
set // set
{ // {
this.NavigationPage = value; // this.NavigationPage = value;
} // }
} //}
public MainViewModel Main public MainViewModel Main
{ {