Merge pull request 'Mathéo' (#26) from Mathéo into master
continuous-integration/drone/push Build is failing Details

Reviewed-on: #26
pull/28/head
Matheo HERSAN 2 years ago
commit 0c846b993b

@ -35,4 +35,4 @@ public partial class App : Application
MyManager.sauvegarder(); MyManager.sauvegarder();
Console.WriteLine("sauvegarde faite"); Console.WriteLine("sauvegarde faite");
} }
} }

@ -7,7 +7,7 @@
xmlns:Views="clr-namespace:MangaMap.Views" xmlns:Views="clr-namespace:MangaMap.Views"
Shell.FlyoutBehavior="Disabled" Shell.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False" Shell.NavBarIsVisible="False"
Shell.TabBarIsVisible="True"> Shell.TabBarIsVisible="False">
<TabBar Route="page"> <TabBar Route="page">

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="MangaMap.NewContent1" x:Class="MangaMap.NewContent1"
Background="{StaticResource Primary}"> Background="{StaticResource Primary}">
<Grid ColumnDefinitions="50, *,40, 40"> <Grid ColumnDefinitions="50, *,100,40, 40">
<ImageButton Source="logo.png" <ImageButton Source="logo.png"
MaximumHeightRequest="30" MaximumHeightRequest="30"
MaximumWidthRequest="30" MaximumWidthRequest="30"
@ -11,16 +11,26 @@
Clicked="ImageButton_Clicked"/> Clicked="ImageButton_Clicked"/>
<ImageButton Grid.Column="2" <ImageButton Grid.Column="2"
Source="listbutton.png"
MaximumWidthRequest="30"
MaximumHeightRequest="30"
BackgroundColor="{StaticResource Primary}"
VerticalOptions="Center"
Clicked="ListButton_Clicked" />
<ImageButton Grid.Column="3"
Source="account_circle.png" Source="account_circle.png"
MaximumHeightRequest="30" MaximumHeightRequest="30"
MaximumWidthRequest="30" MaximumWidthRequest="30"
BackgroundColor="{StaticResource Primary}"
VerticalOptions="Center" VerticalOptions="Center"
Clicked="AccountButton_Clicked"/> Clicked="AccountButton_Clicked"/>
<ImageButton Grid.Column="3" <ImageButton Grid.Column="4"
Source="settings.png" Source="settings.png"
MaximumHeightRequest="30" MaximumHeightRequest="30"
MaximumWidthRequest="30" MaximumWidthRequest="30"
BackgroundColor="{StaticResource Primary}"
VerticalOptions="Center" VerticalOptions="Center"
Clicked="SettingButton_Clicked"/> Clicked="SettingButton_Clicked"/>
</Grid> </Grid>

@ -23,4 +23,9 @@ public partial class NewContent1 : ContentView
{ {
await Shell.Current.GoToAsync("//page/secondaire/connexionPage"); await Shell.Current.GoToAsync("//page/secondaire/connexionPage");
} }
async void ListButton_Clicked(object sender, System.EventArgs e)
{
await Shell.Current.GoToAsync("//page/secondaire/listPage");
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 494 B

@ -29,7 +29,7 @@ namespace MangaMap.Stub
l1.Add(o1); l1.Add(o2); l1.Add(o1); l1.Add(o2);
l2.Add(u1); l2.Add(u2); l2.Add(u3); l2.Add(u1); l2.Add(u2); l2.Add(u3);
u1.ListeOeuvreEnVisionnage.Add(o1); //u1.ListeOeuvreEnVisionnage.Add(o1);
return (l1, l2); return (l1, l2);
} }

@ -62,7 +62,7 @@
</ScrollView> </ScrollView>
<ListView x:Name="a1" ItemsSource="{Binding Utilisateurs}"> <!--<ListView x:Name="a1" ItemsSource="{Binding Utilisateurs}">
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
@ -71,7 +71,7 @@
</ViewCell> </ViewCell>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>
</ListView> </ListView>-->
</VerticalStackLayout> </VerticalStackLayout>

Loading…
Cancel
Save