ajustement des boutons déja existant dans partition et ajout de bouton pour métronome

pull/8/head
Maxime ANDRE-MASSE 2 years ago
parent 6b95857d30
commit 3cbc689dbd

@ -23,7 +23,7 @@
<Grid Margin="15"> <Grid Margin="15">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition /> <RowDefinition Height="35"/>
<RowDefinition Height="70"/> <RowDefinition Height="70"/>
<RowDefinition Height="25"/> <RowDefinition Height="25"/>
<RowDefinition Height="70"/> <RowDefinition Height="70"/>
@ -31,7 +31,7 @@
<RowDefinition Height="70"/> <RowDefinition Height="70"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="125"/> <ColumnDefinition Width="130"/>
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button Grid.Row="1" Grid.Column="0" <Button Grid.Row="1" Grid.Column="0"
@ -50,25 +50,47 @@
Clicked="Stop_Music" Clicked="Stop_Music"
/> />
<Border Grid.Row="3" Grid.Column="1" WidthRequest="75" <Border Grid.Row="1" Grid.Column="1" WidthRequest="75"
HeightRequest="75" HorizontalOptions="Start" Stroke="#6600FF" BackgroundColor="#6600FF"> HeightRequest="75" HorizontalOptions="End" Stroke="#6600FF" BackgroundColor="#6600FF">
<ImageButton Grid.Row="3" Grid.Column="1" x:Name="favoriButton" <ImageButton Grid.Row="3" Grid.Column="1" x:Name="favoriButton"
WidthRequest="75" WidthRequest="75"
HeightRequest="75" HeightRequest="75"
HorizontalOptions="Start" HorizontalOptions="End"
Clicked="AddFavoriButton" Clicked="AddFavoriButton"
/> />
</Border> </Border>
<Border Grid.Row="4" Grid.Column="0" WidthRequest="200" <Border Grid.Row="2" Grid.Column="0" WidthRequest="200"
HeightRequest="50" HorizontalOptions="Start" Stroke="#6600FF" BackgroundColor="#6600FF" HeightRequest="50" HorizontalOptions="Start" Stroke="#6600FF" BackgroundColor="#6600FF"
Margin="0,60,0,0"> Margin="0,60,0,0">
<Slider Grid.Row="3" Grid.Column="0" <Slider Grid.Row="2" Grid.Column="0"
x:Name="tempo_slider" x:Name="tempo_slider"
Minimum="0" Minimum="0"
Maximum="6" Maximum="6"
ValueChanged="TempoSlider" /> ValueChanged="TempoSlider" />
</Border> </Border>
<Label Grid.Row="3" Grid.Column="1" Text="Vitesse musique" WidthRequest="130" HeightRequest="55" HorizontalOptions="End"/>
<Label Grid.Row="0" Grid.Column="0" Text="Paramètres du son " HorizontalOptions="End"/>
<Label Grid.Row="0" Grid.Column="1" Text="de la partition :"/>
<Label Grid.Row="4" Grid.Column="0" Text="Paramètres du" HorizontalOptions="Center" />
<Label Grid.Row="4" Grid.Column="1" Text="métronome :" HorizontalOptions="Start"/>
<Button Grid.Row="5" Grid.Column="0"
Text="Jouer"
WidthRequest="75"
HeightRequest="75"
HorizontalOptions="Start"
Clicked="Play_Metronome"
x:Name="play_metronome_button"
/>
<Button Grid.Row="5" Grid.Column="1"
Text="Arrêter"
WidthRequest="75"
HeightRequest="75"
HorizontalOptions="Start"
Clicked="Stop_Metronome"
/>
</Grid> </Grid>

@ -1,3 +1,4 @@
using Android.Service.Voice;
using Microsoft.Maui.Controls.PlatformConfiguration; using Microsoft.Maui.Controls.PlatformConfiguration;
using MusiLib.Model; using MusiLib.Model;
using System.Collections.Concurrent; using System.Collections.Concurrent;
@ -59,7 +60,7 @@ public partial class PartitionView : ContentPage
Button button = (Button)sender; Button button = (Button)sender;
if (!metronome.isMusicBeginning) if (!metronome.isMusicBeginning)
{ {
_ = metronome.Lancer(MyManager.partitions[IdTab].Son); _ = metronome.Lancer("60_BPM_Metronome.mp3");
button.Text = "Pause"; button.Text = "Pause";
} }
else if (!metronome.isMusicPlaying) else if (!metronome.isMusicPlaying)
@ -81,6 +82,13 @@ public partial class PartitionView : ContentPage
button.Text = "Jouer"; button.Text = "Jouer";
} }
private void Stop_Metronome(object sender, EventArgs e)
{
metronome.StopMusic();
Button button = (Button)FindByName("play_metronome_button");
button.Text = "Jouer";
}
protected override bool OnBackButtonPressed() protected override bool OnBackButtonPressed()
{ {
metronome.StopMusic(); metronome.StopMusic();

Loading…
Cancel
Save