diff --git a/src/Banquale/Banquale/App.xaml.cs b/src/Banquale/Banquale/App.xaml.cs
index b8ea784..d09ea42 100644
--- a/src/Banquale/Banquale/App.xaml.cs
+++ b/src/Banquale/Banquale/App.xaml.cs
@@ -13,9 +13,9 @@ public partial class App : Application
public App()
{
- MyManager.ChargeDonnee();
- MyManager.Persistance = new DataContractPersistance.DataContractPers();
- MyManager.SauvegardeDonnee();
+ //MyManager.ChargeDonnee();
+ //MyManager.Persistance = new DataContractPersistance.DataContractPers();
+ //MyManager.SauvegardeDonnee();
InitializeComponent();
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/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