From 46c7948d819eafe0d3ac052336d6613831695675 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sun, 16 Sep 2018 15:21:13 +0200
Subject: [PATCH] Styles

---
 AideDeJeu/AideDeJeu/App.xaml                  | 19 ++++++++++++++-----
 AideDeJeu/AideDeJeu/Views/AboutPage.xaml      | 18 +++++++++---------
 .../AideDeJeu/Views/BookmarksEditPage.xaml    |  6 ------
 AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml  |  2 +-
 AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml |  3 ---
 .../AideDeJeu/Views/FilteredItemsPage.xaml    |  5 -----
 AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml |  2 --
 AideDeJeu/AideDeJeu/Views/ItemsPage.xaml      |  4 +---
 .../AideDeJeu/Views/MainNavigationPage.xaml   |  5 +----
 AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml | 10 +++-------
 10 files changed, 29 insertions(+), 45 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/App.xaml b/AideDeJeu/AideDeJeu/App.xaml
index 300829c2..f0c484f8 100644
--- a/AideDeJeu/AideDeJeu/App.xaml
+++ b/AideDeJeu/AideDeJeu/App.xaml
@@ -21,7 +21,10 @@
             <Color x:Key="HDBackLightGrey">#EDEDED</Color>
             <Color x:Key="HDWhite">#FFFFFF</Color>
             <Color x:Key="HDBlack">#000000</Color>
-            
+
+            <!--<Color x:Key="ParagraphBackgroundColor">{StaticResource HDWhite}</Color>
+            <Color x:Key="ParagraphForegroundColor">HDBlack</Color>-->
+
             <!--
             <Color x:Key="Primary">#2196F3</Color>
             <Color x:Key="PrimaryDark">#1976D2</Color>
@@ -238,12 +241,18 @@
                 <Setter Property="FontAttributes" Value="Bold" />
             </Style>
 
-            <Style TargetType="NavigationPage">
-                <Setter Property="BarBackgroundColor" Value="{StaticResource HDRed}" />
-                <Setter Property="BarTextColor" Value="{StaticResource HDWhite}" />
+            <Style TargetType="NavigationPage" ApplyToDerivedTypes="True">
+                <Setter Property="BarBackgroundColor" Value="{StaticResource HDWhite}" />
+                <Setter Property="BarTextColor" Value="{StaticResource HDRed}" />
                 <Setter Property="BackgroundColor" Value="{StaticResource HDWhite}" />
             </Style>
-            
+
+            <Style TargetType="TabbedPage" ApplyToDerivedTypes="True">
+                <Setter Property="BarBackgroundColor" Value="{StaticResource HDWhite}" />
+                <Setter Property="BarTextColor" Value="{StaticResource HDMidGrey}" />
+                <Setter Property="BackgroundColor" Value="{StaticResource HDWhite}" />
+            </Style>
+
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
index 39ef694b..253032ef 100644
--- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
@@ -2,7 +2,7 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="AideDeJeu.Views.AboutPage"
-             xmlns:vm="clr-namespace:AideDeJeu.ViewModels;"
+             xmlns:vm="clr-namespace:AideDeJeu.ViewModels"
              Title="{Binding Title}">
     <ContentPage.BindingContext>
         <vm:AboutViewModel />
@@ -16,17 +16,17 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <StackLayout BackgroundColor="{StaticResource HDRed}" VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
-            <StackLayout BackgroundColor="{StaticResource HDRed}" Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center">
-                <ContentView BackgroundColor="{StaticResource HDRed}" Padding="20,20,20,20" VerticalOptions="FillAndExpand">
-                  <Image BackgroundColor="{StaticResource HDRed}" VerticalOptions="Center" HeightRequest="64" Source="black_book.png" />
+        <StackLayout VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
+            <StackLayout Orientation="Horizontal" HorizontalOptions="Center" VerticalOptions="Center">
+                <ContentView Padding="20,20,20,20" VerticalOptions="FillAndExpand">
+                  <Image VerticalOptions="Center" HeightRequest="64" Source="black_book.png" />
                 </ContentView>
             </StackLayout>
         </StackLayout>
-        <StackLayout Grid.Column="1" Grid.Row="0" BackgroundColor="{StaticResource HDRed}" VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
-            <StackLayout BackgroundColor="{StaticResource HDRed}" Padding="20,20,20,20" Orientation="Vertical" HorizontalOptions="Center" VerticalOptions="Center">
-                <Label Text="Haches &amp; Dés " Style="{StaticResource heading1}" FontSize="32" FontAttributes="Bold" TextColor="{StaticResource HDWhite}" HorizontalOptions="Center"/>
-                <Label Text="{Binding Version, StringFormat='Version {0}'}" TextColor="{StaticResource HDWhite}" HorizontalOptions="Center"/>
+        <StackLayout Grid.Column="1" Grid.Row="0" VerticalOptions="FillAndExpand" HorizontalOptions="Fill">
+            <StackLayout Padding="20,20,20,20" Orientation="Vertical" HorizontalOptions="Center" VerticalOptions="Center">
+                <Label Text="Haches &amp; Dés " Style="{StaticResource heading1}" FontSize="32" FontAttributes="Bold" HorizontalOptions="Center"/>
+                <Label Text="{Binding Version, StringFormat='Version {0}'}" HorizontalOptions="Center"/>
             </StackLayout>
         </StackLayout>
         <ScrollView Grid.Row="1" Grid.ColumnSpan="2">
diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml
index 78c5d8a4..83f66636 100644
--- a/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml
@@ -22,12 +22,6 @@
 
             <Entry Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="FillAndExpand" />
 
