guillaume.rey
/
Ohara_MAUI
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases Wiki Activity

Rajout EstFavori
continuous-integration/drone/push Build is failing Details

Browse Source
pull/15/head
Yoan BRUGIÈRE 2 years ago
parent 822d8c329c
commit 5a97193d4b
24 changed files with 123 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
Sources/Model/Bateau.cs
Unescape View File

@ -26,7 +26,7 @@ namespace Model
public Bateau(string nom, string nomRomanise, int premierChap, int premierEp, string description, string caracteristique, string image = "baseimage.png") : base(nom,image)
public Bateau(string nom, string nomRomanise, int premierChap, int premierEp, string description, string caracteristique, string image ) : base(nom,image)
{
NomRomanise = nomRomanise;

8
Sources/Model/Bestiaire.cs
Unescape View File

@ -20,13 +20,19 @@ namespace Model
public string Caracteristique { get; set; }
public Bestiaire(string nom, string origine, string description, string caracteristique,string image = "baseimage.png") : base(nom, image)
public Bestiaire(string nom, string origine, string description, string caracteristique) : base(nom)
{
Origine = origine;
Description = description;
Caracteristique = caracteristique;
}
public Bestiaire(string nom, string origine, string description, string caracteristique,string image ) : this(nom,origine,description,caracteristique)
{
Image=image;
}
}
}

11
Sources/Model/Equipage.cs
Unescape View File

@ -31,7 +31,7 @@ namespace Model
public List<Equipage> Allie { get; set; } = new List<Equipage>();
public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut, string description,string image = "baseimage.png") : base(nom,image)
public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut, string description) : base(nom)
{
NomRomanise = nomRomanise;
@ -56,5 +56,14 @@ namespace Model
Description = description;
}
public Equipage(string nom, string nomRomanise, string region, int premierChap, int premierEp, bool statut, string description, string image) : this(nom, nomRomanise,region,premierChap,premierEp,statut,description)
{
Image = image;
}
}
}

8
Sources/Model/FruitDuDemon.cs
Unescape View File

@ -30,7 +30,7 @@ namespace Model
public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses, string image = "baseimage.png") : base(nom,image)
public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses) : base(nom)
{
NomRomanise = nomRomanise;
@ -56,6 +56,12 @@ namespace Model
Faiblesses = faiblesses;
}
public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses, string image) : this(nom, nomRomanise,type,premierChap,premierEp,description,forces,faiblesses)
{
Image = image;
}
public FruitDuDemon(string nom, string nomRomanise, string type, int premierChap, int premierEp, string description, string forces, string faiblesses,string image, List<Personnage> utilisateur) : this( nom, nomRomanise, type, premierChap, premierEp, description, forces, faiblesses, image)
{
Utilisateur = utilisateur;

8
Sources/Model/Ile.cs
Unescape View File

@ -26,7 +26,7 @@ namespace Model
public Ile(string nom, string nomRomanise, string region, int premierChap, int premierEp, string description, string geographie, string image = "baseimage.png") : base(nom,image)
public Ile(string nom, string nomRomanise, string region, int premierChap, int premierEp, string description, string geographie) : base(nom)
{
NomRomanise = nomRomanise;
@ -51,5 +51,11 @@ namespace Model
Geographie = geographie;
}
public Ile(string nom, string nomRomanise, string region, int premierChap, int premierEp, string description, string geographie, string image) : this(nom,nomRomanise,region,premierChap,premierEp,description,geographie)
{
Image = image;
}
}
}

6
Sources/Model/ObjetOhara.cs
Unescape View File

@ -15,9 +15,13 @@ namespace Model
[DataMember (Name ="image")]
public string? Image { get; set;}
public ObjetOhara(string nom,string image) {
public bool EstFavori { get; set; }
public ObjetOhara(string nom,string image = "baseimage.png", bool estFavori = false)
{
Nom = nom;
Image = image;
EstFavori = estFavori;
}
}
}

7
Sources/Model/Personnage.cs
Unescape View File

