diff --git a/LivreLand/AppShell.xaml b/LivreLand/AppShell.xaml
index c9cf00c..cacb6af 100644
--- a/LivreLand/AppShell.xaml
+++ b/LivreLand/AppShell.xaml
@@ -17,7 +17,7 @@
ContentTemplate="{DataTemplate view:TousView}"
Icon="list_bullet.svg"/>
MSBuild:Compile
+
+ MSBuild:Compile
+
MSBuild:Compile
@@ -97,6 +100,9 @@
MSBuild:Compile
+
+ MSBuild:Compile
+
MSBuild:Compile
diff --git a/LivreLand/Resources/Images/book_cover.png b/LivreLand/Resources/Images/book_cover.png
deleted file mode 100644
index e24d446..0000000
Binary files a/LivreLand/Resources/Images/book_cover.png and /dev/null differ
diff --git a/LivreLand/View/BibliothequeView.xaml b/LivreLand/View/BibliothequeView.xaml
index cd90067..53ec420 100644
--- a/LivreLand/View/BibliothequeView.xaml
+++ b/LivreLand/View/BibliothequeView.xaml
@@ -3,9 +3,17 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:view="clr-namespace:LivreLand.View"
xmlns:contentView="clr-namespace:LivreLand.View.ContentViews"
+ xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="LivreLand.View.BibliothequeView"
x:Name="this"
Title="BibliothequeView">
+
+
+
+
+
+
+
@@ -44,7 +52,6 @@
diff --git a/LivreLand/View/BibliothequeView.xaml.cs b/LivreLand/View/BibliothequeView.xaml.cs
index 9f8f7cb..17d8118 100644
--- a/LivreLand/View/BibliothequeView.xaml.cs
+++ b/LivreLand/View/BibliothequeView.xaml.cs
@@ -4,21 +4,8 @@ namespace LivreLand.View;
public partial class BibliothequeView : ContentPage
{
- public ICommand FiltreAuteurCommand { get; private set; }
-
public BibliothequeView()
{
InitializeComponent();
-
- //Commandes navigation temporaires
- FiltreAuteurCommand = new Command(
- execute: () =>
- {
- App.Current.MainPage.Navigation.PushAsync(new FiltrageAuteurView());
- },
- canExecute: () =>
- {
- return true;
- });
}
}
\ No newline at end of file
diff --git a/LivreLand/View/ContentViews/EmpruntsPretsButtonView.xaml b/LivreLand/View/ContentViews/EmpruntsPretsButtonView.xaml
new file mode 100644
index 0000000..198507b
--- /dev/null
+++ b/LivreLand/View/ContentViews/EmpruntsPretsButtonView.xaml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LivreLand/View/ContentViews/EmpruntsPretsButtonView.xaml.cs b/LivreLand/View/ContentViews/EmpruntsPretsButtonView.xaml.cs
new file mode 100644
index 0000000..6727d88
--- /dev/null
+++ b/LivreLand/View/ContentViews/EmpruntsPretsButtonView.xaml.cs
@@ -0,0 +1,25 @@
+namespace LivreLand.View.ContentViews;
+
+public partial class EmpruntsPretsButtonView : ContentView
+{
+ public EmpruntsPretsButtonView()
+ {
+ InitializeComponent();
+ }
+
+ public void OnPretsClicked(object sender, EventArgs e)
+ {
+ pretsClicked.BackgroundColor = Colors.Transparent;
+ pretsClicked.IsEnabled = false;
+ empruntsButton.BackgroundColor = Colors.White;
+ empruntsButton.IsEnabled = true;
+ }
+
+ public void OnEmpruntsClicked(object sender, EventArgs e)
+ {
+ pretsClicked.BackgroundColor = Colors.White;
+ pretsClicked.IsEnabled = true;
+ empruntsButton.BackgroundColor = Colors.Transparent;
+ empruntsButton.IsEnabled = false;
+ }
+}
\ No newline at end of file
diff --git a/LivreLand/View/ContentViews/HomeButtonView.xaml b/LivreLand/View/ContentViews/HomeButtonView.xaml
index 352e021..e6db27f 100644
--- a/LivreLand/View/ContentViews/HomeButtonView.xaml
+++ b/LivreLand/View/ContentViews/HomeButtonView.xaml
@@ -51,10 +51,6 @@
-
-
-
-
diff --git a/LivreLand/View/ContentViews/HomeButtonView.xaml.cs b/LivreLand/View/ContentViews/HomeButtonView.xaml.cs
index 3a762e0..4debe65 100644
--- a/LivreLand/View/ContentViews/HomeButtonView.xaml.cs
+++ b/LivreLand/View/ContentViews/HomeButtonView.xaml.cs
@@ -39,13 +39,6 @@ public partial class HomeButtonView : ContentView
set => SetValue(HomeButtonView.ButtonBlackIconVisibleProperty, value);
}
- public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(nameof(ButtonCommand), typeof(Command), typeof(HomeButtonView));
- public Command ButtonCommand
- {
- get => (Command)GetValue(HomeButtonView.ButtonCommandProperty);
- set => SetValue(HomeButtonView.ButtonCommandProperty, value);
- }
-
public HomeButtonView()
{
InitializeComponent();
diff --git a/LivreLand/View/ContentViews/SearchBarView.xaml b/LivreLand/View/ContentViews/SearchBarView.xaml
index 68a6915..ae11fdf 100644
--- a/LivreLand/View/ContentViews/SearchBarView.xaml
+++ b/LivreLand/View/ContentViews/SearchBarView.xaml
@@ -13,7 +13,7 @@
-
+
+
+
+
+
diff --git a/LivreLand/View/EmpruntsPretsView.xaml b/LivreLand/View/EmpruntsPretsView.xaml
new file mode 100644
index 0000000..3b14861
--- /dev/null
+++ b/LivreLand/View/EmpruntsPretsView.xaml
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LivreLand/View/EmpruntsPretsView.xaml.cs b/LivreLand/View/EmpruntsPretsView.xaml.cs
new file mode 100644
index 0000000..525c674
--- /dev/null
+++ b/LivreLand/View/EmpruntsPretsView.xaml.cs
@@ -0,0 +1,27 @@
+using LivreLand.Model;
+
+namespace LivreLand.View;
+
+public partial class EmpruntsPretsView : ContentPage
+{
+ public List AntoineBooks { get; set; } = new List()
+ {
+ new BookModel("The Wake","Scott Snyder","Terminé", 0),
+ };
+
+ public List AudreyPoucletBooks { get; set; } = new List()
+ {
+ new BookModel("Les feux de Cibola","James S. A. Corey","Terminé", 0),
+ };
+
+ public EmpruntsPretsView()
+ {
+ BindingContext = this;
+ InitializeComponent();
+ }
+
+ void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ App.Current.MainPage.Navigation.PushAsync(new DetailsLivreView());
+ }
+}
\ No newline at end of file
diff --git a/LivreLand/View/TousView.xaml b/LivreLand/View/TousView.xaml
index 3abe18b..2992cab 100644
--- a/LivreLand/View/TousView.xaml
+++ b/LivreLand/View/TousView.xaml
@@ -18,12 +18,16 @@
HeaderPlusButtonVisible="True"
HeaderSwitchButtonVisible="True"
Grid.Row="0"/>
-
+
+
+
+
+
@@ -38,7 +42,7 @@
Style="{StaticResource HeaderCollectionViewText}"
Grid.Column="1"/>
-
@@ -68,16 +72,109 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LivreLand/View/TousView.xaml.cs b/LivreLand/View/TousView.xaml.cs
index 23f116b..6610a6e 100644
--- a/LivreLand/View/TousView.xaml.cs
+++ b/LivreLand/View/TousView.xaml.cs
@@ -4,11 +4,17 @@ namespace LivreLand.View;
public partial class TousView : ContentPage
{
- public List AllBooks { get; set; } = new List()
+ public List DamasioBooks { get; set; } = new List()
{
new BookModel("La horde du contrevent","Alain Damasio","Non lu", 0),
new BookModel("La zone du dehors","Alain Damasio","Terminé", 0),
- new BookModel("L'équateur d'Einstein","Cixin Liu","Non lu", 0)
+ };
+
+ public List LiuBooks { get; set; } = new List()
+ {
+ new BookModel("L'équateur d'Einstein","Cixin Liu","Terminé", 0),
+ new BookModel("La forêt sombre","Cixin Liu","Terminé", 0),
+ new BookModel("Le problème à trois corps","Cixin Liu","Terminé", 0)
};
public TousView()