-            <!--<Image Grid.Column="1" Grid.Row="0" Source="settings_knobs.png">
-                <Image.GestureRecognizers>
-                    <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped" />
-                </Image.GestureRecognizers>
-            </Image>-->
-
             <ListView Grid.Column="0" Grid.Row="1" x:Name="ItemsListView" ItemsSource="{Binding BookmarkCollection}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
                 <ListView.ItemTemplate>
                     <DataTemplate>
diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml
index 6f3f5842..207f5474 100644
--- a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml
@@ -32,7 +32,7 @@
             <ListView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" x:Name="ItemsListView" ItemsSource="{Binding BookmarkCollection}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <ViewCell AutomationProperties.IsInAccessibleTree="True" AutomationId="machin" AutomationProperties.Name="hop">
+                        <ViewCell>
                             <StackLayout Padding="10" Orientation="Vertical">
                                 <Label Text="{Binding Name}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="16" />
                                 <Label Text="{Binding Link}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" />
diff --git a/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml b/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml
index 8b163463..5fb597a6 100644
--- a/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml
@@ -6,7 +6,6 @@
     xmlns:tools="clr-namespace:AideDeJeu.Tools" 
     xmlns:properties="clr-namespace:AideDeJeu.Properties"
     x:Name="This" 
-    BackgroundColor="{StaticResource HDWhite}" 
     Title="Recherche"
     Icon="crystal_ball.png">
     <ContentPage.Resources>
@@ -15,8 +14,6 @@
         </ResourceDictionary>
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
-        <!--<ToolbarItem Name="DeepSearch" Text="Rechercher..." Order="Primary" Icon="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" />-->
-        <!--<ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />-->
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <Grid>
diff --git a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
index e34a6b97..88e608c4 100644
--- a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
@@ -11,11 +11,6 @@
         <ToolbarItem Name="Filter" Text="Filtrer" Order="Primary" Icon="funnel.png" Clicked="Button_Clicked" />
         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" />
     </MasterDetailPage.ToolbarItems>
-    <MasterDetailPage.Resources>
-        <ResourceDictionary>
-            <tools:SVGToBitmapConverter x:Key="SVGToBitmapConverter" />
-        </ResourceDictionary>
-    </MasterDetailPage.Resources>
     <MasterDetailPage.Master>
         <ContentPage Title=" ">
             <StackLayout Orientation="Vertical">
diff --git a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
index 3eb3f9b1..51540634 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
@@ -15,8 +15,6 @@
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" />
-        <!--<ToolbarItem Name="DeepSearch" Text="Rechercher..." Order="Primary" Icon="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" />
-        <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />-->
     </ContentPage.ToolbarItems>
     <Grid>
         <ScrollView Orientation="Vertical" BackgroundColor="{StaticResource HDWhite}">
diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
index 89115b38..6dd10a67 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
@@ -17,8 +17,6 @@
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
         <ToolbarItem Name="AddToFavorites" Text="Ajouter aux favoris" Order="Primary" Icon="round_star.png" Command="{Binding Main.Navigator.AddToFavoritesCommand}" />
-        <!--<ToolbarItem Name="DeepSearch" Text="Rechercher..." Order="Primary" Icon="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" />
-        <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.Navigator.AboutCommand}" />-->
     </ContentPage.ToolbarItems>
     <Grid>
         <ListView BackgroundColor="{StaticResource HDWhite}" x:Name="ItemsListView" ItemsSource="{Binding Children}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
@@ -31,7 +29,7 @@
             </ListView.Header>
             <ListView.ItemTemplate>
                 <DataTemplate>
-                    <ViewCell AutomationProperties.IsInAccessibleTree="True" AutomationId="machin" AutomationProperties.Name="hop">
+                    <ViewCell>
                         <StackLayout Padding="10" Orientation="Vertical">
                             <Label Text="{Binding Name}" LineBreakMode="WordWrap" TextColor="#0366d6" Style="{Binding NameLevel,Converter={StaticResource HeaderLevelToStyleConverter}}" />
                             <Label Text="{Binding AltNameText}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" />
diff --git a/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml b/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
index 697bfa3f..d51d2be1 100644
--- a/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
@@ -2,10 +2,7 @@
 <NavigationPage 
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="AideDeJeu.Views.MainNavigationPage"
-    BackgroundColor="{StaticResource HDWhite}"
-    BarBackgroundColor="{StaticResource HDWhite}"
-    BarTextColor="{StaticResource HDRed}">
+    x:Class="AideDeJeu.Views.MainNavigationPage">
 
 
 </NavigationPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml
index e8fe0239..ddd6d64b 100644
--- a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml
@@ -3,19 +3,15 @@
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:views="clr-namespace:AideDeJeu.Views"
+    xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core"
+    xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
     x:Class="AideDeJeu.Views.MainTabbedPage"
     Padding="0"
-    BackgroundColor="{StaticResource HDWhite}"
-    BarBackgroundColor="{StaticResource HDWhite}"
-    BarTextColor="{StaticResource HDMidGrey}"
-    xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core"
-    windows:TabbedPage.HeaderIconsEnabled="true"
-    xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
     android:TabbedPage.ToolbarPlacement="Bottom"
     android:TabbedPage.IsSwipePagingEnabled="False"
     android:TabbedPage.BarItemColor="{StaticResource HDMidGrey}"
     android:TabbedPage.BarSelectedItemColor="{StaticResource HDRed}"
-    >
+    windows:TabbedPage.HeaderIconsEnabled="true">
     <windows:TabbedPage.HeaderIconsSize>
         <Size>
             <x:Arguments>