alexandre.agostinho
/
SAE-2.01
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

link between Home and ViewRecette finished. remind binding of rewiew and navigation to review's page
continuous-integration/drone/push Build is passing Details

Browse Source
pull/53/head
Roxane ROSSETTO 2 years ago
parent e88eb58e70
commit a3350f9230
8 changed files with 193 additions and 200 deletions
Show Stats Download Patch File Download Diff File

2
MCTG/Model/Recipes/Ingredient/Quantity.cs
Unescape View File

@ -67,7 +67,7 @@ namespace Model
public override string ToString()
{
return $"{Number}{UnitQ}";
return $"{Number} {UnitQ} de : ";
}
}
}

4
MCTG/Views/AddRecipe.xaml
Unescape View File

@ -63,9 +63,7 @@
<Label Text="Saisir les ingrédients de la recette" Grid.Row="6" Grid.Column="1" Margin="50,15"/>
<HorizontalStackLayout Grid.Row="7" Grid.Column="1">
<Entry Placeholder="Nom de l'ingrédient" Margin="12,0,50,0" WidthRequest="500"/>
<Picker Title="Unité">
</Picker>
<Picker ItemsSource= "{Binding UnitList}"/>
</HorizontalStackLayout>
<HorizontalStackLayout Grid.Row="8" Grid.Column="1" Margin="20">
<Button WidthRequest="100" Text="Précédent" TextColor="Black" Margin="20,0,20,0"/>

3
MCTG/Views/AddRecipe.xaml.cs
Unescape View File

@ -9,10 +9,11 @@ namespace Views
public partial class AddRecipe : ContentPage
{
public MasterManager MasterMgr => (App.Current as App).MasterMgr;
public List<Unit> UnitList { get; set; } = new List<Unit> { Unit.unit, Unit.kG, Unit.mG, Unit.G, Unit.L, Unit.cL, Unit.mL };
public AddRecipe()
{
InitializeComponent();
BindingContext = this;
}
}
}

3
MCTG/Views/App.xaml.cs
Unescape View File

@ -30,9 +30,6 @@ namespace Views
currentRecipe = value;
OnPropertyChanged(nameof(CurrentRecipe));
}
}
//collection de recette de l'application

2
MCTG/Views/Home.xaml.cs
Unescape View File

@ -9,7 +9,7 @@ namespace Views
{
public MasterManager MasterMgr => (App.Current as App).MasterMgr;
public User user => (App.Current as App).CurrentUser;
public Recipe recipe => (App.Current as App).CurrentRecipe;
public Recipe Recipe => (App.Current as App).CurrentRecipe;
public RecipeCollection AllRecipes => (App.Current as App).AllRecipes;
public Home()
{

4
MCTG/Views/MiniHeader.xaml.cs
Unescape View File

@ -7,8 +7,8 @@ public partial class MiniHeader : ContentView
InitializeComponent();
}
public readonly BindableProperty TitleMiniProperty =
BindableProperty.Create(nameof(TitleMini), typeof(string), typeof(MiniHeader), "Erreur de titre");
public static readonly BindableProperty TitleMiniProperty =
BindableProperty.Create(nameof(TitleMini), typeof(string), typeof(Label), "Erreur de titre");
public string TitleMini
{

87
MCTG/Views/ViewRecette.xaml
Unescape View File

@ -7,7 +7,7 @@
x:Name="nrecipe">
<VerticalStackLayout BindingContext="{Binding Recipe}">
<local:MiniHeader
TitleMini="{Binding Toto}"
TitleMini="{Binding Title}"
NeedReturn="True"
HeightRequest="100"/>
<Image
@ -16,8 +16,8 @@
Aspect="AspectFill"/>
<Grid ColumnDefinitions="200,*">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
@ -25,49 +25,39 @@
Text="Ingrédients :"
FontSize="Subtitle"
FontAttributes="Bold"/>
<Label Margin="10,60,20,0"
Grid.RowSpan="4">
<Label.Text>
- 6 pommes
- 6 poires
- une banane
- 3 fraises
- 400g de farine
- 200g de beurre
- 150g de pépite de chocolat
</Label.Text>
</Label>
<Label Margin="10,20,0,0"
<ListView Margin="10,60,20,0"
Grid.RowSpan="4"
ItemsSource="{Binding Ingredients}">
<ListView.ItemTemplate>
<DataTemplate>
<ViewCell>
<Grid ColumnDefinitions="auto,auto, auto"
RowDefinitions="auto">
<Label Text="{Binding QuantityI}" Grid.Column="0" Grid.Row="0"/>
<Label Text="{Binding Name}" Grid.Column=" 1" Grid.Row="0"/>
</Grid>
</ViewCell>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<Label Margin="10,0,20,20"
Grid.Column="1"
Grid.Row="0"
Text="Préparation :"
FontSize="Subtitle"
FontAttributes="Bold"/>
<Label Grid.Column="1"
Grid.Row="1"
Text="Etape 1"
FontAttributes="Italic"/>
<Label Grid.Column="1"
Grid.Row="1"
Margin="10,20,0,0"
Text=" ° Laissez ramollir le beurre à température ambiante. Dans un saladier, malaxez-le avec le sucre"/>
<Label Grid.Column="1"
Grid.Row="2"
FontAttributes="Italic"
Text="Etape 2"/>
<Label Grid.Column="1"
Grid.Row="2"
Margin="10,20,0,0"
Text=" ° Ajoutez l'oeuf et éventuellement le sucre vanillé. "/>
<Label Grid.Column="1"
Grid.Row="3"
FontAttributes="Italic"
Text="Etape 3"/>
<Label Grid.Column="1"
Grid.Row="3"
Margin="10,20,0,0"
Text=" ° Ajoutez l'oeuf et éventuellement le sucre vanillé. "/>
<ListView Margin="10,30,0,0"
Grid.Column="1"
ItemsSource="{Binding PreparationSteps}">
<ListView.ItemTemplate>
<DataTemplate>
<TextCell Text="{Binding Order, StringFormat='Etape {0}'}"
Detail="{Binding Description}"/>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
@ -81,7 +71,10 @@
Padding="20,10,80,20"
Margin="50,100,50,0"
MinimumHeightRequest="200">
<Grid ColumnDefinitions="600,*">
<ListView ItemsSource="{Binding Reviews}">
<ListView.ItemTemplate>
<DataTemplate>
<Grid ColumnDefinitions="600,*" >
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
@ -91,20 +84,24 @@
Grid.Row="0"
Text=" Meilleure revue : "
FontAttributes="Bold"/>
<Label Background="#FFCB9A"
<Label
Background="#FFCB9A"
Grid.Column="0"
Grid.Row="1"
Grid.RowSpan="2"
Padding="10,10,10,10"
Text="Recette facile, non prise de tête et agréable à réaliser avec ses grands parents. Le resultat est délicieux, ma famille a adorée."
Text="{Binding Content}"
Margin="0,0,15,0"/>
<Button Grid.Column="1"
Grid.Row="2"
Background="#FFCB9A"
Text="Voir plus"
TextColor="Black"/>
</Grid>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
</Border>
</VerticalStackLayout>

Write Preview
Loading…
Cancel
Save