From e7b462d4b202e829479142c83a21d8f1354a7edb Mon Sep 17 00:00:00 2001
From: majean5 <Mathilde.JEAN3@etu.uca.fr>
Date: Fri, 15 Apr 2022 15:26:09 +0200
Subject: [PATCH] Utilisation des ressources statiques du dictionnaire dans
 toutes les pages

---
 Ressources/Dictionnaire.xaml |  7 +++++++
 WpfApp1/AddAShark.xaml       | 16 ++++++++--------
 WpfApp1/Window1.xaml         | 24 ++++++++++++------------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/Ressources/Dictionnaire.xaml b/Ressources/Dictionnaire.xaml
index 2b6e34f..c6e5cef 100644
--- a/Ressources/Dictionnaire.xaml
+++ b/Ressources/Dictionnaire.xaml
@@ -6,6 +6,9 @@
     <Brush x:Key="Couleur1">CadetBlue</Brush>
     <Brush x:Key="Couleur2">PowderBlue</Brush>
     <Brush x:Key="Couleur3">AliceBlue</Brush>
+    <Style TargetType="DockPanel" x:Key="Docky">
+        <Setter Property="Background" Value="{StaticResource Couleur3}"/>
+    </Style>
     <Style TargetType="ComboBox">
         <Setter Property="FontStyle" Value="Italic"/>
         <Setter Property="Margin" Value="5"/>
@@ -22,5 +25,9 @@
     <Style TargetType="TextBlock">
         <Setter Property="FontFamily" Value="{StaticResource Police1}"/>
     </Style>
+    <Style TargetType="CheckBox">
+        <Setter Property="Foreground" Value="{StaticResource Couleur2}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Couleur2}"/>
+    </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/WpfApp1/AddAShark.xaml b/WpfApp1/AddAShark.xaml
index 4790c88..524ca95 100644
--- a/WpfApp1/AddAShark.xaml
+++ b/WpfApp1/AddAShark.xaml
@@ -12,7 +12,7 @@
             <Button x:Name="add" Style="{StaticResource Button1}" HorizontalAlignment="Right" VerticalAlignment="Center" Content="x" Width="50" Height="50" FontSize="25"></Button>
         </DockPanel>
         <DockPanel Background="{StaticResource Couleur1}">
-            <TextBlock DockPanel.Dock="Top" Text="Shark information :" Margin="15" FontSize="18" Foreground="{StaticResource Couleur3}" FontFamily="{StaticResource Police1}"/>
+            <TextBlock DockPanel.Dock="Top" Text="Shark information :" Margin="15" FontSize="18" Foreground="{StaticResource Couleur3}"/>
             <Grid Width="800">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition/>
@@ -31,11 +31,11 @@
                 <local:UserControlBoite Grid.Column="0" Grid.Row="3" Message="Lien de la vidéo"/>
                 <local:UserControlBoite Grid.Column="1" Grid.Row="0" Message="Lien de la map"/>
                 <local:UserControlBoite Grid.Column="1" Grid.Row="1" Message="Fun fact (optionnel)"/>
-                <Grid Grid.Column="1" Grid.Row="2" ShowGridLines="True" Width="320" Height="19" VerticalAlignment="Top" Background="PowderBlue">
+                <Grid Grid.Column="1" Grid.Row="2" ShowGridLines="True" Width="320" Height="19" VerticalAlignment="Top" Background="{StaticResource Couleur2}">
                     <Grid.RowDefinitions>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <TextBlock Text="Zone(s) d'habitation" HorizontalAlignment="Center" Grid.Row="0"></TextBlock>
+                    <TextBlock Text="Zone(s) d'habitation" HorizontalAlignment="Center" Grid.Row="0" Foreground="{StaticResource Couleur3}"/>
                 </Grid>
                 <Grid Grid.Column="1" Grid.Row="2" Margin="0,19,0,0" Width="320" Background="White">
                     <Grid.ColumnDefinitions>
@@ -46,14 +46,14 @@
                         <RowDefinition/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <CheckBox Content="Océan Atlantique" Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left" Margin="40,0,0,0"></CheckBox>
-                    <CheckBox Content="Océan Arctique" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" Margin="0,0,20,0"></CheckBox>
-                    <CheckBox Content="Océan Indien" Grid.Column="0" Grid.Row="2"  HorizontalAlignment="Left" Margin="40,0,0,0"></CheckBox>
-                    <CheckBox Content="Océan Pacifique"  Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" Margin="0,0,20,0"></CheckBox>
+                    <CheckBox Content="Océan Atlantique" Grid.Column="0" Grid.Row="0" HorizontalAlignment="Left" Margin="40,0,0,0"/>
+                    <CheckBox Content="Océan Arctique" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" Margin="0,0,20,0"/>
+                    <CheckBox Content="Océan Indien" Grid.Column="0" Grid.Row="2"  HorizontalAlignment="Left" Margin="40,0,0,0"/>
+                    <CheckBox Content="Océan Pacifique"  Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" Margin="0,0,20,0"/>
                 </Grid>
                 
                 <local:UserControlBoite Grid.Column="1" Grid.Row="3"/>
-                <Button Grid.Column="1" Grid.Row="5" Content="Submit" Margin="15" Width="100" Background="PowderBlue" BorderBrush="PowderBlue" FontFamily="Candara light" Foreground="AliceBlue"/>
+                <Button Style="{StaticResource Button1}" Grid.Column="1" Grid.Row="5" Content="Submit" Margin="15" Width="100"/>
             </Grid>
         </DockPanel>
     </DockPanel>
