mise à jour
continuous-integration/drone/push Build is failing Details

pull/26/head
Vianney JOURDY 2 years ago
parent 351ec129e6
commit b271543513

@ -33,19 +33,6 @@
</Grid> </Grid>
<ScrollView Grid.Row="1" VerticalScrollBarVisibility="Always"> <ScrollView Grid.Row="1" VerticalScrollBarVisibility="Always">
<<<<<<< HEAD
<VerticalStackLayout Spacing="10">
<Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
<ImageButton Grid.Column="0" BackgroundColor="#FFFFFF" WidthRequest="100" HeightRequest="100" HorizontalOptions="Start"/>
<Label Grid.Column="1" Text="Test Titre" FontSize="Medium" VerticalOptions="Center" Margin="15"/>
<Label Grid.Column="2" Text="4/5" VerticalOptions="Center" HorizontalOptions="Center"/>
<Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
</Grid>
</VerticalStackLayout>
=======
<VerticalStackLayout BindableLayout.ItemsSource="{Binding ListeOeuvreEnVisionnage}" Spacing="10"> <VerticalStackLayout BindableLayout.ItemsSource="{Binding ListeOeuvreEnVisionnage}" Spacing="10">
<BindableLayout.ItemTemplate> <BindableLayout.ItemTemplate>
<DataTemplate> <DataTemplate>
@ -57,14 +44,7 @@
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</BindableLayout.ItemTemplate> </BindableLayout.ItemTemplate>
</VerticalStackLayout> </VerticalStackLayout>
<!--<Grid x:Name="grille"
Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
</Grid>-->
>>>>>>> 5ff49db92d0e603606c630e81dea03593ebab802
</ScrollView> </ScrollView>
</Grid> </Grid>
</Frame> </Frame>

@ -10,10 +10,10 @@ public partial class listPage : ContentPage
{ {
InitializeComponent(); InitializeComponent();
BindingContext = my_manager; BindingContext = my_manager;
if (my_manager.UtilisateurActuel.Email != null) //if (my_manager.UtilisateurActuel.Email != null)
{ //{
chargerFavoris(); // chargerFavoris();
} //}
} }
private void chargerFavoris() private void chargerFavoris()

Loading…
Cancel
Save