diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs index 69be8e53..8ca8fd3f 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs @@ -132,7 +132,7 @@ namespace AideDeJeu.ViewModels public async Task ExecuteAddToFavoritesCommandAsync() { var tabbedPage = App.Current.MainPage as MainTabbedPage; - var navigationPage = tabbedPage.MainNavigationPage; + var navigationPage = tabbedPage; //.MainNavigationPage; var lastPage = navigationPage.Navigation.NavigationStack.LastOrDefault(); var context = lastPage.BindingContext; Item item = null; @@ -189,7 +189,7 @@ namespace AideDeJeu.ViewModels if (tabbedPage != null) { tabbedPage.SelectedItem = null; - tabbedPage.SelectedItem = tabbedPage.MainNavigationPage; + tabbedPage.SelectedItem = tabbedPage; //.MainNavigationPage; } } diff --git a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml index 4c770c5c..ffb80fdb 100644 --- a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml @@ -8,10 +8,10 @@ x:Class="AideDeJeu.Views.MainTabbedPage" Padding="0" IsEnabled="{Binding Main.IsEnabled}" - android:TabbedPage.ToolbarPlacement="Bottom" + SelectedTabColor="{StaticResource HDRed}" + UnselectedTabColor="{StaticResource HDMidGrey}" android:TabbedPage.IsSwipePagingEnabled="False" - android:TabbedPage.BarItemColor="{StaticResource HDMidGrey}" - android:TabbedPage.BarSelectedItemColor="{StaticResource HDRed}" + android:TabbedPage.ToolbarPlacement="Bottom" windows:TabbedPage.HeaderIconsEnabled="true"> @@ -21,21 +21,21 @@ - - + + + + + + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml.cs index f26866f5..e334b574 100644 --- a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml.cs @@ -13,17 +13,17 @@ namespace AideDeJeu.Views [XamlCompilation(XamlCompilationOptions.Compile)] public partial class MainTabbedPage : TabbedPage { - public MainNavigationPage MainNavigationPage - { - get - { - return this.NavigationPage; - } - set - { - this.NavigationPage = value; - } - } + //public MainNavigationPage MainNavigationPage + //{ + // get + // { + // return this.NavigationPage; + // } + // set + // { + // this.NavigationPage = value; + // } + //} public MainViewModel Main {