Fix building and tests issues
continuous-integration/drone/push Build is failing Details

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

@ -18,11 +18,11 @@
</HorizontalStackLayout>
<StackLayout Grid.Column="1" Orientation="Horizontal" HorizontalOptions="CenterAndExpand">
<Image Source="rdm.png" Margin="0,10,8,10" WidthRequest="25" HeightRequest="25" Aspect="AspectFit" MinimumWidthRequest="1" MinimumHeightRequest="1" BackgroundColor="Transparent" Style="{StaticResource SecondaryButtonFooterTrigger}"/>
<ImageButton Source="rdm.png" Margin="0,10,8,10" WidthRequest="25" HeightRequest="25" Aspect="AspectFit" MinimumWidthRequest="1" MinimumHeightRequest="1" BackgroundColor="Transparent" Style="{StaticResource SecondaryButtonFooterTrigger}"/>
<ImageButton Clicked="RewindButton_Clicked" Source="back.png" Margin="8,10,8,10" WidthRequest="20" HeightRequest="20" Aspect="AspectFit" MinimumWidthRequest="1" MinimumHeightRequest="1" BackgroundColor="Transparent"/>
<ImageButton Clicked="PlayButton_Clicked" Source="play.png" Margin="8,0,8,0" WidthRequest="38" HeightRequest="38" Aspect="AspectFit" MinimumWidthRequest="5" MinimumHeightRequest="5" BackgroundColor="Transparent"/>
<ImageButton Clicked="NextButton_Clicked" Source="next.png" Margin="8,10,8,10" WidthRequest="20" HeightRequest="20" Aspect="AspectFit" MinimumWidthRequest="1" MinimumHeightRequest="1" BackgroundColor="Transparent"/>
<Image Source="loop.png" Margin="8,10,0,10" WidthRequest="25" HeightRequest="25" Aspect="AspectFit" MinimumWidthRequest="1" MinimumHeightRequest="1" BackgroundColor="Transparent" Style="{StaticResource SecondaryButtonFooterTrigger}"/>
<ImageButton Source="loop.png" Margin="8,10,0,10" WidthRequest="25" HeightRequest="25" Aspect="AspectFit" MinimumWidthRequest="1" MinimumHeightRequest="1" BackgroundColor="Transparent" Style="{StaticResource SecondaryButtonFooterTrigger}"/>
</StackLayout>
<HorizontalStackLayout Grid.ColumnSpan="3" HorizontalOptions="Center" Spacing="10" MinimumWidthRequest="15" Style="{StaticResource TimeStackFooterTrigger}">

@ -1,4 +1,5 @@
using NAudio.Wave;
using Plugin.Maui.Audio;
namespace Linaris;
@ -24,11 +25,23 @@ public partial class FooterPage : ContentView
outputDevice.Init(audioFile);*/
}
public void PlayAudio(string path)
{
using (var stream = File.OpenRead(path))
{
var audioPlayer = AudioManager.Current.CreatePlayer(stream);
audioPlayer.Volume = 100.0f;
audioPlayer.Play();
}
}
public void PlayButton_Clicked(object sender, EventArgs e)
{
Play();
/*string url = ((FileImageSource)Play.Source).File;
if (url == "play.png")
string CurrentPath = (Application.Current as App).Manager.CurrentPlaying.Path;
if (CurrentPath == null) return;
PlayAudio(CurrentPath);
/*string url = ((FileImageSource)Play.Source).File;*/
/*if (url == "play.png")
{
outputDevice?.Play();
Play.Source = "pause.png";
@ -44,11 +57,6 @@ public partial class FooterPage : ContentView
}*/
}
public void Play()
{
if ((Application.Current as App).Manager.CurrentPlaying == null) return;
}
public void RewindButton_Clicked(Object sender, EventArgs e)
{
/*audioFile.Position = 0;

@ -14,7 +14,9 @@
<ScrollView Grid.Column="1" BackgroundColor="#404040">
<VerticalStackLayout>
<Button Text="test" Clicked="play"/>
<SearchBar Style="{StaticResource SearchBar}"/>
<FlexLayout Direction="Row" AlignItems="Start" BindableLayout.ItemsSource="{Binding Albums}" JustifyContent="SpaceAround" Wrap="Wrap">

@ -6,6 +6,8 @@ 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
@ -13,10 +15,11 @@ public partial class MainPage : ContentPage
get => albums;
}
public MainPage()
public MainPage(IAudioManager audioManager)
{
InitializeComponent();
BindingContext = this;
this.audioManager = audioManager;
}
async void GoToAlbum(object sender, EventArgs e)
@ -30,5 +33,37 @@ public partial class MainPage : ContentPage
}
}
}
public void PlayAudio(string path)
{
using (var stream = File.OpenRead(path))
{
var audioPlayer = audioManager.CreatePlayer(stream);
audioPlayer.Volume = 1.0f;
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 url = ((FileImageSource)Play.Source).File;*/
/*if (url == "play.png")
{
outputDevice?.Play();
Play.Source = "pause.png";
Timer_Elapsed(sender, e);
timer = new System.Timers.Timer(1000);
timer.Elapsed += Timer_Elapsed;
timer.Enabled = true;
}
else
{
outputDevice?.Pause();
Play.Source = "play.png";
}*/
}
}

@ -35,16 +35,7 @@ public partial class PlaylistPage : ContentPage
{
(Application.Current as App).Manager.CurrentPlaying = playlist.Titles.FirstOrDefault();
if ((Application.Current as App).Manager.CurrentPlaying == null) return;
/*if (button.Parent.Parent.Parent.Parent.Parent is Grid grid)
{
grid.RowDefinitions.Clear();
RowDefinition row1 = new RowDefinition();
RowDefinition row2 = new RowDefinition();
row2.Height = 100;
grid.RowDefinitions.Add(row1);
grid.RowDefinitions.Add(row2);
}*/
(Application.Current as App).Manager.Play();
}
}
}

@ -128,6 +128,12 @@ public class Manager
currentAlbum = albums.First();
currentPlaylist = playlists.FirstOrDefault();
currentInfoTitle = infoTitles.FirstOrDefault();
currentPlaying = null;
}
public void Play()
{
}
public void AddAlbum(Album album)

@ -19,4 +19,4 @@
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
</Project>
</Project>

@ -2,7 +2,6 @@
using System.Xml.Linq;
using System.Collections.ObjectModel;
using Model.Stub;
using Microsoft.Maui.Storage;
namespace Model.Serialization;

@ -15,11 +15,10 @@ namespace TestUnitaires
[InlineData("Réference")]
public void TU_Methods(string? test)
{
IDataManager DataManager = new LinqXmlSerialization();
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(DataManager);
Manager m = new Manager(new LinqXmlSerialization());
m.AddCustomTitle(t);
m.AddPlaylist(p);
m.AddAlbum(album);

Loading…
Cancel
Save