From bfaff7bcab9607a5975d5a25acdc433cda72148d Mon Sep 17 00:00:00 2001 From: Corentin LEMAIRE Date: Mon, 8 May 2023 20:00:57 +0200 Subject: [PATCH] Create a Layout ContentView to data bind & Fix incorrect path music issue --- Sources/Linaris/AlbumPage.xaml | 3 ++- Sources/Linaris/FooterPage.xaml.cs | 3 ++- Sources/Linaris/Layout.xaml | 12 ++++++++++++ Sources/Linaris/Layout.xaml.cs | 9 +++++++++ Sources/Linaris/Linaris.csproj | 12 ++++++++++++ Sources/Linaris/LocalFilesPage.xaml | 2 +- Sources/Linaris/MainPage.xaml | 4 ++-- Sources/Linaris/PlaylistPage.xaml | 4 +++- Sources/Linaris/PlaylistsPage.xaml | 2 +- Sources/Linaris/Resources/Musics/winter.mp3 | Bin 0 -> 2923484 bytes Sources/Linaris/Resources/Styles/Styles.xaml | 14 -------------- 11 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 Sources/Linaris/Layout.xaml create mode 100644 Sources/Linaris/Layout.xaml.cs create mode 100644 Sources/Linaris/Resources/Musics/winter.mp3 diff --git a/Sources/Linaris/AlbumPage.xaml b/Sources/Linaris/AlbumPage.xaml index 0cce3f9..9aebfa2 100644 --- a/Sources/Linaris/AlbumPage.xaml +++ b/Sources/Linaris/AlbumPage.xaml @@ -16,7 +16,8 @@ - + + diff --git a/Sources/Linaris/FooterPage.xaml.cs b/Sources/Linaris/FooterPage.xaml.cs index 64b0c9f..18f18ab 100644 --- a/Sources/Linaris/FooterPage.xaml.cs +++ b/Sources/Linaris/FooterPage.xaml.cs @@ -19,7 +19,8 @@ public partial class FooterPage : ContentView // (s,a) = convention, s = sender, a = arguments, si appli fermée, on free tout outputDevice.PlaybackStopped += PlaybackStoppedHandler; - morceauEnCours = "U:\\Utils\\Musics\\peaches.mp3"; + // morceauEnCours = "Musics/peaches.mp3"; + morceauEnCours = Path.Combine(AppContext.BaseDirectory, "Resources", "Musics", "winter.mp3"); audioFile = new AudioFileReader(morceauEnCours); outputDevice.Init(audioFile); } diff --git a/Sources/Linaris/Layout.xaml b/Sources/Linaris/Layout.xaml new file mode 100644 index 0000000..77c37f7 --- /dev/null +++ b/Sources/Linaris/Layout.xaml @@ -0,0 +1,12 @@ + + + + +