From 552a7745b7a7ce5bfdb2f3e2d7818e946954e7aa Mon Sep 17 00:00:00 2001 From: Alexis Drai Date: Fri, 19 May 2023 21:12:21 +0200 Subject: [PATCH] :lipstick: Create "detail" View (#1) The view for an individual album. To make sure that we could do it, and to allow for more sophisticated manual testing, we also created a basic Model, and a basic ViewModel. Co-authored-by: Alexis DRAI Reviewed-on: https://codefirst.iut.uca.fr/git/alexis.drai/AD_MAUI/pulls/1 --- AD_MAUI.sln | 14 +- AD_MAUI/App.xaml.cs | 11 - AD_MAUI/AppShell.xaml.cs | 9 - AD_MAUI/MainPage.xaml | 41 - AD_MAUI/MainPage.xaml.cs | 24 - AD_MAUI/MauiProgram.cs | 24 - AD_MAUI/Platforms/Android/MainApplication.cs | 15 - AD_MAUI/Platforms/MacCatalyst/Program.cs | 15 - AD_MAUI/Platforms/Windows/App.xaml.cs | 24 - AD_MAUI/Platforms/iOS/Program.cs | 15 - AD_MAUI/Resources/Images/dotnet_bot.svg | 93 - AMC.Model/AMC.Model.csproj | 9 + AMC.Model/Models/Album.cs | 17 + AMC.Model/Models/Song.cs | 9 + .../AMC.View.csproj | 39 +- {AD_MAUI => AMC.View}/App.xaml | 4 +- AMC.View/App.xaml.cs | 23 + {AD_MAUI => AMC.View}/AppShell.xaml | 4 +- AMC.View/AppShell.xaml.cs | 9 + AMC.View/Converters/AlbumDetailsConverter.cs | 22 + AMC.View/Converters/CopyrightInfoConverter.cs | 22 + AMC.View/Converters/SongsInfoConverter.cs | 27 + AMC.View/MainPage.xaml | 12 + AMC.View/MainPage.xaml.cs | 20 + AMC.View/MauiProgram.cs | 24 + .../Platforms/Android/AndroidManifest.xml | 0 .../Platforms/Android/MainActivity.cs | 3 +- AMC.View/Platforms/Android/MainApplication.cs | 15 + .../Android/Resources/values/colors.xml | 0 .../Platforms/MacCatalyst/AppDelegate.cs | 4 +- .../Platforms/MacCatalyst/Info.plist | 0 AMC.View/Platforms/MacCatalyst/Program.cs | 14 + {AD_MAUI => AMC.View}/Platforms/Tizen/Main.cs | 2 +- .../Platforms/Tizen/tizen-manifest.xml | 2 +- .../Platforms/Windows/App.xaml | 4 +- AMC.View/Platforms/Windows/App.xaml.cs | 22 + .../Platforms/Windows/Package.appxmanifest | 0 .../Platforms/Windows/app.manifest | 2 +- .../Platforms/iOS/AppDelegate.cs | 4 +- .../Platforms/iOS/Info.plist | 0 AMC.View/Platforms/iOS/Program.cs | 14 + .../Properties/launchSettings.json | 0 .../Resources/AppIcon/appicon.svg | 0 .../Resources/AppIcon/appiconfg.svg | 0 .../Resources/Fonts/OpenSans-Regular.ttf | Bin .../Resources/Fonts/OpenSans-Semibold.ttf | Bin AMC.View/Resources/Images/macroblank.svg | 1788 +++++++++++++++++ .../Resources/Raw/AboutAssets.txt | 0 .../Resources/Splash/splash.svg | 0 .../Resources/Strings/Strings.Designer.cs | 126 ++ AMC.View/Resources/Strings/Strings.fr.resx | 141 ++ AMC.View/Resources/Strings/Strings.resx | 141 ++ .../Resources/Styles/Colors.xaml | 35 +- .../Resources/Styles/Styles.xaml | 14 +- AMC.View/Views/AlbumPage.xaml | 140 ++ AMC.View/Views/AlbumPage.xaml.cs | 17 + AMC.ViewModel/AMC.ViewModel.csproj | 13 + AMC.ViewModel/ViewModels/AlbumViewModel.cs | 77 + AMC.ViewModel/ViewModels/SongViewModel.cs | 24 + 59 files changed, 2813 insertions(+), 315 deletions(-) delete mode 100644 AD_MAUI/App.xaml.cs delete mode 100644 AD_MAUI/AppShell.xaml.cs delete mode 100644 AD_MAUI/MainPage.xaml delete mode 100644 AD_MAUI/MainPage.xaml.cs delete mode 100644 AD_MAUI/MauiProgram.cs delete mode 100644 AD_MAUI/Platforms/Android/MainApplication.cs delete mode 100644 AD_MAUI/Platforms/MacCatalyst/Program.cs delete mode 100644 AD_MAUI/Platforms/Windows/App.xaml.cs delete mode 100644 AD_MAUI/Platforms/iOS/Program.cs delete mode 100644 AD_MAUI/Resources/Images/dotnet_bot.svg create mode 100644 AMC.Model/AMC.Model.csproj create mode 100644 AMC.Model/Models/Album.cs create mode 100644 AMC.Model/Models/Song.cs rename AD_MAUI/AD_MAUI.csproj => AMC.View/AMC.View.csproj (70%) rename {AD_MAUI => AMC.View}/App.xaml (86%) create mode 100644 AMC.View/App.xaml.cs rename {AD_MAUI => AMC.View}/AppShell.xaml (82%) create mode 100644 AMC.View/AppShell.xaml.cs create mode 100644 AMC.View/Converters/AlbumDetailsConverter.cs create mode 100644 AMC.View/Converters/CopyrightInfoConverter.cs create mode 100644 AMC.View/Converters/SongsInfoConverter.cs create mode 100644 AMC.View/MainPage.xaml create mode 100644 AMC.View/MainPage.xaml.cs create mode 100644 AMC.View/MauiProgram.cs rename {AD_MAUI => AMC.View}/Platforms/Android/AndroidManifest.xml (100%) rename {AD_MAUI => AMC.View}/Platforms/Android/MainActivity.cs (90%) create mode 100644 AMC.View/Platforms/Android/MainApplication.cs rename {AD_MAUI => AMC.View}/Platforms/Android/Resources/values/colors.xml (100%) rename {AD_MAUI => AMC.View}/Platforms/MacCatalyst/AppDelegate.cs (51%) rename {AD_MAUI => AMC.View}/Platforms/MacCatalyst/Info.plist (100%) create mode 100644 AMC.View/Platforms/MacCatalyst/Program.cs rename {AD_MAUI => AMC.View}/Platforms/Tizen/Main.cs (92%) rename {AD_MAUI => AMC.View}/Platforms/Tizen/tizen-manifest.xml (84%) rename {AD_MAUI => AMC.View}/Platforms/Windows/App.xaml (75%) create mode 100644 AMC.View/Platforms/Windows/App.xaml.cs rename {AD_MAUI => AMC.View}/Platforms/Windows/Package.appxmanifest (100%) rename {AD_MAUI => AMC.View}/Platforms/Windows/app.manifest (90%) rename {AD_MAUI => AMC.View}/Platforms/iOS/AppDelegate.cs (51%) rename {AD_MAUI => AMC.View}/Platforms/iOS/Info.plist (100%) create mode 100644 AMC.View/Platforms/iOS/Program.cs rename {AD_MAUI => AMC.View}/Properties/launchSettings.json (100%) rename {AD_MAUI => AMC.View}/Resources/AppIcon/appicon.svg (100%) rename {AD_MAUI => AMC.View}/Resources/AppIcon/appiconfg.svg (100%) rename {AD_MAUI => AMC.View}/Resources/Fonts/OpenSans-Regular.ttf (100%) rename {AD_MAUI => AMC.View}/Resources/Fonts/OpenSans-Semibold.ttf (100%) create mode 100644 AMC.View/Resources/Images/macroblank.svg rename {AD_MAUI => AMC.View}/Resources/Raw/AboutAssets.txt (100%) rename {AD_MAUI => AMC.View}/Resources/Splash/splash.svg (100%) create mode 100644 AMC.View/Resources/Strings/Strings.Designer.cs create mode 100644 AMC.View/Resources/Strings/Strings.fr.resx create mode 100644 AMC.View/Resources/Strings/Strings.resx rename {AD_MAUI => AMC.View}/Resources/Styles/Colors.xaml (63%) rename {AD_MAUI => AMC.View}/Resources/Styles/Styles.xaml (97%) create mode 100644 AMC.View/Views/AlbumPage.xaml create mode 100644 AMC.View/Views/AlbumPage.xaml.cs create mode 100644 AMC.ViewModel/AMC.ViewModel.csproj create mode 100644 AMC.ViewModel/ViewModels/AlbumViewModel.cs create mode 100644 AMC.ViewModel/ViewModels/SongViewModel.cs diff --git a/AD_MAUI.sln b/AD_MAUI.sln index fe49081..89a16ca 100644 --- a/AD_MAUI.sln +++ b/AD_MAUI.sln @@ -3,7 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31611.283 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AD_MAUI", "AD_MAUI\AD_MAUI.csproj", "{75950E63-4D00-4240-91D9-F4D494878A3B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AMC.View", "AMC.View\AMC.View.csproj", "{75950E63-4D00-4240-91D9-F4D494878A3B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AMC.Model", "AMC.Model\AMC.Model.csproj", "{44F42419-C6A9-4926-AB9D-5BDD3786AFB3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AMC.ViewModel", "AMC.ViewModel\AMC.ViewModel.csproj", "{9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,6 +21,14 @@ Global {75950E63-4D00-4240-91D9-F4D494878A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU {75950E63-4D00-4240-91D9-F4D494878A3B}.Release|Any CPU.Build.0 = Release|Any CPU {75950E63-4D00-4240-91D9-F4D494878A3B}.Release|Any CPU.Deploy.0 = Release|Any CPU + {44F42419-C6A9-4926-AB9D-5BDD3786AFB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44F42419-C6A9-4926-AB9D-5BDD3786AFB3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44F42419-C6A9-4926-AB9D-5BDD3786AFB3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44F42419-C6A9-4926-AB9D-5BDD3786AFB3}.Release|Any CPU.Build.0 = Release|Any CPU + {9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9A019CC9-CDD5-4A2A-A0D1-CBEB8B797A8D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AD_MAUI/App.xaml.cs b/AD_MAUI/App.xaml.cs deleted file mode 100644 index ccd173d..0000000 --- a/AD_MAUI/App.xaml.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace AD_MAUI; - -public partial class App : Application -{ - public App() - { - InitializeComponent(); - - MainPage = new AppShell(); - } -} diff --git a/AD_MAUI/AppShell.xaml.cs b/AD_MAUI/AppShell.xaml.cs deleted file mode 100644 index 40fb3e8..0000000 --- a/AD_MAUI/AppShell.xaml.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace AD_MAUI; - -public partial class AppShell : Shell -{ - public AppShell() - { - InitializeComponent(); - } -} diff --git a/AD_MAUI/MainPage.xaml b/AD_MAUI/MainPage.xaml deleted file mode 100644 index ace5584..0000000 --- a/AD_MAUI/MainPage.xaml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - -