From d01f135867d662c327f6ae577794f2632f5bb3ba Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Mon, 9 Jul 2018 19:39:35 +0200 Subject: [PATCH] Renommage --- AideDeJeu/AideDeJeu/AideDeJeu.csproj | 4 ++-- AideDeJeu/AideDeJeu/App.xaml.cs | 2 +- AideDeJeu/AideDeJeu/ViewModels/Navigator.cs | 2 +- .../AideDeJeu/Views/{MainPage.xaml => ItemsPage.xaml} | 2 +- .../Views/{MainPage.xaml.cs => ItemsPage.xaml.cs} | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) rename AideDeJeu/AideDeJeu/Views/{MainPage.xaml => ItemsPage.xaml} (99%) rename AideDeJeu/AideDeJeu/Views/{MainPage.xaml.cs => ItemsPage.xaml.cs} (87%) diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj index eecb3d7e..0f376ec9 100644 --- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj +++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj @@ -39,8 +39,8 @@ ItemDetailPage.xaml - - MainPage.xaml + + ItemsPage.xaml diff --git a/AideDeJeu/AideDeJeu/App.xaml.cs b/AideDeJeu/AideDeJeu/App.xaml.cs index c9af1a48..aaf97dfc 100644 --- a/AideDeJeu/AideDeJeu/App.xaml.cs +++ b/AideDeJeu/AideDeJeu/App.xaml.cs @@ -17,7 +17,7 @@ namespace AideDeJeu DependencyService.Register(); var vm = DependencyService.Get(); - var mainPage = new ItemDetailPage(new ItemDetailViewModel(new HomeItem()));// new MainPage(); + var mainPage = new ItemDetailPage(new ItemDetailViewModel(new HomeItem()) { Title = "Menu" });// new MainPage(); var navigationPage = new MainNavigationPage(mainPage); vm.Navigator = new Navigator(navigationPage.Navigation); //mainPage.Detail.Navigation); MainPage = navigationPage; diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs index fd0c3be6..dc89f168 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs @@ -47,7 +47,7 @@ namespace AideDeJeu.ViewModels //var vm = new ItemDetailViewModel(item); //vm.LoadItemCommand.Execute(null); - await Navigation.PushAsync(new MainPage()); + await Navigation.PushAsync(new ItemsPage()); } } diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml similarity index 99% rename from AideDeJeu/AideDeJeu/Views/MainPage.xaml rename to AideDeJeu/AideDeJeu/Views/ItemsPage.xaml index 7ef5b7cf..6d5155d6 100644 --- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:AideDeJeu.Views" xmlns:tools="clr-namespace:AideDeJeu.Tools" - x:Class="AideDeJeu.Views.MainPage" + x:Class="AideDeJeu.Views.ItemsPage" x:Name="This" IsPresented="False" Title="{Binding ItemSourceType,Converter={StaticResource ItemSourceTypeToTitleConverter}}"> diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs similarity index 87% rename from AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs rename to AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs index ee687923..68390a9d 100644 --- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs +++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml.cs @@ -9,7 +9,7 @@ using Xamarin.Forms.Xaml; namespace AideDeJeu.Views { [XamlCompilation(XamlCompilationOptions.Compile)] - public partial class MainPage : MasterDetailPage + public partial class ItemsPage : MasterDetailPage { MainViewModel Main { @@ -20,7 +20,7 @@ namespace AideDeJeu.Views } //INavig//ator Navigator; - public MainPage () + public ItemsPage () { InitializeComponent (); @@ -35,8 +35,8 @@ namespace AideDeJeu.Views { base.OnAppearing(); - //this.MasterBehavior = MasterBehavior.Default; - //this.MasterBehavior = MasterBehavior.Popover; + this.MasterBehavior = MasterBehavior.Popover; + if (Main.Items.Count() == 0) Main.LoadItemsCommand.Execute(null); }