@ -27,7 +27,7 @@ namespace Model
public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation, string image = "baseimage.png") : base(nom,image)
public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation) : base(nom)
{
if(prime < 0)
{
@ -54,6 +54,11 @@ namespace Model
}
public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation, string image) : this(nom, prime,epithete,age,taille,origine,biographie,citation)
{
Image = image;
}
public Personnage(string nom, double prime, string epithete, int age, double taille, string origine, string biographie, string citation,string image ,Equipage equipage,List<FruitDuDemon> fruit) : this(nom,prime,epithete,age,taille,origine,biographie,citation,image)
{
Equipage = equipage;

4
Sources/Ohara/AppShell.xaml
Unescape View File

@ -13,8 +13,8 @@
<ShellContent
ContentTemplate="{DataTemplate local:PageInfoFdd}"
Route="PageInfoFdd" />
ContentTemplate="{DataTemplate local:PagePersonnage}"
Route="PageFDD" />
</Shell>

4
Sources/Ohara/MauiProgram.cs
Unescape View File

@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging;
using Plugin.Maui.Audio;
namespace Ohara;
@ -14,7 +15,8 @@ public static class MauiProgram
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
});
builder.Services.AddSingleton(AudioManager.Current);
builder.Services.AddTransient<MainPage>();
#if DEBUG
builder.Logging.AddDebug();
#endif

2
Sources/Ohara/PageBateau.xaml
Unescape View File

@ -31,6 +31,8 @@
<Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
<!--<Button Style="{StaticResource buttonMenu}" Text="Favoris" Clicked="Hyperlink_Favoris"/>-->
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >

7
Sources/Ohara/PageBateau.xaml.cs
Unescape View File

@ -69,4 +69,11 @@ public partial class PageBateau : ContentPage
await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
player.Play();
}
//private async void Hyperlink_Favoris(object sender, EventArgs e)
//{
// var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
// await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
// player.Play();
//}
}

1
Sources/Ohara/PageBestiaire.xaml
Unescape View File

@ -28,6 +28,7 @@
<Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
<Button Style="{StaticResource buttonMenu2}" Text="Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
<!--<Button Style="{StaticResource buttonMenu}" Text="Favoris" Clicked="Hyperlink_Favoris"/>-->
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="20">
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >

6
Sources/Ohara/PageBestiaire.xaml.cs
Unescape View File

@ -64,4 +64,10 @@ public partial class PageBestiaire : ContentPage
await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
player.Play();
}
//private async void Hyperlink_Favoris(object sender, EventArgs e)
//{
// var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
// await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
// player.Play();
//}
}

1
Sources/Ohara/PageCarte.xaml
Unescape View File

@ -30,6 +30,7 @@
<Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
<!--<Button Style="{StaticResource buttonMenu}" Text="Favoris" Clicked="Hyperlink_Favoris"/>-->
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">

6
Sources/Ohara/PageCarte.xaml.cs
Unescape View File

@ -57,4 +57,10 @@ public partial class PageCarte : ContentPage
await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
player.Play();
}
//private async void Hyperlink_Favoris(object sender, EventArgs e)
//{
// var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
// await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
// player.Play();
//}
}

1
Sources/Ohara/PageEquipage.xaml
Unescape View File

@ -29,6 +29,7 @@
<Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
<Button Style="{StaticResource buttonMenu2}" Text="Équipages"/>
<!--<Button Style="{StaticResource buttonMenu}" Text="Favoris" Clicked="Hyperlink_Favoris"/>-->
</VerticalStackLayout>
<ScrollView Grid.Row="0" Grid.Column="1" >
<VerticalStackLayout Spacing="10">

11
Sources/Ohara/PageEquipage.xaml.cs
Unescape View File

@ -66,9 +66,10 @@ public partial class PageEquipage : ContentPage
await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
player.Play();
}
private void listeEquip_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
{
}
//private async void Hyperlink_Favoris(object sender, EventArgs e)
//{
// var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
// await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
// player.Play();
//}
}

1
Sources/Ohara/PageFDD.xaml
Unescape View File

@ -32,6 +32,7 @@
<Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
<!--<Button Style="{StaticResource buttonMenu}" Text="Favoris" Clicked="Hyperlink_Favoris"/>-->
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="10">

