From 4a7fa069bd07950cfbcfb25f12eb337f729b8e37 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Mon, 30 Apr 2018 23:47:23 +0200
Subject: [PATCH] Packaging

---
 AideDeJeu/AideDeJeu/App.xaml.cs               |  2 +-
 .../AideDeJeu/ViewModels/AboutViewModel.cs    |  4 +--
 AideDeJeu/AideDeJeu/Views/AboutPage.xaml      | 30 +++++--------------
 AideDeJeu/AideDeJeu/Views/MainPage.xaml       | 10 +++++--
 AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs    | 15 ++++++++++
 AideDeJeu/AideDeJeu/Views/MonstersPage.xaml   |  5 ++--
 AideDeJeu/AideDeJeu/Views/SpellsPage.xaml     |  5 ++--
 7 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/App.xaml.cs b/AideDeJeu/AideDeJeu/App.xaml.cs
index 17c929cd..ca495301 100644
--- a/AideDeJeu/AideDeJeu/App.xaml.cs
+++ b/AideDeJeu/AideDeJeu/App.xaml.cs
@@ -12,7 +12,7 @@ namespace AideDeJeu
 		{
 			InitializeComponent();
 
-            MainPage = new NavigationPage(new MonstersPage()); // MainPage());
+            MainPage = new NavigationPage(new MainPage());
         }
 
 		protected override void OnStart ()
diff --git a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs
index ee972049..38c37365 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs
@@ -9,9 +9,9 @@ namespace AideDeJeu.ViewModels
     {
         public AboutViewModel()
         {
-            Title = "About";
+            Title = "À propos de ...";
 
-            OpenWebCommand = new Command(() => Device.OpenUri(new Uri("https://xamarin.com/platform")));
+            OpenWebCommand = new Command(() => Device.OpenUri(new Uri("https://github.com/Nioux/AideDeJeu")));
         }
 
         public ICommand OpenWebCommand { get; }
diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
index 86e960d7..68b8b578 100644
--- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
@@ -12,10 +12,10 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <StackLayout BackgroundColor="{StaticResource Accent}" VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
-            <StackLayout Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center">
-                <ContentView Padding="0,40,0,40" VerticalOptions="FillAndExpand">
-                    <Image Source="xamarin_logo.png" VerticalOptions="Center" HeightRequest="64" />
+        <StackLayout BackgroundColor="Black" VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
+            <StackLayout BackgroundColor="Black" Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center">
+                <ContentView BackgroundColor="Black" Padding="0,40,0,40" VerticalOptions="FillAndExpand">
+                    <Image BackgroundColor="Black" Source="black_book.png" VerticalOptions="Center" HeightRequest="64" />
                 </ContentView>
             </StackLayout>
         </StackLayout>
@@ -25,7 +25,7 @@
                     <Label.FormattedText>
                         <FormattedString>
                             <FormattedString.Spans>
-                                <Span Text="AppName" FontAttributes="Bold" FontSize="22" />
+                                <Span Text="Aide de Jeu" FontAttributes="Bold" FontSize="22" />
                                 <Span Text=" " />
                                 <Span Text="1.0" ForegroundColor="{StaticResource LightTextColor}" />
                             </FormattedString.Spans>
@@ -36,28 +36,12 @@
                     <Label.FormattedText>
                         <FormattedString>
                             <FormattedString.Spans>
-                                <Span Text="This app is written in C# and native APIs using the" />
-                                <Span Text=" " />
-                                <Span Text="Xamarin Platform" FontAttributes="Bold" />
-                                <Span Text="." />
+                                <Span Text="Cette application est une aide de jeu pour le plus célèbre des jeux de rôle" />
                             </FormattedString.Spans>
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
-                <Label>
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <FormattedString.Spans>
-                                <Span Text="It shares code with its" />
-                                <Span Text=" " />
-                                <Span Text="iOS, Android, and Windows" FontAttributes="Bold" />
-                                <Span Text=" " />
-                                <Span Text="versions." />
-                            </FormattedString.Spans>
-                        </FormattedString>
-                    </Label.FormattedText>
-                </Label>
-                <Button Margin="0,10,0,0" Text="Learn more" Command="{Binding OpenWebCommand}" BackgroundColor="{StaticResource Primary}" TextColor="White" />
+                <Button Margin="0,10,0,0" Text="Site web" Command="{Binding OpenWebCommand}" BackgroundColor="{StaticResource titlered}" TextColor="{StaticResource bgtan}" />
             </StackLayout>
         </ScrollView>
     </Grid>
diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
index 79578b02..16254cea 100644
--- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
@@ -5,17 +5,21 @@
                 x:Class="AideDeJeu.Views.MainPage"
                   x:Name="This"
                 IsPresented="False"
+                  Title="Aide de Jeu"
                 >
     <MasterDetailPage.Master>
         <ContentPage Title=" ">
         </ContentPage>
     </MasterDetailPage.Master>
     <MasterDetailPage.Detail>
-        <ContentPage>
+        <ContentPage Title="Aide de Jeu">
             <ContentPage.ToolbarItems>
             </ContentPage.ToolbarItems>
-            <Grid>
-            </Grid>
+            <StackLayout Orientation="Vertical">
+                <Button Text="Liste des sorts" Clicked="OnSpellsClicked" BackgroundColor="{StaticResource titlered}" TextColor="{StaticResource bgtan}" />
+                <Button Text="Liste des monstres" Clicked="OnMonstersClicked" BackgroundColor="{StaticResource titlered}" TextColor="{StaticResource bgtan}" />
+                <Button Text="À propos de ..." Clicked="OnAboutClicked" BackgroundColor="{StaticResource titlered}" TextColor="{StaticResource bgtan}" />
+            </StackLayout>
         </ContentPage>
     </MasterDetailPage.Detail>
 </MasterDetailPage>
diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs
index 6a27426b..76a2b18e 100644
--- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs
@@ -10,5 +10,20 @@ namespace AideDeJeu.Views
 		{
 			InitializeComponent ();
         }
+
+        void OnSpellsClicked()
+        {
+            Navigation.PushAsync(new SpellsPage());
+        }
+
+        void OnMonstersClicked()
+        {
+            Navigation.PushAsync(new MonstersPage());
+        }
+
+        void OnAboutClicked()
+        {
+            Navigation.PushAsync(new AboutPage());
+        }
     }
 }
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml b/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml
index f20e6520..59271606 100644
--- a/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml
@@ -5,9 +5,10 @@
                 x:Class="AideDeJeu.Views.MonstersPage"
                   x:Name="This"
                 IsPresented="False"
