From c56e47c4b8704bba08293201f451a44f219034b0 Mon Sep 17 00:00:00 2001 From: luevard Date: Sun, 17 Sep 2023 19:44:50 +0200 Subject: [PATCH] =?UTF-8?q?:lipstick:=20Ordonnancement=20de=20fichier,=20m?= =?UTF-8?q?ise=20en=20place=20des=20styles=20et=20des=20colors,=20ajout=20?= =?UTF-8?q?des=20derni=C3=A8res=20pages,=20changement=20de=20logo=20pour?= =?UTF-8?q?=20le=20calendrier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources/PocketBook/Auteur.xaml | 69 ----------- sources/PocketBook/BookDetail.xaml | 108 ----------------- sources/PocketBook/ContentViewBook.xaml | 43 ------- sources/PocketBook/MainPage.xaml | 66 ---------- sources/PocketBook/MainPage.xaml.cs | 24 ---- sources/PocketBook/Pages/Auteur.xaml | 61 ++++++++++ sources/PocketBook/{ => Pages}/Auteur.xaml.cs | 0 sources/PocketBook/Pages/BookDetail.xaml | 105 ++++++++++++++++ .../PocketBook/{ => Pages}/BookDetail.xaml.cs | 0 .../Composants/ContentView}/BookChange.xaml | 23 ++-- .../ContentView}/BookChange.xaml.cs | 58 ++++----- .../ContentView/ContentViewBook.xaml | 20 +++ .../ContentView}/ContentViewBook.xaml.cs | 0 .../ContentView}/ContentViewFilter.xaml | 4 +- .../ContentView}/ContentViewFilter.xaml.cs | 0 .../Composants/ContentView}/Filtrage.xaml | 2 +- .../Composants/ContentView}/Filtrage.xaml.cs | 0 .../Pages/Composants/ContentView/Stars.xaml | 14 +++ .../Composants/ContentView/Stars.xaml.cs | 53 ++++++++ .../Composants/ContentView/TitledAuthor.xaml | 8 ++ .../ContentView/TitledAuthor.xaml.cs | 20 +++ .../{ => Pages/Composants/Popup}/AddBook.xaml | 19 ++- .../Composants/Popup}/AddBook.xaml.cs | 20 +-- .../PocketBook/{ => Pages}/DatePublic.xaml | 34 +++--- .../PocketBook/{ => Pages}/DatePublic.xaml.cs | 0 sources/PocketBook/Pages/LaterPage.xaml | 64 ++++++++++ sources/PocketBook/Pages/LaterPage.xaml.cs | 21 ++++ sources/PocketBook/Pages/LikePage.xaml | 64 ++++++++++ sources/PocketBook/Pages/LikePage.xaml.cs | 21 ++++ sources/PocketBook/Pages/MainPage.xaml | 95 +++++++++++++++ sources/PocketBook/Pages/MainPage.xaml.cs | 47 ++++++++ sources/PocketBook/Pages/MarkPage.xaml | 47 ++++++++ sources/PocketBook/Pages/MarkPage.xaml.cs | 21 ++++ sources/PocketBook/Pages/SharePage.xaml | 53 ++++++++ sources/PocketBook/Pages/SharePage.xaml.cs | 20 +++ sources/PocketBook/Pages/StatutPage.xaml | 65 ++++++++++ sources/PocketBook/Pages/StatutPage.xaml.cs | 22 ++++ sources/PocketBook/Pages/TousPage.xaml | 99 +++++++++++++++ .../PocketBook/{ => Pages}/TousPage.xaml.cs | 36 +++--- sources/PocketBook/PocketBook.csproj | 47 ++++++-- sources/PocketBook/Resources/Images/cal.png | Bin 0 -> 170 bytes .../PocketBook/Resources/Images/calendar.svg | 20 --- .../PocketBook/Resources/Styles/Colors.xaml | 7 ++ .../PocketBook/Resources/Styles/Styles.xaml | 114 ++++++++++++++++++ sources/PocketBook/TousPage.xaml | 83 ------------- 45 files changed, 1173 insertions(+), 524 deletions(-) delete mode 100644 sources/PocketBook/Auteur.xaml delete mode 100644 sources/PocketBook/BookDetail.xaml delete mode 100644 sources/PocketBook/ContentViewBook.xaml delete mode 100644 sources/PocketBook/MainPage.xaml delete mode 100644 sources/PocketBook/MainPage.xaml.cs create mode 100644 sources/PocketBook/Pages/Auteur.xaml rename sources/PocketBook/{ => Pages}/Auteur.xaml.cs (100%) create mode 100644 sources/PocketBook/Pages/BookDetail.xaml rename sources/PocketBook/{ => Pages}/BookDetail.xaml.cs (100%) rename sources/PocketBook/{ => Pages/Composants/ContentView}/BookChange.xaml (98%) rename sources/PocketBook/{ => Pages/Composants/ContentView}/BookChange.xaml.cs (97%) create mode 100644 sources/PocketBook/Pages/Composants/ContentView/ContentViewBook.xaml rename sources/PocketBook/{ => Pages/Composants/ContentView}/ContentViewBook.xaml.cs (100%) rename sources/PocketBook/{ => Pages/Composants/ContentView}/ContentViewFilter.xaml (80%) rename sources/PocketBook/{ => Pages/Composants/ContentView}/ContentViewFilter.xaml.cs (100%) rename sources/PocketBook/{ => Pages/Composants/ContentView}/Filtrage.xaml (94%) rename sources/PocketBook/{ => Pages/Composants/ContentView}/Filtrage.xaml.cs (100%) create mode 100644 sources/PocketBook/Pages/Composants/ContentView/Stars.xaml create mode 100644 sources/PocketBook/Pages/Composants/ContentView/Stars.xaml.cs create mode 100644 sources/PocketBook/Pages/Composants/ContentView/TitledAuthor.xaml create mode 100644 sources/PocketBook/Pages/Composants/ContentView/TitledAuthor.xaml.cs rename sources/PocketBook/{ => Pages/Composants/Popup}/AddBook.xaml (62%) rename sources/PocketBook/{ => Pages/Composants/Popup}/AddBook.xaml.cs (93%) rename sources/PocketBook/{ => Pages}/DatePublic.xaml (61%) rename sources/PocketBook/{ => Pages}/DatePublic.xaml.cs (100%) create mode 100644 sources/PocketBook/Pages/LaterPage.xaml create mode 100644 sources/PocketBook/Pages/LaterPage.xaml.cs create mode 100644 sources/PocketBook/Pages/LikePage.xaml create mode 100644 sources/PocketBook/Pages/LikePage.xaml.cs create mode 100644 sources/PocketBook/Pages/MainPage.xaml create mode 100644 sources/PocketBook/Pages/MainPage.xaml.cs create mode 100644 sources/PocketBook/Pages/MarkPage.xaml create mode 100644 sources/PocketBook/Pages/MarkPage.xaml.cs create mode 100644 sources/PocketBook/Pages/SharePage.xaml create mode 100644 sources/PocketBook/Pages/SharePage.xaml.cs create mode 100644 sources/PocketBook/Pages/StatutPage.xaml create mode 100644 sources/PocketBook/Pages/StatutPage.xaml.cs create mode 100644 sources/PocketBook/Pages/TousPage.xaml rename sources/PocketBook/{ => Pages}/TousPage.xaml.cs (96%) create mode 100644 sources/PocketBook/Resources/Images/cal.png delete mode 100755 sources/PocketBook/Resources/Images/calendar.svg delete mode 100644 sources/PocketBook/TousPage.xaml diff --git a/sources/PocketBook/Auteur.xaml b/sources/PocketBook/Auteur.xaml deleted file mode 100644 index 6a7c99b..0000000 --- a/sources/PocketBook/Auteur.xaml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sources/PocketBook/BookDetail.xaml b/sources/PocketBook/BookDetail.xaml deleted file mode 100644 index b9971bd..0000000 --- a/sources/PocketBook/BookDetail.xaml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sources/PocketBook/ContentViewBook.xaml b/sources/PocketBook/ContentViewBook.xaml deleted file mode 100644 index 8241489..0000000 --- a/sources/PocketBook/ContentViewBook.xaml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - diff --git a/sources/PocketBook/MainPage.xaml b/sources/PocketBook/MainPage.xaml deleted file mode 100644 index e207639..0000000 --- a/sources/PocketBook/MainPage.xaml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - diff --git a/sources/PocketBook/MainPage.xaml.cs b/sources/PocketBook/MainPage.xaml.cs deleted file mode 100644 index aa64cc6..0000000 --- a/sources/PocketBook/MainPage.xaml.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace PocketBook; - -public partial class MainPage : ContentPage -{ - public MainPage() - { - InitializeComponent(); - } - - private async void OnContentViewFilterTappedTous(object sender, EventArgs e) - { - await Navigation.PushAsync(new TousPage()); - } - private async void OnContentViewFilterTappedAuteur(object sender, EventArgs e) - { - await Navigation.PushAsync(new Auteur()); - } - - private async void OnContentViewFilterTappedDate(object sender,EventArgs e) - { - await Navigation.PushAsync(new DatePublic()); - } -} - diff --git a/sources/PocketBook/Pages/Auteur.xaml b/sources/PocketBook/Pages/Auteur.xaml new file mode 100644 index 0000000..602985b --- /dev/null +++ b/sources/PocketBook/Pages/Auteur.xaml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sources/PocketBook/Auteur.xaml.cs b/sources/PocketBook/Pages/Auteur.xaml.cs similarity index 100% rename from sources/PocketBook/Auteur.xaml.cs rename to sources/PocketBook/Pages/Auteur.xaml.cs diff --git a/sources/PocketBook/Pages/BookDetail.xaml b/sources/PocketBook/Pages/BookDetail.xaml new file mode 100644 index 0000000..db0d46b --- /dev/null +++ b/sources/PocketBook/Pages/BookDetail.xaml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sources/PocketBook/BookDetail.xaml.cs b/sources/PocketBook/Pages/BookDetail.xaml.cs similarity index 100% rename from sources/PocketBook/BookDetail.xaml.cs rename to sources/PocketBook/Pages/BookDetail.xaml.cs diff --git a/sources/PocketBook/BookChange.xaml b/sources/PocketBook/Pages/Composants/ContentView/BookChange.xaml similarity index 98% rename from sources/PocketBook/BookChange.xaml rename to sources/PocketBook/Pages/Composants/ContentView/BookChange.xaml index 0759396..a14875a 100644 --- a/sources/PocketBook/BookChange.xaml +++ b/sources/PocketBook/Pages/Composants/ContentView/BookChange.xaml @@ -1,14 +1,15 @@ - - - - + + + + + - - - + + + diff --git a/sources/PocketBook/BookChange.xaml.cs b/sources/PocketBook/Pages/Composants/ContentView/BookChange.xaml.cs similarity index 97% rename from sources/PocketBook/BookChange.xaml.cs rename to sources/PocketBook/Pages/Composants/ContentView/BookChange.xaml.cs index e6a704c..583fc20 100644 --- a/sources/PocketBook/BookChange.xaml.cs +++ b/sources/PocketBook/Pages/Composants/ContentView/BookChange.xaml.cs @@ -1,30 +1,30 @@ -namespace PocketBook; - -public partial class BookChange : ContentView -{ - - public static readonly BindableProperty ImageNameProperty= - BindableProperty.Create(nameof(ImageName), typeof(string), typeof(BookChange), string.Empty); - - public static readonly BindableProperty PropertyNameProperty = - BindableProperty.Create(nameof(PropertyName), typeof(string), typeof(BookChange), string.Empty); - - public string ImageName - { - get { return (string)GetValue(ImageNameProperty); } - set { SetValue(ImageNameProperty, value); } - } - - public string PropertyName - { - get { return (string)GetValue(PropertyNameProperty); } - set { SetValue(PropertyNameProperty, value); } - } - - public BookChange() - { - InitializeComponent(); - imageName.SetBinding(Image.SourceProperty, new Binding(nameof(ImageName), source: this)); - propertyName.SetBinding(Label.TextProperty, new Binding(nameof(PropertyName), source: this)); - } +namespace PocketBook; + +public partial class BookChange : ContentView +{ + + public static readonly BindableProperty ImageNameProperty= + BindableProperty.Create(nameof(ImageName), typeof(string), typeof(BookChange), string.Empty); + + public static readonly BindableProperty PropertyNameProperty = + BindableProperty.Create(nameof(PropertyName), typeof(string), typeof(BookChange), string.Empty); + + public string ImageName + { + get { return (string)GetValue(ImageNameProperty); } + set { SetValue(ImageNameProperty, value); } + } + + public string PropertyName + { + get { return (string)GetValue(PropertyNameProperty); } + set { SetValue(PropertyNameProperty, value); } + } + + public BookChange() + { + InitializeComponent(); + imageName.SetBinding(Image.SourceProperty, new Binding(nameof(ImageName), source: this)); + propertyName.SetBinding(Label.TextProperty, new Binding(nameof(PropertyName), source: this)); + } } \ No newline at end of file diff --git a/sources/PocketBook/Pages/Composants/ContentView/ContentViewBook.xaml b/sources/PocketBook/Pages/Composants/ContentView/ContentViewBook.xaml new file mode 100644 index 0000000..270dcd8 --- /dev/null +++ b/sources/PocketBook/Pages/Composants/ContentView/ContentViewBook.xaml @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/sources/PocketBook/ContentViewBook.xaml.cs b/sources/PocketBook/Pages/Composants/ContentView/ContentViewBook.xaml.cs similarity index 100% rename from sources/PocketBook/ContentViewBook.xaml.cs rename to sources/PocketBook/Pages/Composants/ContentView/ContentViewBook.xaml.cs diff --git a/sources/PocketBook/ContentViewFilter.xaml b/sources/PocketBook/Pages/Composants/ContentView/ContentViewFilter.xaml similarity index 80% rename from sources/PocketBook/ContentViewFilter.xaml rename to sources/PocketBook/Pages/Composants/ContentView/ContentViewFilter.xaml index 09c6896..260d84e 100644 --- a/sources/PocketBook/ContentViewFilter.xaml +++ b/sources/PocketBook/Pages/Composants/ContentView/ContentViewFilter.xaml @@ -3,10 +3,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="PocketBook.ContentViewFilter"> - + diff --git a/sources/PocketBook/ContentViewFilter.xaml.cs b/sources/PocketBook/Pages/Composants/ContentView/ContentViewFilter.xaml.cs similarity index 100% rename from sources/PocketBook/ContentViewFilter.xaml.cs rename to sources/PocketBook/Pages/Composants/ContentView/ContentViewFilter.xaml.cs diff --git a/sources/PocketBook/Filtrage.xaml b/sources/PocketBook/Pages/Composants/ContentView/Filtrage.xaml similarity index 94% rename from sources/PocketBook/Filtrage.xaml rename to sources/PocketBook/Pages/Composants/ContentView/Filtrage.xaml index 0dc4ce3..2995aaa 100644 --- a/sources/PocketBook/Filtrage.xaml +++ b/sources/PocketBook/Pages/Composants/ContentView/Filtrage.xaml @@ -11,7 +11,7 @@