Merge pull request 'xaml/categ-page' (#18) from xaml/categ-page into master

Reviewed-on: #18

src/Banquale/Banquale/Views/CategoryPage.xaml

@@ -1,16 +1,32 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:Banquale.Views"
              x:Class="Banquale.Views.CategoryPage"
-             Title="CategoryPage">
+             xmlns:local="clr-namespace:Banquale.Views"
+             Title="CategoryPage"
+             BackgroundColor="White">
+    
+    
+    <Grid RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*,2*">
+        
+        
+        <ImageButton Source="back_arrow_icon.svg" Grid.Row="0" HorizontalOptions="Start"/>
+
+        <local:CategoryView Grid.Row="2"/>
+        <local:CategoryView Grid.Row="3"/>
+        <local:CategoryView Grid.Row="4"/>
+        <local:CategoryView Grid.Row="5"/>
+        <local:CategoryView Grid.Row="6"/>
+        <local:CategoryView Grid.Row="7"/>
+        <local:CategoryView Grid.Row="8"/>
+        <local:CategoryView Grid.Row="9"/>
+        <local:CategoryView Grid.Row="10"/>
+        <local:CategoryView Grid.Row="11"/>
 
-    <Grid>
-        <local:CategoryView/>
-        <local:CategoryView/>
-        <local:CategoryView/>
-        <local:CategoryView/>
-        <local:CategoryView/>
-        <local:CategoryView/>
+        <VerticalStackLayout Grid.Row="12">
+            <BoxView HorizontalOptions="FillAndExpand"
+                 HeightRequest="1.3"/>
+        </VerticalStackLayout>
+        
     </Grid>
 </ContentPage>

src/Banquale/Banquale/Views/CategoryView.xaml

@@ -2,22 +2,20 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Banquale.Views.CategoryView">
+    
     <VerticalStackLayout>
-        <BoxView BackgroundColor="Black"
-                 HorizontalOptions="FillAndExpand"
-                 HeightRequest="1.3"
-                 Margin="20, 0, 20, 0"/>
-        
+        <BoxView HorizontalOptions="FillAndExpand"
+                 HeightRequest="1.3"/>
+
         <Grid Margin="20, 5, 20, 5"
             HorizontalOptions="Fill">
 
             <Label
-                Text="catégorie"
+                Text="Catégorie"
+                TextColor="Black"
                 HorizontalOptions="Center"
-                Margin="10, 0, 0, 0"/>
+                VerticalOptions="Center"/>
         </Grid>
 
-
-
     </VerticalStackLayout>
 </ContentView>

src/Banquale/Banquale/Views/ConnectionPage.xaml

@@ -42,11 +42,11 @@
     </StackLayout>
 
 
-    <!-- Version avec Grid (moins efficace quand on écrit dans les Entry-->
 
+        <!-- Version avec Grid (moins efficace quand on écrit dans les Entry-->
+    
     <!--<Grid RowDefinitions="5*, 2*, *, 2*, 2*, 2*, 2*">
-        -->
-    <!--<Grid.RowDefinitions>
+        --><!--<Grid.RowDefinitions>
             <RowDefinition Height="5*"/>
             <RowDefinition Height="2*"/>
             <RowDefinition Height="*"/>
@@ -54,8 +54,7 @@
             <RowDefinition Height="2*"/>
             <RowDefinition Height="2*"/>
             <RowDefinition Height="2*"/>
-        </Grid.RowDefinitions>-->
-    <!--
+        </Grid.RowDefinitions>--><!--
 
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
@@ -110,4 +109,11 @@
         </Grid>
 
     </Grid>-->
+<<<<<<< HEAD
+
+    
+        
+        
+=======
+>>>>>>> origin/master
 </ContentPage>

src/Banquale/Banquale/Views/SwitchAccountPage.xaml

@@ -6,10 +6,10 @@
              Title="SwitchAccountPage"
              BackgroundColor="White">
 
-    
+                    
                 <!-- Version StackLayout, moins efficace pour la responsivity -->
-
-    <!--<StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+    
+	<!--<StackLayout VerticalOptions="Center" HorizontalOptions="Center">
 
         <local:SwitchAccountView/>
 
@@ -29,10 +29,8 @@
 
     </StackLayout>-->
     
-
     <Grid RowDefinitions="3*, 2*, *, 2*, *, 2*, 3*">
 
-
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>

src/Banquale/Banquale/Views/SwitchAccountView.xaml

@@ -17,6 +17,6 @@
     </ContentView.Resources>
 
     <Button Text=" Compte Personnel &#x0a; Mme Tatouille "/>
-    <!-- &#x0a; sert à faire un retour à la ligne-->
+    <!-- &#x0a; sert à faire un retour à la ligne--> 
 
 </ContentView>