+                  Title="Liste des monstres"
                 >
     <MasterDetailPage.Master>
-        <ContentPage Title=" ">
+        <ContentPage Title="Liste des monstres">
             <ScrollView Orientation="Vertical">
                 <StackLayout Orientation="Vertical" Padding="15">
                     <!--<StackLayout Orientation="Horizontal">
@@ -59,7 +60,7 @@
         </ContentPage>
     </MasterDetailPage.Master>
     <MasterDetailPage.Detail>
-        <ContentPage>
+        <ContentPage Title="Liste des monstres">
             <ContentPage.ToolbarItems>
                 <!--<ToolbarItem Name="Home" Text="Accueil" Order="Primary" Icon="ic_home.png" Command="{Binding OpenUrl}" CommandParameter="http://www.pathfinder-fr.org/" />
                 <ToolbarItem Name="Spells" Text="Sorts" Order="Primary" Icon="ic_home.png" Command="{Binding OpenUrl}" CommandParameter="http://www.pathfinder-fr.org/" />-->
diff --git a/AideDeJeu/AideDeJeu/Views/SpellsPage.xaml b/AideDeJeu/AideDeJeu/Views/SpellsPage.xaml
index b01d912c..550354f0 100644
--- a/AideDeJeu/AideDeJeu/Views/SpellsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/SpellsPage.xaml
@@ -5,9 +5,10 @@
                 x:Class="AideDeJeu.Views.SpellsPage"
                   x:Name="This"
                 IsPresented="False"
+                  Title="Liste des sorts"
                 >
     <MasterDetailPage.Master>
-        <ContentPage Title=" ">
+        <ContentPage Title="Liste des sorts">
             <ScrollView Orientation="Vertical">
                 <StackLayout Orientation="Vertical" Padding="15">
                     <!--<StackLayout Orientation="Horizontal">
@@ -50,7 +51,7 @@
         </ContentPage>
     </MasterDetailPage.Master>
     <MasterDetailPage.Detail>
-        <ContentPage>
+        <ContentPage Title="Liste des sorts">
             <ContentPage.ToolbarItems>
                 <!--<ToolbarItem Name="Home" Text="Accueil" Order="Primary" Icon="ic_home.png" Command="{Binding OpenUrl}" CommandParameter="http://www.pathfinder-fr.org/" />
                 <ToolbarItem Name="Spells" Text="Sorts" Order="Primary" Icon="ic_home.png" Command="{Binding OpenUrl}" CommandParameter="http://www.pathfinder-fr.org/" />-->