diff --git a/WpfApp1/Window1.xaml b/WpfApp1/Window1.xaml
index de064a9..44b7a83 100644
--- a/WpfApp1/Window1.xaml
+++ b/WpfApp1/Window1.xaml
@@ -8,17 +8,17 @@
         Title="Window1" Height="450" Width="800">
 
     <DockPanel>
-        <DockPanel DockPanel.Dock="Left" Background="PowderBlue">
+        <DockPanel DockPanel.Dock="Left" Background="{StaticResource Couleur3}">
 
-            <ComboBox Margin="5" FontStyle="Italic" DockPanel.Dock="Top" Foreground="CadetBlue">
-                <ComboBoxItem Tag="Océans" IsSelected="True" >Tous</ComboBoxItem>
+            <ComboBox DockPanel.Dock="Top">
+                <ComboBoxItem Tag="Océans" IsSelected="True">Tous</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Arctique</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Atlantique</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Indien</ComboBoxItem>
                 <ComboBoxItem Tag="Océans" >Pacifique</ComboBoxItem>
             </ComboBox>
-            <ListBox Background="AliceBlue">
-
+            <TextBox DockPanel.Dock="Top" Text="Rechercher" FontFamily="{StaticResource Police1}" Foreground="{StaticResource Couleur1}" Height="25" Margin="5"/>
+            <ListBox Background="{StaticResource Couleur3}">
                 <local:UserControlRequin/>
                 <local:UserControlRequin/>
                 <local:UserControlRequin/>
@@ -30,19 +30,19 @@
         </DockPanel>
         <DockPanel x:Name="Button" DockPanel.Dock="Top">
             <Image Source="Images\Logo_entier.png" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="196,10,10,10" Height="40" Stretch="Uniform" StretchDirection="Both"></Image>
-            <Button x:Name="add" HorizontalAlignment="Right" VerticalAlignment="Center" DockPanel.Dock="Right" Content="+" BorderBrush="AliceBlue" BorderThickness="2" Background="PowderBlue" Width="50" Height="50" FontFamily="Poppins" FontSize="25" Foreground="AliceBlue"></Button>
+            <Button Style="{StaticResource Button1}" x:Name="add" HorizontalAlignment="Right" VerticalAlignment="Center" DockPanel.Dock="Right" Content="+" Width="50" Height="50" FontSize="25"></Button>
         </DockPanel>
-        <DockPanel Background="AliceBlue" DockPanel.Dock="Left" Width="260">
-            <TextBlock Text="Nom requin" Foreground="PowderBlue" FontSize="20" Margin="5" DockPanel.Dock="Top" FontFamily="Poppins"></TextBlock>
-            <TextBlock Text="Nom scientifique" Foreground="PowderBlue" FontSize="15" Margin="5" DockPanel.Dock="Top" FontFamily="Poppins"></TextBlock>
-            <TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,0,5" HorizontalAlignment="Left" FontFamily="Poppins"  DockPanel.Dock="Top"><Run Text="Description de notre magnifique requin"/><LineBreak/><Run/><LineBreak/><Run/><LineBreak/><Run/></TextBlock>
+        <DockPanel Style="{StaticResource Docky}" DockPanel.Dock="Left" Width="260">
+            <TextBlock Text="Nom requin" Foreground="{StaticResource Couleur2}" FontSize="20" Margin="15,5,0,0" DockPanel.Dock="Top"></TextBlock>
+            <TextBlock Text="Nom scientifique" Foreground="{StaticResource Couleur2}" FontSize="15" Margin="15,0,0,10" DockPanel.Dock="Top"></TextBlock>
+            <TextBlock TextWrapping="Wrap" FontSize="12" Margin="15,5,0,5" HorizontalAlignment="Left" DockPanel.Dock="Top"><Run Text="Description de notre magnifique requin"/><LineBreak/><Run/><LineBreak/><Run/><LineBreak/><Run/></TextBlock>
             <Image Source="Images\Donnees insuffisantes.png" Margin="15,5,5,5" DockPanel.Dock="Top" HorizontalAlignment="Left" ></Image>
             <MediaElement Source="Videos\Vid-dormeur-mexicain.mp4" DockPanel.Dock="Bottom" MaxHeight="125" MinHeight="50" HorizontalAlignment="Left" Margin="45,0,0,0" />
         </DockPanel>
-        <DockPanel Background="AliceBlue" DockPanel.Dock="Right">
+        <DockPanel Background="{StaticResource Couleur3}" DockPanel.Dock="Right">
             <Image Source="Images\Heterodontus_francisci_catalina-1280-By-Ed-Bierman-from-CA-usa-Horn-Shark-CC-BY-2.0.jpg" DockPanel.Dock="Top" Margin="30,30,30,0"></Image>
             <Image Source="Images\rep_Heterodontus_mexicanus.png" Margin="10" DockPanel.Dock="Top"></Image>
-            <TextBlock Text="Fun fact" FontSize="15" FontFamily="Poppins" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="5"></TextBlock>
+            <TextBlock Text="Fun fact" FontSize="15" DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="5"></TextBlock>
             <TextBlock Text="La bouche du requin dormeur mexicain est en forme de museau de cochon!" FontSize="12" DockPanel.Dock="Bottom" TextWrapping="Wrap"></TextBlock>
         </DockPanel>
     </DockPanel>