9
Sources/Ohara/PageFDD.xaml.cs
Unescape View File

@ -34,8 +34,6 @@ public partial class PageFDD : ContentPage
}
private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
{
@ -85,7 +83,12 @@ public partial class PageFDD : ContentPage
await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
player.Play();
}
//private async void Hyperlink_Favoris(object sender, EventArgs e)
//{
// var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
// await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
// player.Play();
//}
private void MenuFlyoutItem_Clicked(object sender, EventArgs e)
{

1
Sources/Ohara/PageIle.xaml
Unescape View File

@ -31,6 +31,7 @@
<Button Style="{StaticResource buttonMenu2}" Text="Îles"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
<!--<Button Style="{StaticResource buttonMenu}" Text="Favoris" Clicked="Hyperlink_Favoris"/>-->
</VerticalStackLayout>
<VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
<Grid BackgroundColor="#72a3b3" Padding="10" ColumnSpacing="50" >

10
Sources/Ohara/PageIle.xaml.cs
Unescape View File

@ -18,10 +18,7 @@ public partial class PageIle : ContentPage
this.audioManager = audioManager;
}
private void listeFDD_ScrollToRequested(object sender, ScrollToRequestEventArgs e)
{
}
private async void Hyperlink_Accueil(object sender, EventArgs e)
{
@ -67,4 +64,11 @@ public partial class PageIle : ContentPage
player.Play();
}
//private async void Hyperlink_Favoris(object sender, EventArgs e)
//{
// var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
// await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
// player.Play();
//}
}

2
Sources/Ohara/PagePersonnage.xaml
Unescape View File

@ -30,6 +30,8 @@
<Button Style="{StaticResource buttonMenu}" Text="Îles" Clicked="Hyperlink_Ile"/>
<Button Style="{StaticResource buttonMenu}" Text="Bestiaire" Clicked="Hyperlink_Bestiaire"/>
<Button Style="{StaticResource buttonMenu}" Text="Équipages" Clicked="Hyperlink_Equip"/>
<!--<Button Style="{StaticResource buttonMenu}" Text="Favoris" Clicked="Hyperlink_Favoris"/>-->
</VerticalStackLayout>

9
Sources/Ohara/PagePersonnage.xaml.cs
Unescape View File

@ -2,12 +2,12 @@ namespace Ohara;
using Model;
using Model.Stub;
using Plugin.Maui.Audio;
public partial class PagePersonnage : ContentPage
{
private readonly IAudioManager audioManager;
private static string chemin = "Sons/test.wav";
public PagePersonnage(IAudioManager audioManager)
{
@ -64,4 +64,11 @@ public partial class PagePersonnage : ContentPage
await Navigation.PushAsync(new PageIle(new Plugin.Maui.Audio.AudioManager()));
player.Play();
}
//private async void Hyperlink_Favoris(object sender, EventArgs e)
//{
// var player = audioManager.CreatePlayer(await FileSystem.OpenAppPackageFileAsync(chemin));
// await Navigation.PushAsync(new PageFavoris(new Plugin.Maui.Audio.AudioManager()));
// player.Play();
//}
}

17
Sources/TestConsole/Program.cs
Unescape View File

@ -7,11 +7,24 @@ var manager = new Manager();
var xml = new XML_Serializer();
Bestiaire luffy = new Bestiaire("", "", "", "");
/*
xml.SetPersonnage(manager.GetPersonnages().ToList());
xml.SetFDD(manager.GetFruits().ToList());
xml.SetBateau(manager.GetBateaux().ToList());
xml.SetBestiaire(manager.GetBestiaires().ToList());
xml.SetEquipage(manager.GetEquipages().ToList());
xml.SetIle(manager.GetIles().ToList());
*/
Console.WriteLine(luffy.Image);
List<Personnage> perso=manager.GetPersonnages().ToList();
foreach(Personnage person in perso)
{
Console.WriteLine(person.EstFavori);
Console.WriteLine(person.Image);
}

Write Preview
Loading…
Cancel
Save