From b26c62268530b3652b309d9f2097133f14d43422 Mon Sep 17 00:00:00 2001 From: Corentin LEMAIRE Date: Sat, 10 Jun 2023 09:11:24 +0200 Subject: [PATCH] Fix Doxygen logo size, fix doxygen namespaces mistakes --- Documentation/doxygen/Doxyfile | 2 +- Documentation/doxygen/appicon.png | Bin 0 -> 2973 bytes Sources/Console/Console.csproj | 4 - Sources/Linaris/FooterPage.xaml.cs | 3 +- Sources/Linaris/Linaris.csproj | 3 - Sources/Linaris/LocalFilesPage.xaml.cs | 12 +- Sources/Linaris/PlaylistPage.xaml | 2 +- Sources/Model/Album.cs | 1 - Sources/Model/Artist.cs | 107 +- Sources/Model/CustomTitle.cs | 186 +- Sources/Model/Genre.cs | 13 +- Sources/Model/IDataManager.cs | 835 ++++----- Sources/Model/InfoTitle.cs | 183 +- Sources/Model/Manager.cs | 711 +++---- Sources/Model/Model.csproj | 4 - .../Model/Platforms/Tizen/PlatformClass1.cs | 9 +- Sources/Model/Playlist.cs | 487 ++--- .../Serialization/LINQ_XML_Serialization.cs | 1664 ++++++++--------- Sources/Model/Stub/StubAlbum.cs | 146 +- Sources/Model/Stub/StubArtist.cs | 118 +- Sources/Model/Stub/StubCustomTitle.cs | 133 +- Sources/Model/Stub/StubInfoTitle.cs | 617 +++--- Sources/Model/Stub/StubManager.cs | 1291 ++++++------- Sources/Model/Stub/StubPlaylist.cs | 125 +- Sources/Model/Title.cs | 175 +- Sources/TestUnitaires/TestUnitaires.csproj | 1 - 26 files changed, 3397 insertions(+), 3435 deletions(-) create mode 100644 Documentation/doxygen/appicon.png diff --git a/Documentation/doxygen/Doxyfile b/Documentation/doxygen/Doxyfile index 1608c88..06b6b8e 100644 --- a/Documentation/doxygen/Doxyfile +++ b/Documentation/doxygen/Doxyfile @@ -5,7 +5,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Linaris" PROJECT_NUMBER = 1.0.0 PROJECT_BRIEF = "Music player and manager" -PROJECT_LOGO = appicon.svg +PROJECT_LOGO = appicon.png OUTPUT_DIRECTORY = /docs/doxygen CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO diff --git a/Documentation/doxygen/appicon.png b/Documentation/doxygen/appicon.png new file mode 100644 index 0000000000000000000000000000000000000000..6d0b4f47ce0782fdc9e1552858ea825b063a603c GIT binary patch literal 2973 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 TK3cP^00000NkvXXu0mjf%o3AS literal 0 HcmV?d00001 diff --git a/Sources/Console/Console.csproj b/Sources/Console/Console.csproj index a816ead..b491ec4 100644 --- a/Sources/Console/Console.csproj +++ b/Sources/Console/Console.csproj @@ -13,10 +13,6 @@ - - - - diff --git a/Sources/Linaris/FooterPage.xaml.cs b/Sources/Linaris/FooterPage.xaml.cs index 35ec8da..24959bc 100644 --- a/Sources/Linaris/FooterPage.xaml.cs +++ b/Sources/Linaris/FooterPage.xaml.cs @@ -177,8 +177,7 @@ public partial class FooterPage : ContentView, INotifyPropertyChanged Manager.NextTitle(); Dispatcher.DispatchAsync(() => { - string encodedFilePath = Manager.CurrentPlaying.Path.Replace(" ", "\\ "); - music.Source = encodedFilePath; + music.Source = Manager.CurrentPlaying.Path; Duration = music.Duration.ToString(@"hh\:mm\:ss"); }); } diff --git a/Sources/Linaris/Linaris.csproj b/Sources/Linaris/Linaris.csproj index 5461e41..459ec0d 100644 --- a/Sources/Linaris/Linaris.csproj +++ b/Sources/Linaris/Linaris.csproj @@ -53,9 +53,6 @@ - - - diff --git a/Sources/Linaris/LocalFilesPage.xaml.cs b/Sources/Linaris/LocalFilesPage.xaml.cs index 5c8ea6c..de03277 100644 --- a/Sources/Linaris/LocalFilesPage.xaml.cs +++ b/Sources/Linaris/LocalFilesPage.xaml.cs @@ -1,5 +1,6 @@ using CommunityToolkit.Maui.Views; using Model; +using Model.Stub; using System.Collections.ObjectModel; using System.Diagnostics; @@ -87,11 +88,15 @@ public partial class LocalFilesPage : ContentPage return; } - if (sender is Button button) + foreach (var result in results) { - foreach (var result in results) + string path = Path.Combine(FileSystem.Current.AppDataDirectory, "customs"); + if (!Path.Exists(path)) Directory.CreateDirectory(path); + string fullPath = Path.Combine(path, result.FileName); + if (!File.Exists(fullPath)) { - CustomTitle custom = new (result.FileName, "none.png", "", result.FullPath); + File.Copy(result.FullPath, fullPath); + CustomTitle custom = new(result.FileName, "none.png", "", fullPath); if (!IsCustomTitleInCollection(custom)) { AddCustomTitle(custom); @@ -149,6 +154,7 @@ public partial class LocalFilesPage : ContentPage { (Application.Current as App).Manager.RemoveCustomTitle(titleToRemove); customTitles.Remove(titleToRemove); + File.Delete(titleToRemove.Path); } } } diff --git a/Sources/Linaris/PlaylistPage.xaml b/Sources/Linaris/PlaylistPage.xaml index 17ec576..2d01fb5 100644 --- a/Sources/Linaris/PlaylistPage.xaml +++ b/Sources/Linaris/PlaylistPage.xaml @@ -36,7 +36,7 @@ -