From 23c7e4432292ec851843091ff11667bf4bf494ed Mon Sep 17 00:00:00 2001 From: Lucas EVARD Date: Thu, 14 Sep 2023 12:00:13 +0200 Subject: [PATCH] :lipstick: Coloration des logos et mises en place de la popup page afin d'add des livres --- sources/PocketBook/AddBook.xaml | 11 ++ sources/PocketBook/AddBook.xaml.cs | 11 ++ sources/PocketBook/BookChange.xaml | 13 +- sources/PocketBook/MauiProgram.cs | 20 +-- sources/PocketBook/PocketBook.csproj | 4 + .../PocketBook/Resources/Images/barcode.svg | 7 + .../Resources/Images/barcode_scan.png | Bin 0 -> 6570 bytes .../PocketBook/Resources/Images/keyboard.svg | 7 + sources/PocketBook/TousPage.xaml | 37 ++++- sources/PocketBook/TousPage.xaml.cs | 126 ++++++++++-------- 10 files changed, 160 insertions(+), 76 deletions(-) create mode 100644 sources/PocketBook/AddBook.xaml create mode 100644 sources/PocketBook/AddBook.xaml.cs create mode 100644 sources/PocketBook/Resources/Images/barcode.svg create mode 100644 sources/PocketBook/Resources/Images/barcode_scan.png create mode 100644 sources/PocketBook/Resources/Images/keyboard.svg diff --git a/sources/PocketBook/AddBook.xaml b/sources/PocketBook/AddBook.xaml new file mode 100644 index 0000000..41c967a --- /dev/null +++ b/sources/PocketBook/AddBook.xaml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/sources/PocketBook/AddBook.xaml.cs b/sources/PocketBook/AddBook.xaml.cs new file mode 100644 index 0000000..7bfdd8d --- /dev/null +++ b/sources/PocketBook/AddBook.xaml.cs @@ -0,0 +1,11 @@ +using CommunityToolkit.Maui.Views; + +namespace PocketBook; + +public partial class AddBook : Popup +{ + public AddBook() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/sources/PocketBook/BookChange.xaml b/sources/PocketBook/BookChange.xaml index b28fce5..aa7bd16 100644 --- a/sources/PocketBook/BookChange.xaml +++ b/sources/PocketBook/BookChange.xaml @@ -1,9 +1,14 @@ - - - diff --git a/sources/PocketBook/MauiProgram.cs b/sources/PocketBook/MauiProgram.cs index a47d533..0f34e9d 100644 --- a/sources/PocketBook/MauiProgram.cs +++ b/sources/PocketBook/MauiProgram.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.Logging; +using CommunityToolkit.Maui; namespace PocketBook; @@ -6,17 +7,18 @@ public static class MauiProgram { public static MauiApp CreateMauiApp() { - var builder = MauiApp.CreateBuilder(); - builder - .UseMauiApp() - .ConfigureFonts(fonts => - { - fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); - fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); - }); + var builder = MauiApp.CreateBuilder(); + builder + .UseMauiApp() + .UseMauiCommunityToolkit() + .ConfigureFonts(fonts => + { + fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); + }); #if DEBUG - builder.Logging.AddDebug(); + builder.Logging.AddDebug(); #endif return builder.Build(); diff --git a/sources/PocketBook/PocketBook.csproj b/sources/PocketBook/PocketBook.csproj index 37befb6..890ca5e 100644 --- a/sources/PocketBook/PocketBook.csproj +++ b/sources/PocketBook/PocketBook.csproj @@ -49,10 +49,14 @@ + + + MSBuild:Compile + MSBuild:Compile diff --git a/sources/PocketBook/Resources/Images/barcode.svg b/sources/PocketBook/Resources/Images/barcode.svg new file mode 100644 index 0000000..72dc51b --- /dev/null +++ b/sources/PocketBook/Resources/Images/barcode.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ No newline at end of file diff --git a/sources/PocketBook/Resources/Images/barcode_scan.png b/sources/PocketBook/Resources/Images/barcode_scan.png new file mode 100644 index 0000000000000000000000000000000000000000..a181ec555f7dc971fb9300454b345f555724fa4a GIT binary patch literal 6570 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 U^~E_%E-J(RaBy$I9^8fh0n+a literal 0 HcmV?d00001 diff --git a/sources/PocketBook/Resources/Images/keyboard.svg b/sources/PocketBook/Resources/Images/keyboard.svg new file mode 100644 index 0000000..91b87f3 --- /dev/null +++ b/sources/PocketBook/Resources/Images/keyboard.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.onlinewebfonts.com/icon + + \ No newline at end of file diff --git a/sources/PocketBook/TousPage.xaml b/sources/PocketBook/TousPage.xaml index ac34fd5..b5266c4 100644 --- a/sources/PocketBook/TousPage.xaml +++ b/sources/PocketBook/TousPage.xaml @@ -2,16 +2,25 @@ + x:Class="PocketBook.TousPage" + xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"> - + + + + + @@ -20,7 +29,6 @@ - @@ -47,6 +55,27 @@ + + + + + + + + + + + + diff --git a/sources/PocketBook/TousPage.xaml.cs b/sources/PocketBook/TousPage.xaml.cs index 3a6d312..27d0cbf 100644 --- a/sources/PocketBook/TousPage.xaml.cs +++ b/sources/PocketBook/TousPage.xaml.cs @@ -1,60 +1,68 @@ -namespace PocketBook; - -public partial class Book -{ - public string name { get; set; } - public string type { get; set; } - public string auteur { get; set; } - public string image { get; set; } - - public Book(string name, string type,string auteur) - { - this.name = name; - this.auteur = auteur; - this.type = type; - } -} - -public partial class Auteur -{ - public string name { get; set; } - public List books { get; set; } - - public Auteur(string name) - { - this.name = name; - books = new List - { - new Book("Buveur d'encre", "En lecture", name), - new Book("Harry Potter et la pierre philosophale", "Non lu",name), - new Book("Le Seigneur des anneaux", "En lecture", name), - new Book("1984", "Terminé", name), - new Book("Le Petit Prince", "Non lu", name) - }; - } -} - -public partial class TousPage : ContentPage -{ - public List mesAuteurs { get; set; } - public List books { get; set; } - - public TousPage() - { - mesAuteurs = new List - { - new Auteur("J.K. Rowling"), - new Auteur("J.R.R. Tolkien") - }; - InitializeComponent(); - BindingContext=this; - } - public async void OnCollectionViewSelectionChanged(object sender, SelectionChangedEventArgs e) - { - if (e.CurrentSelection.FirstOrDefault() is Book livreSelectionne) - { - await Navigation.PushAsync(new BookDetail(livreSelectionne)); - } - } - +using CommunityToolkit.Maui.Views; + +namespace PocketBook; + +public partial class Book +{ + public string name { get; set; } + public string type { get; set; } + public string auteur { get; set; } + public string image { get; set; } + + public Book(string name, string type,string auteur) + { + this.name = name; + this.auteur = auteur; + this.type = type; + } +} + +public partial class Auteur +{ + public string name { get; set; } + public List books { get; set; } + + public Auteur(string name) + { + this.name = name; + books = new List + { + new Book("Buveur d'encre", "En lecture", name), + new Book("Harry Potter et la pierre philosophale", "Non lu",name), + new Book("Le Seigneur des anneaux", "En lecture", name), + new Book("1984", "Terminé", name), + new Book("Le Petit Prince", "Non lu", name) + }; + } +} + +public partial class TousPage : ContentPage +{ + public List mesAuteurs { get; set; } + public List books { get; set; } + + public bool clicked=false; + + public TousPage() + { + mesAuteurs = new List + { + new Auteur("J.K. Rowling"), + new Auteur("J.R.R. Tolkien") + }; + InitializeComponent(); + BindingContext=this; + } + public async void OnCollectionViewSelectionChanged(object sender, SelectionChangedEventArgs e) + { + if (e.CurrentSelection.FirstOrDefault() is Book livreSelectionne) + { + await Navigation.PushAsync(new BookDetail(livreSelectionne)); + } + } + + private void OnImageButtonClicked(object sender, EventArgs e) + { + var popup = new AddBook(); + } } \ No newline at end of file