From 1a99d87d1a6b578dda596a1d7b3300ffeba9b11e Mon Sep 17 00:00:00 2001
From: Lucas Evard <evardlulu@gmail.com>
Date: Wed, 14 Dec 2022 14:29:48 +0100
Subject: [PATCH] Modification vues pour fonctionner sur IOS

---
 Sources/IHM/Mobile/AjoutBanques.xaml      |  4 +--
 Sources/IHM/Mobile/AjoutBanques.xaml.cs   | 21 ++++++++------
 Sources/IHM/Mobile/Dashboard.xaml         | 35 ++++++++++++++++++-----
 Sources/IHM/Mobile/Dashboard.xaml.cs      |  4 ++-
 Sources/IHM/Mobile/GestionBanques.xaml    |  3 +-
 Sources/IHM/Mobile/GestionBanques.xaml.cs | 10 ++++++-
 Sources/IHM/Mobile/Operations.xaml        | 12 +++-----
 Sources/IHM/Mobile/Operations.xaml.cs     |  2 +-
 Sources/IHM/Platforms/iOS/Info.plist      |  2 --
 9 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/Sources/IHM/Mobile/AjoutBanques.xaml b/Sources/IHM/Mobile/AjoutBanques.xaml
index 1a2d141..6109712 100644
--- a/Sources/IHM/Mobile/AjoutBanques.xaml
+++ b/Sources/IHM/Mobile/AjoutBanques.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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:composant="clr-namespace:IHM.Composant"
@@ -22,8 +22,8 @@
         <HorizontalStackLayout Grid.Row="0" Grid.Column="0" VerticalOptions="Center">
             <Image Source="Resources/Images/logo_sans_fond.png" HeightRequest="50" Margin="20"/>
             <Label Text="Cons'Eco" FontSize="20" VerticalOptions="Center" FontAttributes="Bold"/>
+            <Button x:Name="boutonRetour" Text="retour" HeightRequest="50" Clicked="returnbutton" IsVisible="False" HorizontalOptions="End"/>
         </HorizontalStackLayout>
-
         <Label Grid.Row="1" Grid.ColumnSpan="3" Text="Liste des banques disponible : " FontAttributes="Bold" FontSize="Body" Padding="20,10,0,0"/>
 
         <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" 
diff --git a/Sources/IHM/Mobile/AjoutBanques.xaml.cs b/Sources/IHM/Mobile/AjoutBanques.xaml.cs
index 771d317..e54e6fd 100644
--- a/Sources/IHM/Mobile/AjoutBanques.xaml.cs
+++ b/Sources/IHM/Mobile/AjoutBanques.xaml.cs
@@ -12,12 +12,16 @@ public partial class AjoutBanques : ContentPage
 		InitializeComponent();
         BindingContext = Mgr;
         Mgr.importBanques();
+        if (OperatingSystem.IsIOS())
+        {
+            boutonRetour.IsVisible = true;
+        }
     }
 
-     private async void ImportOFX_Clicked(object sender, EventArgs e)
-     {
-         PickOptions options = new PickOptions();
-         options.PickerTitle = "Choisir un fichier OFX";
+    private async void ImportOFX_Clicked(object sender, EventArgs e)
+    {
+        PickOptions options = new PickOptions();
+        options.PickerTitle = "Choisir un fichier OFX";
 
         try{
             var result = await FilePicker.Default.PickAsync(options);
@@ -45,9 +49,10 @@ public partial class AjoutBanques : ContentPage
         {
             Debug.WriteLine(ex.Message);
         }
-        
-
-
     }
+    private async void returnbutton(object sender, EventArgs e)
+    {
+        await Navigation.PopModalAsync();
+    }
+}
 
-}
\ No newline at end of file
diff --git a/Sources/IHM/Mobile/Dashboard.xaml b/Sources/IHM/Mobile/Dashboard.xaml
index 67ca25a..78766d9 100644
--- a/Sources/IHM/Mobile/Dashboard.xaml
+++ b/Sources/IHM/Mobile/Dashboard.xaml
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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"
              x:Class="IHM.Mobile.DashBoard">
+<ScrollView>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="0.25*"/>
@@ -15,20 +16,39 @@
             <ColumnDefinition/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-
-        <HorizontalStackLayout Grid.Row="0" Grid.Column="0" VerticalOptions="Center">
-            <Image Source="Resources/Images/logo_sans_fond.png" HeightRequest="50" Margin="20"/>
-            <Label Text="Cons'Eco" FontSize="20" VerticalOptions="Center" FontAttributes="Bold"/>
-        </HorizontalStackLayout>
-
+        <StackLayout Orientation="Horizontal">
+            <Label
+            Text="Bienvenue"
+            VerticalOptions="Center" 
+            HorizontalOptions="Start" 
+            Margin="10,10,10,20"
+            FontSize="25"
+            />
+            <Label
+            FontAttributes="Bold"
+            Margin="0,10,0,0"
+            Text="{Binding User.Prenom}"
+            FontSize="25"
+                />
+        </StackLayout>
         <ImageButton Grid.Row="0" Grid.Column="1" Source="account_banks.png" 
                      HorizontalOptions="End" Padding="10" Margin="10"
                      CornerRadius="10" HeightRequest="65" 
                      BackgroundColor="{StaticResource Primary}"
                      Clicked="Banques_Clicked"/>
 
