diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs
index b8ea784..36bcdc8 100644
--- a/src/Banquale/Banquale/App.xaml.cs
+++ b/src/Banquale/Banquale/App.xaml.cs
@@ -6,7 +6,7 @@ namespace Banquale;
public partial class App : Application
{
- public Manager MyManager { get; private set; } = new Manager(new Stub.Stub());
+ public Manager MyManager { get; private set; } = new Manager(new DataContractPersistance.DataContractPers());
diff --git a/src/Banquale/Banquale/AppShell.xaml b/src/Banquale/Banquale/AppShell.xaml
index 6bb3267..938b21c 100644
--- a/src/Banquale/Banquale/AppShell.xaml
+++ b/src/Banquale/Banquale/AppShell.xaml
@@ -8,47 +8,40 @@
Shell.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False">
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
+
-
+
-
+
-
+ Title="Compte"
+ ContentTemplate="{DataTemplate views:SwitchAccountPage}"
+ Route="account"
+ Icon="accounts.png"/>
diff --git a/src/Banquale/Banquale/AppShell.xaml.cs b/src/Banquale/Banquale/AppShell.xaml.cs
index 602ca78..2a5a288 100644
--- a/src/Banquale/Banquale/AppShell.xaml.cs
+++ b/src/Banquale/Banquale/AppShell.xaml.cs
@@ -1,10 +1,18 @@
-namespace Banquale;
+using Banquale.Views;
+
+namespace Banquale;
public partial class AppShell : Shell
{
public AppShell()
{
InitializeComponent();
- }
+ Routing.RegisterRoute("balance/categorydetails", typeof(CategoryPage));
+ Routing.RegisterRoute("newpagedetails", typeof(NewPage1));
+ //Routing.RegisterRoute("menu/requestdetails", typeof(RequestPage));
+ //Routing.RegisterRoute("menu/ribdetails", typeof(RibPage));
+ //Routing.RegisterRoute("menu/transferdetails", typeof(TransferPage));
+ }
+
}
diff --git a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs
index 887501e..3a66644 100644
--- a/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs
+++ b/src/Banquale/Banquale/DataContractPersistance/DataContractPers.cs
@@ -10,19 +10,9 @@ namespace Banquale.DataContractPersistance
{
public class DataContractPers : IPersistanceManager
{
- //Partie Antoine
- public string FilePath { get; set; } = "/Users//Perederii//SAE//Banquale//src//Banquale//Banquale//Persistances";
+ public string FilePath { get; set; } = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/datbase.xml";
public string FileName { get; set; } = "ClientAndTransactionsList.xml";
- //public string FilePath { get; set; } = Path.Combine(Directory.GetCurrentDirectory(), "..//XML1_folder")/*"/Users/Perederii/SAE/Banquale/src/Banquale/Banquale/XML_folder"*/;
-
- //Partie Titouan
-
- //public string FileName { get; set; } = "nomFichier.xml";
-
- // public string FilePath2 { get; set; } = "..\\Persistances";
- // public string FilePath { get; set; } = "C:\\Users\\louve\\depot\\Banquale\\src\\Banquale\\Persistances";
-
public (List, List) ChargeDonnee()
{
var serializer = new DataContractSerializer(typeof(List));
@@ -43,6 +33,7 @@ namespace Banquale.DataContractPersistance
if(!Directory.Exists(FilePath))
{
Debug.WriteLine("Directory crée à l'instant");
+ Debug.WriteLine(FilePath);
Directory.CreateDirectory(FilePath);
}
diff --git a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs
index 7e25698..6fc9ed4 100644
--- a/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs
+++ b/src/Banquale/Banquale/DataContractPersistance/DataToPersist.cs
@@ -1,11 +1,12 @@
using System;
+using Banquale.Model;
+
namespace Banquale.DataContractPersistance
{
public class DataToPersist
{
- public DataToPersist()
- {
- }
+ public List clients { get; set; } = new List();
+ public List transactions { get; set; } = new List();
}
}
diff --git a/src/Banquale/Banquale/Model/Client.cs b/src/Banquale/Banquale/Model/Client.cs
index 52a7ced..a647145 100644
--- a/src/Banquale/Banquale/Model/Client.cs
+++ b/src/Banquale/Banquale/Model/Client.cs
@@ -1,16 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace Banquale.Model
{
- //[DataFrameworks]
+ [DataContract]
public class Client: Personne
{
- //[DataMember]
+ [DataMember]
public List ListeComptes { get; private set; }
diff --git a/src/Banquale/Banquale/Model/Personne.cs b/src/Banquale/Banquale/Model/Personne.cs
index 1cf31fa..72105de 100644
--- a/src/Banquale/Banquale/Model/Personne.cs
+++ b/src/Banquale/Banquale/Model/Personne.cs
@@ -1,17 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace Banquale.Model
{
+ [DataContract]
public class Personne
{
+ [DataMember]
public string Nom { get; private set; }
+ [DataMember]
public string Prenom { get; private set; }
+ [DataMember]
public int Id { get; private set; }
+ [DataMember]
public string Mdp { get; private set; }
public Personne(string nom, string prenom, string mdp)
diff --git a/src/Banquale/Banquale/Platforms/Android/AndroidManifest.xml b/src/Banquale/Banquale/Platforms/Android/AndroidManifest.xml
index fe0e0d9..c13d65a 100644
--- a/src/Banquale/Banquale/Platforms/Android/AndroidManifest.xml
+++ b/src/Banquale/Banquale/Platforms/Android/AndroidManifest.xml
@@ -3,5 +3,8 @@
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/BalancePage.xaml b/src/Banquale/Banquale/Views/BalancePage.xaml
index c33656d..88cb515 100644
--- a/src/Banquale/Banquale/Views/BalancePage.xaml
+++ b/src/Banquale/Banquale/Views/BalancePage.xaml
@@ -55,6 +55,7 @@
AlignContent="Start"
Direction="Row"
Wrap="Wrap">
+
diff --git a/src/Banquale/Banquale/Views/BalanceView.xaml b/src/Banquale/Banquale/Views/BalanceView.xaml
index adc70c5..5d35cf9 100644
--- a/src/Banquale/Banquale/Views/BalanceView.xaml
+++ b/src/Banquale/Banquale/Views/BalanceView.xaml
@@ -12,20 +12,20 @@
Margin="20, 5, 20, 5"
HorizontalOptions="Fill">
-
-
-
+
+
+
diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml b/src/Banquale/Banquale/Views/ConnectionPage.xaml
index ec61893..6ba4cee 100644
--- a/src/Banquale/Banquale/Views/ConnectionPage.xaml
+++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml
@@ -37,7 +37,8 @@
TextColor="Black"
MinimumHeightRequest="75"
Margin="10,75,10,0"
- FontSize="Large"/>
+ FontSize="Large"
+ Clicked="Connection_Clicked"/>
diff --git a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
index fcd190e..a94e5d3 100644
--- a/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/ConnectionPage.xaml.cs
@@ -6,4 +6,10 @@ public partial class ConnectionPage : ContentPage
{
InitializeComponent();
}
+
+ public async void Connection_Clicked(Object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("///balance");
+ }
+
}
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/HelpPage.xaml.cs b/src/Banquale/Banquale/Views/HelpPage.xaml.cs
index 4c72cab..cc6106f 100644
--- a/src/Banquale/Banquale/Views/HelpPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/HelpPage.xaml.cs
@@ -9,6 +9,6 @@ public partial class HelpPage : ContentPage
public async void Send_Clicked(Object sender, EventArgs e)
{
- await Shell.Current.Navigation.PushAsync(new BalancePage());
+ await Shell.Current.GoToAsync("//balance");
}
}
diff --git a/src/Banquale/Banquale/Views/MenuTransferPage.xaml.cs b/src/Banquale/Banquale/Views/MenuTransferPage.xaml.cs
index 8d6ca84..8c3f1f5 100644
--- a/src/Banquale/Banquale/Views/MenuTransferPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/MenuTransferPage.xaml.cs
@@ -7,19 +7,19 @@ public partial class MenuTransferPage : ContentPage
InitializeComponent();
}
- public async void RIB_Clicked(Object sender, EventArgs e)
+ public async void RIB_Clicked(object sender, EventArgs e)
{
- await Navigation.PushAsync(new RibPage());
+ await Shell.Current.Navigation.PushAsync(new RibPage());
}
- public async void Request_Clicked(System.Object sender, System.EventArgs e)
+ public async void Request_Clicked(object sender, EventArgs e)
{
- await Navigation.PushAsync(new RequestPage());
+ await Shell.Current.Navigation.PushAsync(new RequestPage());
}
- public async void Transfer_Clicked(System.Object sender, System.EventArgs e)
+ public async void Transfer_Clicked(object sender, EventArgs e)
{
- await Navigation.PushAsync(new TransferPage());
+ await Shell.Current.Navigation.PushAsync(new TransferPage());
}
}
diff --git a/src/Banquale/Banquale/Views/RequestPage.xaml b/src/Banquale/Banquale/Views/RequestPage.xaml
index 637778a..2ac7ea5 100644
--- a/src/Banquale/Banquale/Views/RequestPage.xaml
+++ b/src/Banquale/Banquale/Views/RequestPage.xaml
@@ -46,7 +46,8 @@
Margin="0, 75, 0, 0"
MinimumHeightRequest="80"
WidthRequest="300"
- MaximumWidthRequest="400"/>
+ MaximumWidthRequest="400"
+ />
diff --git a/src/Banquale/Banquale/Views/RequestPage.xaml.cs b/src/Banquale/Banquale/Views/RequestPage.xaml.cs
index 602369f..8013e8f 100644
--- a/src/Banquale/Banquale/Views/RequestPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/RequestPage.xaml.cs
@@ -6,4 +6,10 @@ public partial class RequestPage : ContentPage
{
InitializeComponent();
}
+
+ //public async void Send_Clicked(Object sender, EventArgs e)
+ //{
+ // await Shell.Current.GoToAsync("//balance");
+ //}
+
}
diff --git a/src/Banquale/Banquale/Views/SwitchAccountView.xaml b/src/Banquale/Banquale/Views/SwitchAccountView.xaml
index ad87a42..542cdef 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountView.xaml
+++ b/src/Banquale/Banquale/Views/SwitchAccountView.xaml
@@ -1,4 +1,4 @@
-
+
@@ -16,7 +16,8 @@
-
+
diff --git a/src/Banquale/Banquale/Views/SwitchAccountView.xaml.cs b/src/Banquale/Banquale/Views/SwitchAccountView.xaml.cs
index bb69a26..5645fb6 100644
--- a/src/Banquale/Banquale/Views/SwitchAccountView.xaml.cs
+++ b/src/Banquale/Banquale/Views/SwitchAccountView.xaml.cs
@@ -6,4 +6,10 @@ public partial class SwitchAccountView : ContentView
{
InitializeComponent();
}
+
+ public async void Transfer_Clicked(object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("///connection");
+ }
+
}
\ No newline at end of file
diff --git a/src/Banquale/Banquale/Views/TransferPage.xaml b/src/Banquale/Banquale/Views/TransferPage.xaml
index e3987d4..fde1f81 100644
--- a/src/Banquale/Banquale/Views/TransferPage.xaml
+++ b/src/Banquale/Banquale/Views/TransferPage.xaml
@@ -46,7 +46,8 @@
Margin="0, 75, 0, 0"
MinimumHeightRequest="80"
WidthRequest="300"
- MaximumWidthRequest="400"/>
+ MaximumWidthRequest="400"
+ Clicked="Send_Clicked"/>
diff --git a/src/Banquale/Banquale/Views/TransferPage.xaml.cs b/src/Banquale/Banquale/Views/TransferPage.xaml.cs
index ff4749f..340bcd4 100644
--- a/src/Banquale/Banquale/Views/TransferPage.xaml.cs
+++ b/src/Banquale/Banquale/Views/TransferPage.xaml.cs
@@ -6,4 +6,10 @@ public partial class TransferPage : ContentPage
{
InitializeComponent();
}
-}
+
+ public async void Send_Clicked(Object sender, EventArgs e)
+ {
+ await Shell.Current.GoToAsync("//balance");
+ }
+
+}
\ No newline at end of file