Correction de conflit

pull/23/head
Rémi LAVERGNE 2 years ago
parent 77ad582f6a
commit 30da9d3dbd

Binary file not shown.

@ -39,13 +39,17 @@
/> />
<Label <Label
Text="Pseudo" Text="Pseudonyme"
FontFamily="AladinRegular" FontFamily="AladinRegular"
FontSize="18" FontSize="18"
Grid.Row="1" Grid.Row="1"
HorizontalOptions="Start" HorizontalOptions="Start"
VerticalOptions="Center" VerticalOptions="Center">
/> <Label.GestureRecognizers>
<TapGestureRecognizer Tapped="OnProfil_Tapped"/>
</Label.GestureRecognizers>
</Label>
</HorizontalStackLayout> </HorizontalStackLayout>
<StackLayout HorizontalOptions="Center" VerticalOptions="Center" Grid.Row="2"> <StackLayout HorizontalOptions="Center" VerticalOptions="Center" Grid.Row="2">

@ -6,12 +6,18 @@ namespace GameAtlas.Views;
public partial class PageAcceuil : ContentPage public partial class PageAcceuil : ContentPage
{ {
public Manager Manager => (App.Current as App).MyManager; public Manager AccueilManager => (App.Current as App).MyManager;
public PageAcceuil() public PageAcceuil()
{ {
InitializeComponent(); InitializeComponent();
}
private async void OnProfil_Tapped(object sender, EventArgs e)
{
await Navigation.PushAsync(new PageProfil());
} }
private async void OnButtonClicked(object sender, EventArgs e) private async void OnButtonClicked(object sender, EventArgs e)

@ -2,14 +2,14 @@ namespace GameAtlas.Views;
using GameAtlas.Models; using GameAtlas.Models;
using System.Diagnostics; using System.Diagnostics;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
public partial class PageInscription : ContentPage public partial class PageInscription : ContentPage
{ {
public Manager InscriptionManager => (App.Current as App).MyManager; public Manager InscriptionManager => (App.Current as App).MyManager;
public PageInscription() public PageInscription()
{ {
InitializeComponent(); InitializeComponent();
} }
private async void OnSignUpClicked(object sender, EventArgs e) private async void OnSignUpClicked(object sender, EventArgs e)

Loading…
Cancel
Save