From 8a14c4a337d9f583cd50ac9f11e2d58d0587c5fc Mon Sep 17 00:00:00 2001 From: Lucas Evard Date: Sat, 16 Sep 2023 14:18:51 +0200 Subject: [PATCH] =?UTF-8?q?Rectification=20de=20certains=20probl=C3=A8mes?= =?UTF-8?q?=20et=20mise=20en=20place=20de=20la=20page=20Date=20de=20public?= =?UTF-8?q?ation=20et=20auteur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../San Francisco/.DS_Store => .DS_Store | Bin 6148 -> 6148 bytes sources/.DS_Store | Bin 0 -> 6148 bytes sources/PocketBook/.DS_Store | Bin 0 -> 8196 bytes sources/PocketBook/AppShell.xaml | 10 +- sources/PocketBook/Auteur.xaml | 73 +++++++-- sources/PocketBook/Auteur.xaml.cs | 5 + sources/PocketBook/BookChange.xaml | 4 +- sources/PocketBook/BookDetail.xaml | 40 +++-- sources/PocketBook/BookDetail.xaml.cs | 26 ++-- sources/PocketBook/ContentViewBook.xaml | 50 +++++-- sources/PocketBook/ContentViewFilter.xaml | 4 +- sources/PocketBook/DatePublic.xaml | 72 +++++++++ sources/PocketBook/DatePublic.xaml.cs | 14 ++ sources/PocketBook/Filtrage.xaml | 18 +++ sources/PocketBook/Filtrage.xaml.cs | 33 +++++ sources/PocketBook/MainPage.xaml | 25 ++-- sources/PocketBook/MainPage.xaml.cs | 7 +- sources/PocketBook/Platforms/iOS/Info.plist | 64 ++++---- sources/PocketBook/PocketBook.csproj | 109 +++++++++++++- sources/PocketBook/Resources/.DS_Store | Bin 0 -> 6148 bytes sources/PocketBook/Resources/Images/.DS_Store | Bin 0 -> 10244 bytes .../Resources/Images/arrow_forward.svg | 0 .../PocketBook/Resources/Images/arrows.svg | 0 .../PocketBook/Resources/Images/barcode.svg | 0 .../Resources/Images/barcode_scan.png | Bin .../Resources/Images/binoculars.svg | 0 .../Resources/Images/binoculars_fill.svg | 0 sources/PocketBook/Resources/Images/book.svg | 10 ++ .../Resources/Images/book_closed.svg | 0 .../Resources/Images/book_closed_fill.svg | 0 .../PocketBook/Resources/Images/book_fill.svg | 0 .../PocketBook/Resources/Images/bookmark.svg | 0 .../Resources/Images/bookmark_fill.svg | 0 .../Resources/Images/books_vertical.svg | 0 .../Resources/Images/books_vertical_fill.svg | 0 .../Resources/Images/buveurencre.jpg | Bin .../PocketBook/Resources/Images/calendar.svg | 0 .../Resources/Images/calendar_badge_clock.svg | 0 .../Resources/Images/chevron_left.svg | 0 .../Resources/Images/chevron_right.svg | 0 .../Resources/Images/dotnet_bot.svg | 0 .../Resources/Images/eyeglasses.svg | 0 .../PocketBook/Resources/Images/folder.svg | 0 sources/PocketBook/Resources/Images/gear.svg | 0 sources/PocketBook/Resources/Images/heart.svg | 0 .../Resources/Images/heart_fill.svg | 0 .../PocketBook/Resources/Images/keyboard.svg | 0 .../Resources/Images/listbullet.svg | 0 .../Resources/Images/magnifyingglass.svg | 0 .../PocketBook/Resources/Images/person.svg | 0 .../Resources/Images/person_badge_clock.svg | 0 .../Images/person_badge_clock_fill.svg | 0 .../Resources/Images/person_fill.svg | 0 .../Resources/Images/person_second.svg | 0 .../Resources/Images/person_second_fill.svg | 0 .../Resources/Images/person_three.svg | 0 .../Resources/Images/person_three_fill.svg | 0 sources/PocketBook/Resources/Images/plus.svg | 0 .../Resources/Images/plus_round.svg | 0 .../PocketBook/Resources/Images/sparkles.svg | 0 sources/PocketBook/Resources/Images/star.svg | 0 .../Resources/Images/sunglasses.svg | 0 sources/PocketBook/Resources/Images/tag.svg | 0 .../PocketBook/Resources/Images/tag_fill.svg | 0 .../Resources/Images/text_book_closed.svg | 0 .../Images/text_book_closed_fill.svg | 0 .../Resources/Images/tray_second.svg | 0 .../Resources/Images/tray_second_fill.svg | 0 sources/PocketBook/TousPage.xaml | 138 +++++++++--------- sources/PocketBook/TousPage.xaml.cs | 70 ++------- 70 files changed, 543 insertions(+), 229 deletions(-) rename sources/PocketBook/Resources/Fonts/San-Francisco/San Francisco/.DS_Store => .DS_Store (92%) create mode 100644 sources/.DS_Store create mode 100644 sources/PocketBook/.DS_Store create mode 100644 sources/PocketBook/DatePublic.xaml create mode 100644 sources/PocketBook/DatePublic.xaml.cs create mode 100644 sources/PocketBook/Filtrage.xaml create mode 100644 sources/PocketBook/Filtrage.xaml.cs create mode 100644 sources/PocketBook/Resources/.DS_Store create mode 100644 sources/PocketBook/Resources/Images/.DS_Store mode change 100644 => 100755 sources/PocketBook/Resources/Images/arrow_forward.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/arrows.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/barcode.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/barcode_scan.png mode change 100644 => 100755 sources/PocketBook/Resources/Images/binoculars.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/binoculars_fill.svg create mode 100644 sources/PocketBook/Resources/Images/book.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/book_closed.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/book_closed_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/book_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/bookmark.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/bookmark_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/books_vertical.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/books_vertical_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/buveurencre.jpg mode change 100644 => 100755 sources/PocketBook/Resources/Images/calendar.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/calendar_badge_clock.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/chevron_left.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/chevron_right.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/dotnet_bot.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/eyeglasses.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/folder.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/gear.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/heart.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/heart_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/keyboard.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/listbullet.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/magnifyingglass.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/person.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/person_badge_clock.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/person_badge_clock_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/person_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/person_second.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/person_second_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/person_three.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/person_three_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/plus.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/plus_round.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/sparkles.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/star.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/sunglasses.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/tag.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/tag_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/text_book_closed.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/text_book_closed_fill.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/tray_second.svg mode change 100644 => 100755 sources/PocketBook/Resources/Images/tray_second_fill.svg diff --git a/sources/PocketBook/Resources/Fonts/San-Francisco/San Francisco/.DS_Store b/.DS_Store similarity index 92% rename from sources/PocketBook/Resources/Fonts/San-Francisco/San Francisco/.DS_Store rename to .DS_Store index 5064aae126bc2eb97b64cc1ea9b63e3e241bed15..5d1ff1d8e36c1be10747124700998a60fd8bb96e 100644 GIT binary patch delta 386 zcmZoMXfc@JFUrEez`)4BAi%)j%izkO$B@gA;+eBCaXDi>NQRRk2q@~v;DRihpPZDF zp9GWzY68kJFzEdU10aimft{h4A)ld?p@<=wA(f%nGY3WWdi<)B%8Lu2X78v^D#*z! zE-^5;#>m9X!pg?Z!Op?W5gVM5UmjeNSW;T-lvorE;)Uer=On?{iAiCZspatkBF_1F zC5f4NsYPH7nJKA2B{AWdc`5njPWh#IDaByD!4L@!P7cm^0g38rQ%f@)1tVjFS{;S( zYD*&n9R(9pquN?d4pC)&>!A4ToZP(pF0elt7=fV%2E0%jMs))jXrWLRT$GoSpO+4l QVcZTEc3-P&J=hm zI^jgS;)(j)i0f6j2Dt&-w_JfwihXbeTme_$4=I42&9=By^wAY?1zdq%0scNjIAb!* zit_2eAXfljg|Hare3#&wXqXJMA~LX`r9dqWcEt!ZP}Q4yjU!oaog9vPZG_*$*?3)6 k>`O3_R*bdWim%~fh)13PlVMgw1m-^iB7+aEz>g~M39|Q7y8r+H diff --git a/sources/.DS_Store b/sources/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9666813836fd5819ebd6d3a07a290419c27dc998 GIT binary patch literal 6148 zcmeHKO-~a+7@mP5TPm`A6ftVDu@@5>tSB1d!F9oystJ`PSOQpgyVJU1nW?*5DiV^O z^#}L^`~jX!Jel|hJbLxuAMoNC-}z|xC|rq{eVdu*-S=ZYp6$%+AcU~h^ll=gBZM?4 z98&{O9V6V&OPBO0OCKN>Z4eYA3o-a@bVVnIgn@*Ce~kgYb_Y-iR%{j4?1A-L3|Q3- zm9$6LQ>E)KEEJ+(zI>aiQ=7_w=Uv&h=~kT1H#9U$K@QJ8?6zoN$#t zEio3j9o=!4ebTDvV{?qgj!#J_5`2$9$l7zCdaPx!CiNnbYfFcg*3uPyVrOS&_DRP+wFZNAK+YN{r+c$_tABBX_)q3cA3$<+yuLq7xf(2@^IA)t= zA7;TvE;_IqPSvON-2LB@(R9wdE;SwHIwa@JT3hIvj+ZE-1fojPnKPfLC=E@*zs^Q$ z=rwAi59lNMjJ~1o=ok8f_V6Gc$Jg*A&f^(;7n`_Dt8zLNGQ({sl3?vL3W}sI->iqnFc=G-Ka8mM=Fpx0tUon7F z^Y*+2Q&MMZ*W~zFYe0Dkg$s{sOB5+kspD8E{3xD)A_RN}R{%|gZHZt3Nj?Mw4M~+S IaHoqVb3|m}WLYVp%V>O` z&#^WUU%3vcfG6^C?9oknL(MU5bHOlR7%&VN1`Gp+fxm$P?AhF`oP9sKYkI?gVc@@H zfb)ZmlVvTI!$?Z%Kqn;t37wX7X@&1F%g&3jHyKwt(*9h~5^Ac~jR?`lYmfmKXItg(}CW2JKRtTpW4+ zzNV0sd}NmAiJcUlxjU6|8kn zW{3MtM9`+e=)2{x!Hg&DT=`i$SyA!KB&=P|vG!2-;gyuTj(FWCY+d~oTba>e))E%W z^jK!fqczAA)(p>B0$IsNW_gy`daKRWwBY+-VGRuU@ZCcM`6>RM=Zu!Y#p_1TbA6AqI3vrnAxs5e`oz^PPqEHgB_El!Vr6CN_)(yz zJ}5*U=1Pzc^56fTdK|`qVZbo(=NM3vtBut<{2!&vbSPYF+c;m~i#ND2g + - - - - + + + + diff --git a/sources/PocketBook/Auteur.xaml b/sources/PocketBook/Auteur.xaml index e449401..6a7c99b 100644 --- a/sources/PocketBook/Auteur.xaml +++ b/sources/PocketBook/Auteur.xaml @@ -1,14 +1,69 @@ - + - - - + Title="Auteur" + xmlns:local="clr-namespace:PocketBook" + xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sources/PocketBook/Auteur.xaml.cs b/sources/PocketBook/Auteur.xaml.cs index 093ca89..f1f5f82 100644 --- a/sources/PocketBook/Auteur.xaml.cs +++ b/sources/PocketBook/Auteur.xaml.cs @@ -6,4 +6,9 @@ public partial class Auteur : ContentPage { InitializeComponent(); } + + private async void RetourMainMenu(object sender, EventArgs e) + { + await Navigation.PopToRootAsync(); + } } \ No newline at end of file diff --git a/sources/PocketBook/BookChange.xaml b/sources/PocketBook/BookChange.xaml index aa7bd16..0759396 100644 --- a/sources/PocketBook/BookChange.xaml +++ b/sources/PocketBook/BookChange.xaml @@ -1,10 +1,10 @@ - + - + diff --git a/sources/PocketBook/BookDetail.xaml b/sources/PocketBook/BookDetail.xaml index ad293fb..b9971bd 100644 --- a/sources/PocketBook/BookDetail.xaml +++ b/sources/PocketBook/BookDetail.xaml @@ -1,19 +1,32 @@ - + + xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"> + - - + + + + + + + @@ -29,7 +42,7 @@ @@ -49,7 +62,7 @@ Curabitur tempus erat nec sapien aliquam venenatis. In ornare odio in lacus ornare finibus. Maecenas semper nulla non tortor gravida tincidunt ut ut arcu. Sed magna sem, semper quis justo vitae, lacinia laoreet ex. Curabitur at mauris a velit pharetra fringilla commodo non elit. Quisque sollicitudin, ipsum id dapibus consectetur, sapien tortor mattis lectus, vitae tempor nisl nisl sed ipsum. In in orci nec odio hendrerit posuere a vel libero." Margin="0,10,15,0"/> - + + diff --git a/sources/PocketBook/BookDetail.xaml.cs b/sources/PocketBook/BookDetail.xaml.cs index 5eca7c2..18d411a 100644 --- a/sources/PocketBook/BookDetail.xaml.cs +++ b/sources/PocketBook/BookDetail.xaml.cs @@ -2,23 +2,21 @@ namespace PocketBook; public partial class BookDetail : ContentPage { - public BookDetail(Book book) + public BookDetail() { - InitializeComponent(); - - ToolbarItem item = new ToolbarItem - { - Text = "Add item", - IconImageSource = ImageSource.FromFile("add.png") - }; - this.ToolbarItems.Add(item); - titreBook.Text = book.name; - bookAuteur.Text = book.auteur; + InitializeComponent(); + titreBook.Text = "La horde du contrevent"; + bookAuteur.Text = "Alain Damasio"; bookEdition.Text = "Fayard (2019)"; bookNbPages.Text = "700"; bookISBN.Text = "9854645645456"; - bookLangue.Text = "français"; - bookStatus.Text = book.type; - bookAdd.Text = "15 août 2013"; + bookLangue.Text = "français"; + bookStatus.Text = "Non lu"; + bookAdd.Text = "15 août 2013"; + } + + private async void RetourMainMenu(object sender, EventArgs e) + { + await Navigation.PopAsync(); } } \ No newline at end of file diff --git a/sources/PocketBook/ContentViewBook.xaml b/sources/PocketBook/ContentViewBook.xaml index 0666cfa..8241489 100644 --- a/sources/PocketBook/ContentViewBook.xaml +++ b/sources/PocketBook/ContentViewBook.xaml @@ -1,23 +1,43 @@ - + + x:Class="PocketBook.ContentViewBook" + xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"> - - - - diff --git a/sources/PocketBook/ContentViewFilter.xaml b/sources/PocketBook/ContentViewFilter.xaml index 7ba43b6..09c6896 100644 --- a/sources/PocketBook/ContentViewFilter.xaml +++ b/sources/PocketBook/ContentViewFilter.xaml @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ diff --git a/sources/PocketBook/DatePublic.xaml b/sources/PocketBook/DatePublic.xaml new file mode 100644 index 0000000..c95d533 --- /dev/null +++ b/sources/PocketBook/DatePublic.xaml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sources/PocketBook/DatePublic.xaml.cs b/sources/PocketBook/DatePublic.xaml.cs new file mode 100644 index 0000000..4fa6d98 --- /dev/null +++ b/sources/PocketBook/DatePublic.xaml.cs @@ -0,0 +1,14 @@ +namespace PocketBook; + +public partial class DatePublic : ContentPage +{ + public DatePublic() + { + InitializeComponent(); + } + + private async void RetourMainMenu(object sender, EventArgs e) + { + await Navigation.PopToRootAsync(); + } +} diff --git a/sources/PocketBook/Filtrage.xaml b/sources/PocketBook/Filtrage.xaml new file mode 100644 index 0000000..0dc4ce3 --- /dev/null +++ b/sources/PocketBook/Filtrage.xaml @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/sources/PocketBook/Filtrage.xaml.cs b/sources/PocketBook/Filtrage.xaml.cs new file mode 100644 index 0000000..5bf4b25 --- /dev/null +++ b/sources/PocketBook/Filtrage.xaml.cs @@ -0,0 +1,33 @@ +namespace PocketBook; + +public partial class Filtrage : ContentView +{ + + public static readonly BindableProperty DatanameProperty = + BindableProperty.Create(nameof(Dataname), typeof(string), typeof(Filtrage), string.Empty); + + public static readonly BindableProperty NumberDataProperty = + BindableProperty.Create(nameof(NumberData), typeof(string), typeof(Filtrage), string.Empty); + + + public string Dataname + { + get { return (string)GetValue(DatanameProperty); } + set { SetValue(DatanameProperty, value); } + } + public string NumberData + { + get { return (string)GetValue(NumberDataProperty); } + set { SetValue(NumberDataProperty, value); } + } + + + + public Filtrage() + { + InitializeComponent(); + + dataname.SetBinding(Label.TextProperty, new Binding(nameof(Dataname), source: this)); + numberData.SetBinding(Label.TextProperty, new Binding(nameof(NumberData), source: this)); + } +} diff --git a/sources/PocketBook/MainPage.xaml b/sources/PocketBook/MainPage.xaml index a35e364..e207639 100644 --- a/sources/PocketBook/MainPage.xaml +++ b/sources/PocketBook/MainPage.xaml @@ -13,7 +13,7 @@