Merged

MangaMap/Views/listPage.xaml

@@ -2,25 +2,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:MangaMap"
     x:Class="MangaMap.Views.listPage"
-<<<<<<< HEAD
     BackgroundColor="Black">
-=======
-    BackgroundColor="Black"
->
->>>>>>> 5ff49db92d0e603606c630e81dea03593ebab802
 
     <Grid RowDefinitions="40, *">
         <local:NewContent1 HeightRequest="40" VerticalOptions="Start" Padding="10, 0"/>
 
         <ScrollView
             Grid.Row="1">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
+            <VerticalStackLayout>
 
                 <Label Text="Watching" TextColor="White" FontSize="Title" Margin="50,10,0,0" Grid.Row="0"/>
 
@@ -55,13 +44,7 @@
                                         </Grid>
                                     </DataTemplate>
                                 </BindableLayout.ItemTemplate>
-
-                            </VerticalStackLayout> 
-
-                            <!--<Grid x:Name="grille"
-                                  Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
-                                
-                            </Grid>-->                            
+                            </VerticalStackLayout>
                         </ScrollView>
                     </Grid>
                 </Frame>
@@ -129,20 +112,12 @@
                                     <Label Grid.Column="3" Text="10/85" VerticalOptions="Center" HorizontalOptions="End"/>
                                 </Grid>
 
-                                <Grid Margin="20,0,20,0" ColumnDefinitions="*,*,300,300">
-
-                                    <ImageButton Grid.Column="0" BackgroundColor="Red" 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>
                         </ScrollView>
                     </Grid>
                 </Frame>
 
-            </Grid>
+            </VerticalStackLayout>
 
         </ScrollView>