From bc1518d906649d606bdbba8a1a279c38cb06a918 Mon Sep 17 00:00:00 2001 From: Alexis DRAI Date: Sat, 20 May 2023 12:37:26 +0200 Subject: [PATCH 1/7] :truck: Reassign concerns properly --- AMC.View/Converters/AlbumDetailsConverter.cs | 22 ------------------- AMC.View/Converters/CopyrightInfoConverter.cs | 22 ------------------- .../Resources/Strings/Strings.Designer.cs | 9 ++++++++ AMC.View/Resources/Strings/Strings.resx | 4 ++++ AMC.View/Views/AlbumPage.xaml | 10 ++++----- 5 files changed, 17 insertions(+), 50 deletions(-) delete mode 100644 AMC.View/Converters/AlbumDetailsConverter.cs delete mode 100644 AMC.View/Converters/CopyrightInfoConverter.cs diff --git a/AMC.View/Converters/AlbumDetailsConverter.cs b/AMC.View/Converters/AlbumDetailsConverter.cs deleted file mode 100644 index 5e80d87..0000000 --- a/AMC.View/Converters/AlbumDetailsConverter.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Globalization; - -namespace AMC.View.Converters -{ - public class AlbumDetailsConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - var (genre, year) = (ValueTuple)value; - return string.Format( - "{0} · {1}", - genre, - year - ); - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} diff --git a/AMC.View/Converters/CopyrightInfoConverter.cs b/AMC.View/Converters/CopyrightInfoConverter.cs deleted file mode 100644 index bd7c993..0000000 --- a/AMC.View/Converters/CopyrightInfoConverter.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Globalization; - -namespace AMC.View.Converters -{ - public class CopyrightInfoConverter : IValueConverter - { - public object Convert(object value, Type targetType, object parameter, CultureInfo culture) - { - var (copyrightYear, producerBlurb) = (ValueTuple)value; - return string.Format( - "℗ {0} {1}", - copyrightYear, - producerBlurb - ); - } - - public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) - { - throw new NotImplementedException(); - } - } -} diff --git a/AMC.View/Resources/Strings/Strings.Designer.cs b/AMC.View/Resources/Strings/Strings.Designer.cs index 270fee9..2bbe9b7 100644 --- a/AMC.View/Resources/Strings/Strings.Designer.cs +++ b/AMC.View/Resources/Strings/Strings.Designer.cs @@ -87,6 +87,15 @@ namespace AMC.View.Resources.Strings { } } + /// + /// Looks up a localized string similar to ···. + /// + public static string HThreeDotsMenu { + get { + return ResourceManager.GetString("HThreeDotsMenu", resourceCulture); + } + } + /// /// Looks up a localized string similar to Library. /// diff --git a/AMC.View/Resources/Strings/Strings.resx b/AMC.View/Resources/Strings/Strings.resx index 3b063b4..1cf11f5 100644 --- a/AMC.View/Resources/Strings/Strings.resx +++ b/AMC.View/Resources/Strings/Strings.resx @@ -156,4 +156,8 @@ Genres + + ··· + @Invariant + \ No newline at end of file diff --git a/AMC.View/Views/AlbumPage.xaml b/AMC.View/Views/AlbumPage.xaml index 27fc5d5..94dd153 100644 --- a/AMC.View/Views/AlbumPage.xaml +++ b/AMC.View/Views/AlbumPage.xaml @@ -10,8 +10,6 @@ - - @@ -19,7 +17,7 @@ - + @@ -56,7 +54,7 @@ - -- 2.36.3 From 3cd13d9bf5d2f303b1a3d8af0a0f78bd525f344a Mon Sep 17 00:00:00 2001 From: Alexis DRAI Date: Sat, 20 May 2023 14:43:24 +0200 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=AA=84=20=F0=9F=94=A5=20Remove=20magi?= =?UTF-8?q?c=20numbers=20from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMC.View/AMC.View.csproj | 3 + AMC.View/App.xaml | 1 + AMC.View/Controls/LibraryCategoryItem.xaml | 16 ++--- AMC.View/Resources/Styles/Styles.xaml | 9 ++- AMC.View/Resources/Styles/Values.xaml | 33 ++++++++++ AMC.View/Views/AlbumPage.xaml | 73 ++++++++++------------ AMC.View/Views/LibraryPage.xaml | 70 +++++++++------------ 7 files changed, 117 insertions(+), 88 deletions(-) create mode 100644 AMC.View/Resources/Styles/Values.xaml diff --git a/AMC.View/AMC.View.csproj b/AMC.View/AMC.View.csproj index 8eb9a2b..e673ece 100644 --- a/AMC.View/AMC.View.csproj +++ b/AMC.View/AMC.View.csproj @@ -86,6 +86,9 @@ + + MSBuild:Compile + MSBuild:Compile diff --git a/AMC.View/App.xaml b/AMC.View/App.xaml index 00e4332..de825a6 100644 --- a/AMC.View/App.xaml +++ b/AMC.View/App.xaml @@ -8,6 +8,7 @@ + diff --git a/AMC.View/Controls/LibraryCategoryItem.xaml b/AMC.View/Controls/LibraryCategoryItem.xaml index 25a7156..8e15dca 100644 --- a/AMC.View/Controls/LibraryCategoryItem.xaml +++ b/AMC.View/Controls/LibraryCategoryItem.xaml @@ -4,21 +4,21 @@ x:Class="AMC.View.Controls.LibraryCategoryItem"> diff --git a/AMC.View/Resources/Styles/Styles.xaml b/AMC.View/Resources/Styles/Styles.xaml index a0904b6..807ac50 100644 --- a/AMC.View/Resources/Styles/Styles.xaml +++ b/AMC.View/Resources/Styles/Styles.xaml @@ -8,7 +8,14 @@ - + + + + + +