+
+
+
         <Label Grid.Row="1" Grid.ColumnSpan="2" Text="Liste des Dernières Opérations : " FontAttributes="Bold" FontSize="Body" Padding="20,5,0,0"/>
 
+
+
+
+
+
+
+
         <CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding LesOpe}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
@@ -99,4 +119,5 @@
 
 
     </Grid>
+</ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Mobile/Dashboard.xaml.cs b/Sources/IHM/Mobile/Dashboard.xaml.cs
index 1b2e1f9..acd4c06 100644
--- a/Sources/IHM/Mobile/Dashboard.xaml.cs
+++ b/Sources/IHM/Mobile/Dashboard.xaml.cs
@@ -9,7 +9,7 @@ public partial class DashBoard : ContentPage
     {
         InitializeComponent();
         //Routing.RegisterRoute(nameof(DashBoard), typeof(DashBoard));
-
+        BindingContext = Mgr;
 
         if (Mgr.User == null)
         {
@@ -34,4 +34,6 @@ public partial class DashBoard : ContentPage
     {
         loadPage(new GestionBanques());
     }
+
+
 }
diff --git a/Sources/IHM/Mobile/GestionBanques.xaml b/Sources/IHM/Mobile/GestionBanques.xaml
index 170e2ff..a049acc 100644
--- a/Sources/IHM/Mobile/GestionBanques.xaml
+++ b/Sources/IHM/Mobile/GestionBanques.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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:composant="clr-namespace:IHM.Composant"
@@ -21,6 +21,7 @@
         <HorizontalStackLayout Grid.Row="0" Grid.Column="0" VerticalOptions="Center">
             <Image Source="Resources/Images/logo_sans_fond.png" HeightRequest="50" Margin="20"/>
             <Label Text="Cons'Eco" FontSize="20" VerticalOptions="Center" FontAttributes="Bold"/>
+            <Button x:Name="boutonRetour" Text="retour" HeightRequest="50" Clicked="returnbutton" IsVisible="False" HorizontalOptions="End"/>
         </HorizontalStackLayout>
 
         <ImageButton Grid.Row="0" Grid.Column="2" Source="add_banks.png" 
diff --git a/Sources/IHM/Mobile/GestionBanques.xaml.cs b/Sources/IHM/Mobile/GestionBanques.xaml.cs
index 6e87108..6d1001a 100644
--- a/Sources/IHM/Mobile/GestionBanques.xaml.cs
+++ b/Sources/IHM/Mobile/GestionBanques.xaml.cs
@@ -12,7 +12,10 @@ public partial class GestionBanques : ContentPage
 		InitializeComponent();
 		BindingContext= Mgr;
         Mgr.LoadBanques();
-
+        if (OperatingSystem.IsIOS())
+        {
+            boutonRetour.IsVisible = true;
+        }
     }
 
     public async void loadPage(Page p)
@@ -24,4 +27,9 @@ public partial class GestionBanques : ContentPage
     {
         loadPage(new AjoutBanques());
     }
+    private async void returnbutton(object sender, EventArgs e)
+    {
+        await Navigation.PopModalAsync();
+    }
+
 }
\ No newline at end of file
diff --git a/Sources/IHM/Mobile/Operations.xaml b/Sources/IHM/Mobile/Operations.xaml
index aecd678..7e65976 100644
--- a/Sources/IHM/Mobile/Operations.xaml
+++ b/Sources/IHM/Mobile/Operations.xaml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?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"
              x:Class="IHM.Mobile.Operations">
     <VerticalStackLayout>
-        <ScrollView>
             <CollectionView Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding User.LesBanques[0].ListeDesComptes[0].LesOpe}">
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
-                        <Grid Padding="10">
+                        <Grid Padding="10" >
                             <Grid.RowDefinitions>
                                 <RowDefinition/>
                                 <RowDefinition/>
@@ -24,7 +23,7 @@
                                CornerRadius="10"/>-->
                             <Label Grid.Row="0" Grid.Column="1"
                                Text="{Binding IntituleOperation}"
-                               FontAttributes="Bold" />
+                               FontAttributes="Bold" TextColor="Brown" />
                             <Label Grid.Row="1" Grid.Column="1"
                                Text="{Binding DetailTypeOpe}"
                                FontAttributes="Italic"/>
@@ -36,9 +35,6 @@
                         </Grid>
                     </DataTemplate>
                 </CollectionView.ItemTemplate>
-            </CollectionView>
-
-        </ScrollView>
-        
+            </CollectionView>        
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/IHM/Mobile/Operations.xaml.cs b/Sources/IHM/Mobile/Operations.xaml.cs
index 0d1fde4..8615a00 100644
--- a/Sources/IHM/Mobile/Operations.xaml.cs
+++ b/Sources/IHM/Mobile/Operations.xaml.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using Model;
 
 namespace IHM.Mobile;
@@ -10,5 +11,4 @@ public partial class Operations : ContentPage
 		InitializeComponent();
 		BindingContext = Mgr;
     }
-    
 }
\ No newline at end of file
diff --git a/Sources/IHM/Platforms/iOS/Info.plist b/Sources/IHM/Platforms/iOS/Info.plist
index 0004a4f..50bff6d 100644
--- a/Sources/IHM/Platforms/iOS/Info.plist
+++ b/Sources/IHM/Platforms/iOS/Info.plist
@@ -26,7 +26,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>XSAppIconAssets</key>
-	<string>Assets.xcassets/appicon.appiconset</string>
 </dict>
 </plist>