Fix tests issues
continuous-integration/drone/push Build is passing Details

pull/24/head
Corentin LEMAIRE 2 years ago
parent c4d02be9c0
commit acce913c33

@ -13,6 +13,10 @@
<None Remove="xml\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Plugin.Maui.Audio" Version="1.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Model\Model.csproj" />
</ItemGroup>

@ -5,7 +5,7 @@ namespace Linaris;
public partial class App : Application
{
public Manager Manager = new(new LinqXmlSerialization());
public Manager Manager = new(new LinqXmlSerialization(Path.Combine(FileSystem.Current.AppDataDirectory, "Data")));
public App()
{

@ -104,12 +104,16 @@
</ItemGroup>
<ItemGroup>
<None Update="Resources\Musics\peaches.mp3">
<None Update="Resources\Raw\peaches.mp3">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Resources\Musics\winter.mp3">
<None Update="Resources\Raw\winter.mp3">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\Musics\" />
</ItemGroup>
</Project>

@ -6,8 +6,6 @@ namespace Linaris;
public partial class MainPage : ContentPage
{
private readonly IAudioManager audioManager;
private readonly ObservableCollection<Album> albums = (Application.Current as App).Manager.GetAlbums();
public ObservableCollection<Album> Albums
@ -15,11 +13,10 @@ public partial class MainPage : ContentPage
get => albums;
}
public MainPage(IAudioManager audioManager)
public MainPage()
{
InitializeComponent();
BindingContext = this;
this.audioManager = audioManager;
}
async void GoToAlbum(object sender, EventArgs e)
@ -34,21 +31,22 @@ public partial class MainPage : ContentPage
}
}
public void PlayAudio(string path)
public async void PlayAudio(string path)
{
using (var stream = File.OpenRead(path))
var audioPlayer = AudioManager.Current.CreatePlayer(await FileSystem.OpenAppPackageFileAsync("peaches.mp3"));
audioPlayer.Play();
/*using (var stream = File.OpenRead(path))
{
var audioPlayer = audioManager.CreatePlayer(stream);
audioPlayer.Volume = 1.0f;
audioPlayer = audioManager.CreatePlayer(stream);
audioPlayer.Play();
}
}*/
}
public void play(object sender, EventArgs e)
{
string CurrentPath = (Application.Current as App).Manager.CurrentPlaying.Path;
if (CurrentPath == null) return;
PlayAudio(CurrentPath);
/*string CurrentPath = (Application.Current as App).Manager.CurrentPlaying.Path;
if (CurrentPath == null) return;*/
PlayAudio("");
/*string url = ((FileImageSource)Play.Source).File;*/
/*if (url == "play.png")
{

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net7.0;net7.0-android</TargetFrameworks>
@ -19,4 +19,8 @@
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Plugin.Maui.Audio" Version="1.0.0" />
</ItemGroup>
</Project>

@ -7,11 +7,11 @@ namespace Model.Serialization;
public class LinqXmlSerialization : IDataManager
{
private static string XMLPATH = Path.Combine(FileSystem.Current.AppDataDirectory, "Data");
private string XMLPATH;
private static string XMLFILEPLAYLISTS = Path.Combine(XMLPATH, "playlists.xml");
private string XMLFILEPLAYLISTS;
private static string XMLFILECUSTOMS = Path.Combine(XMLPATH, "customs.xml");
private string XMLFILECUSTOMS;
private StubInfoTitle stubInfoTitle = new();
@ -71,8 +71,11 @@ public class LinqXmlSerialization : IDataManager
}
}
public LinqXmlSerialization()
public LinqXmlSerialization(string pathDirectory)
{
XMLPATH = pathDirectory;
XMLFILECUSTOMS = Path.Combine(XMLPATH, "playlists.xml");
XMLFILEPLAYLISTS = Path.Combine(XMLPATH, "customs.xml");
playlists = new ObservableCollection<Playlist>();
artists = new List<Artist>();
infoTitles = new ObservableCollection<InfoTitle>();

@ -18,7 +18,7 @@ namespace TestUnitaires
Playlist p = new Playlist(test, "PlaceHolder", "place.holder");
Album album = new Album(test, "place.holder", new Artist("test"), "PlaceHolder", "PlaceHolder");
CustomTitle t = new CustomTitle(test, "test. mp3", "Banger", "path");
Manager m = new Manager(new LinqXmlSerialization());
Manager m = new Manager(new LinqXmlSerialization(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data")));
m.AddCustomTitle(t);
m.AddPlaylist(p);
m.AddAlbum(album);

@ -10,6 +10,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Plugin.Maui.Audio" Version="1.0.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Loading…
Cancel
Save