diff --git a/CanYouBuildIt/CanYouBuildIt.csproj b/CanYouBuildIt/CanYouBuildIt.csproj
index e8738f9..3df0b26 100644
--- a/CanYouBuildIt/CanYouBuildIt.csproj
+++ b/CanYouBuildIt/CanYouBuildIt.csproj
@@ -41,7 +41,6 @@
-
diff --git a/CanYouBuildIt/Model/Manager.cs b/CanYouBuildIt/Model/Manager.cs
index 9febfaa..471c1d4 100644
--- a/CanYouBuildIt/Model/Manager.cs
+++ b/CanYouBuildIt/Model/Manager.cs
@@ -29,7 +29,7 @@ namespace CanYouBuildIt.Model
{
var donnee = Persi.chargeDonnee();
listUtil.AddRange(donnee.Item1);
- listComp.AddRange(donnee.Item2);
+ //listComp.AddRange(donnee.Item2);
}
public void sauvegardeDonnee()
diff --git a/CanYouBuildIt/Resources/Images/iconcybi.png b/CanYouBuildIt/Resources/Images/iconcybi.png
new file mode 100644
index 0000000..47d512f
Binary files /dev/null and b/CanYouBuildIt/Resources/Images/iconcybi.png differ
diff --git a/CanYouBuildIt/Views/Acceuil.xaml b/CanYouBuildIt/Views/Acceuil.xaml
index d7fc9e8..e19ec41 100644
--- a/CanYouBuildIt/Views/Acceuil.xaml
+++ b/CanYouBuildIt/Views/Acceuil.xaml
@@ -4,12 +4,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="CanYouBuildIt.Views.Acceuil"
Title="Can You Build It"
- BackgroundColor="DarkTurquoise">
+ BackgroundColor="#26B4BE">
-
+
@@ -25,35 +25,35 @@
-
-
-
-
-
-
-
+
@@ -72,20 +72,20 @@
+ Clicked="NavLogin"
+ Grid.Row="0" Grid.Column="2"
+ HorizontalOptions="Center"
+ Text="Configurateur"
+ TextColor="Snow"
+ x:Name="Config"/>
+ Clicked="NavFav"
+ Grid.Row="0" Grid.Column="5"
+ HorizontalOptions="Center"
+ TextColor="Snow"
+ x:Name="Fav"
+ Text="Favoris"/>
+ Clicked="ToQuit"
+ Grid.Row="1" Grid.Column="1"
+ HorizontalOptions="Center"
+ Text="Quitter"
+ TextColor="Snow"
+ x:Name="Quit"/>
+ Clicked="NavCreds"
+ Grid.Row="1" Grid.Column="6"
+ HorizontalOptions="Center"
+ Text="Credits"
+ TextColor="Snow"
+ x:Name="Creds"/>
-
+
+
+
\ No newline at end of file
diff --git a/CanYouBuildIt/Views/Acceuil.xaml.cs b/CanYouBuildIt/Views/Acceuil.xaml.cs
index e2cead7..f36db1d 100644
--- a/CanYouBuildIt/Views/Acceuil.xaml.cs
+++ b/CanYouBuildIt/Views/Acceuil.xaml.cs
@@ -1,26 +1,46 @@
using CanYouBuildIt.Model;
using System.Diagnostics;
+using System.Reflection;
namespace CanYouBuildIt.Views;
public partial class Acceuil : ContentPage
{
public Manager manager=> (App.Current as App).manager;
+ bool connecte = false;
+ int user;
+
public Acceuil()
{
InitializeComponent();
BindingContext = manager;
}
- private void AddUtilisater(object sender, EventArgs e)
+ public Acceuil(int iduser)
+ {
+ InitializeComponent();
+ BindingContext = manager;
+ connecte = true;
+ user = iduser;
+ }
+
+ //Ancien test
+ /*private void AddUtilisater(object sender, EventArgs e)
{
Utilisateur utilisateur = new Utilisateur("Util1","pdm1");
Debug.WriteLine("Utilisateur créé");
- }
+ }*/
private async void NavFav(object sender, EventArgs e)
{
- await Navigation.PushAsync(new Favoris());
+ if (connecte)
+ await Navigation.PushAsync(new Favoris());
+ else
+ {
+ aConnecter.IsVisible = true;
+ await Task.Delay(1000);
+ aConnecter.IsVisible = false;
+ }
}
private async void NavCreds(object sender, EventArgs e)
diff --git a/CanYouBuildIt/Views/Credits.xaml b/CanYouBuildIt/Views/Credits.xaml
index 542b167..1848f93 100644
--- a/CanYouBuildIt/Views/Credits.xaml
+++ b/CanYouBuildIt/Views/Credits.xaml
@@ -3,12 +3,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="CanYouBuildIt.Views.Credits"
Title="Credits"
- BackgroundColor="DarkTurquoise">
+ BackgroundColor="#26B4BE">
diff --git a/CanYouBuildIt/Views/Favoris.xaml b/CanYouBuildIt/Views/Favoris.xaml
index 3080ffd..508018f 100644
--- a/CanYouBuildIt/Views/Favoris.xaml
+++ b/CanYouBuildIt/Views/Favoris.xaml
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="CanYouBuildIt.Views.Favoris"
Title="Favoris"
- BackgroundColor="DarkTurquoise">
+ BackgroundColor="#26B4BE">
@@ -18,7 +18,7 @@
-
+
@@ -27,37 +27,38 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ x:Name="FavToHome"/>
diff --git a/CanYouBuildIt/Views/Login.xaml b/CanYouBuildIt/Views/Login.xaml
index 4083f35..d3a5008 100644
--- a/CanYouBuildIt/Views/Login.xaml
+++ b/CanYouBuildIt/Views/Login.xaml
@@ -2,17 +2,16 @@
+ Title="Login"
+ BackgroundColor="#26B4BE">
-
-
-
-
+
+
-
+
+
-
-