popup

Sources/AppConsole/AppConsole.csproj

@@ -7,6 +7,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Persistance\Persistance.csproj" />
     <ProjectReference Include="..\Stim.Model\Model.csproj" />

Sources/Persistance/Persistance.csproj

@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Stim.Model\Model.csproj" />
   </ItemGroup>

Sources/Stim.Model/Model.csproj

@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
+  </ItemGroup>
+
 </Project>

Sources/Stim/AddGameMessagePopup.xaml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<toolkit:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             x:Class="Stim.AddGameMessagePopup"
+             CanBeDismissedByTappingOutsideOfPopup ="False">
+    <VerticalStackLayout Background="{StaticResource Transparent}">
+        <Grid RowDefinitions="auto, *" ColumnDefinitions="*">
+            <Label x:Name="placeholder" Text="" HorizontalOptions="Center"/>
+            <Button Grid.Row="1" Text="Fermer" HorizontalOptions="Center" VerticalOptions="End" Background="{StaticResource Transparent}" Clicked="CloseButton"/>
+        </Grid>
+    </VerticalStackLayout>
+</toolkit:Popup>

Sources/Stim/AddGameMessagePopup.xaml.cs

@@ -0,0 +1,17 @@
+using CommunityToolkit.Maui.Views;
+
+namespace Stim;
+
+public partial class AddGameMessagePopup : Popup
+{
+	public AddGameMessagePopup(string message)
+	{
+		InitializeComponent();
+		placeholder.Text = message;
+	}
+
+	public void CloseButton(object sender, EventArgs e)
+	{
+		Close();
+	}
+}

Sources/Stim/AddGamePage.xaml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="Stim.AddGamePage"
              Title="Ajouter un jeu"
              Background="{StaticResource Secondary}">

Sources/Stim/AddGamePage.xaml.cs

@@ -1,6 +1,7 @@
 using Model;
 using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
 using Application = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.Application;
+using CommunityToolkit.Maui.Views;
 //using Windows.Gaming.Preview.GamesEnumeration;
 
 namespace Stim;
@@ -15,17 +16,26 @@ public partial class AddGamePage : ContentPage
     private string? _ImgPath;
 
 
-    private void AddGame(object sender, EventArgs e)
+    private async void AddGame(object sender, EventArgs e)
 	{
 		int year;
         string imgName = "no_cover.png";
-        if (string.IsNullOrEmpty(NameEntry.Text) || string.IsNullOrEmpty(DescriptionEntry.Text) || string.IsNullOrEmpty(YearEntry.Text) || !int.TryParse(YearEntry.Text, out year) || string.IsNullOrWhiteSpace(LinkEntry.Text) /*|| _ImgPath is null*/) return;
+        string message = "";
-        //if (_ImgPath!=null) NameEntry.Text + ".png";
+        if (string.IsNullOrEmpty(NameEntry.Text)) message += "Nom invalide\n";
-        //System.IO.File.Copy(_ImgPath, /**/, true);
+        if (string.IsNullOrEmpty(DescriptionEntry.Text)) message += "Description invalide\n";
+        if (string.IsNullOrEmpty(YearEntry.Text) || !int.TryParse(YearEntry.Text, out year)) message += "Année invalide\n";
+        if (string.IsNullOrEmpty(LinkEntry.Text)) message += "Lien invalide\n";
+        if (!string.IsNullOrEmpty(NameEntry.Text) && !string.IsNullOrEmpty(DescriptionEntry.Text) && !string.IsNullOrEmpty(YearEntry.Text) && int.TryParse(YearEntry.Text, out year) && !string.IsNullOrWhiteSpace(LinkEntry.Text) /*|| _ImgPath is null*/)
+        {
+            message = "Jeu ajouté !";
             ((App)App.Current).Manager.AddGametoGamesList(new Game(NameEntry.Text, DescriptionEntry.Text, year, new List<string> { TagEntry1.Text, TagEntry2.Text, TagEntry3.Text }, imgName, LinkEntry.Text));
             Navigation.RemovePage(this);
             ((App)App.Current).Manager.SaveGames();
         }
+        //      //if (_ImgPath!=null) NameEntry.Text + ".png";
+        //      //System.IO.File.Copy(_ImgPath, /**/, true);
+        await this.ShowPopupAsync(new AddGameMessagePopup(message));
+    }
 
     private async void Button_Clicked(object sender, EventArgs e)
     {

Sources/Stim/DetailledPage.xaml

@@ -17,17 +17,15 @@
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
 
-                <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0"/>
-                <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="2"/>
                 <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0"/>
                 <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="2"/>
 
-                <Grid Background="{StaticResource Tertiary}" Grid.Column="1" Margin="5">
+                <Grid Background="{StaticResource Tertiary}" Grid.Column="1" >
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="auto"/>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
                     <Grid.RowDefinitions>

Sources/Stim/FollowPage.xaml

@@ -16,41 +16,21 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
 
-
-            <VerticalStackLayout BackgroundColor="Black" Grid.Column="0"/>
-            <VerticalStackLayout BackgroundColor="Black" Grid.Column="2"/>
             <VerticalStackLayout BackgroundColor="Black" Grid.Column="0" Grid.Row="1"/>
             <VerticalStackLayout BackgroundColor="Black" Grid.Column="2" Grid.Row="1"/>
 
-            <Grid Grid.Column="1" Grid.Row="1" Margin="0,10,0,0">
+            <CollectionView ItemsSource="{Binding Followed_Games}" Grid.Column="1" SelectionChanged="GoToDetail">
-                <Grid.RowDefinitions>
+                <CollectionView.ItemTemplate>
-                    <RowDefinition Height="auto"/>
+                    <DataTemplate>
-                </Grid.RowDefinitions>
+                        <Border HeightRequest="150">
-
+                            <Grid ColumnDefinitions="*, *" RowDefinitions="*">
-                <Border>
+                                <Image Source="{Binding Cover}"/>
-                    <Grid HeightRequest="300">
+                                <Label Grid.Column="1"  Text="{Binding Name}"/>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="auto"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
-                        <Border>
-                            <Image Source="eldenring.jpg" Grid.Column="0" VerticalOptions="Start" HeightRequest="300"/>
-                        </Border>
-                        <Grid Grid.Column="1" Margin="10,10,0,0">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Label Text="Nom du jeu" TextColor="White" VerticalTextAlignment="Start" FontSize="25"/>
-                            <Label Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse non est elementum, facilisis ipsum id, facilisis ipsum. Sed efficitur erat ut libero pretium, non aliquam ex vehicula. Nam varius, lectus sit amet accumsan malesuada, justo urna iaculis velit, vitae sagittis felis orci sed eros. Curabitur vitae tristique ligula. Sed mauris tortor, efficitur et neque dignissim, dapibus scelerisque risus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut pretium blandit diam ac laoreet. Donec non justo magna. Proin justo est, egestas ut mauris eu, sagittis fringilla leo. Aliquam erat volutpat. Sed auctor felis dui, quis eleifend eros feugiat sodales. Maecenas at ligula sit amet lacus suscipit congue. Fusce consequat iaculis augue vel efficitur. Etiam posuere libero eget libero finibus consectetur.
-Morbi mattis sit amet ligula sit amet molestie. Proin lobortis mi a eros eleifend bibendum. Donec arcu nibh, accumsan sit amet blandit vel, tincidunt dignissim eros. Vestibulum faucibus diam vel est porta rhoncus. Nunc scelerisque odio id diam viverra, id auctor magna placerat. Nam mollis urna a elit facilisis, a lobortis sapien porta. Maecenas sit amet diam tincidunt, fringilla ligula sit amet, vestibulum dolor. Proin pulvinar velit non turpis dictum bibendum. Phasellus a porta ligula.
-Suspendisse vulputate augue id quam accumsan imperdiet. Morbi tincidunt vulputate tellus, quis maximus felis tincidunt ut. Vestibulum accumsan quam sed posuere maximus. Suspendisse quis lacus ut quam facilisis mollis sed at purus. Maecenas sollicitudin augue leo, in mattis elit dignissim sed. Etiam lobortis quam et lectus posuere, sed mollis mi sodales. Nunc id ante quis mauris euismod mattis. Maecenas orci nibh, hendrerit in felis sit amet, facilisis tristique nisi. Aliquam quis dui ut urna rutrum aliquam. Vivamus iaculis interdum ipsum, id scelerisque magna. Nunc purus est, hendrerit quis neque eget, varius semper nunc. Nulla facilisi. Cras dignissim auctor libero, eu blandit orci pharetra vel."
-                                   TextColor="White" VerticalTextAlignment="Start" Grid.Row="1"/>
-                        </Grid>
-
                             </Grid>
                         </Border>
-            </Grid>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
         </Grid>
     </ScrollView>
 </ContentPage>

Sources/Stim/FollowPage.xaml.cs

@@ -1,3 +1,5 @@
+using Model;
+
 namespace Stim;
 
 public partial class FollowPage : ContentPage
@@ -5,5 +7,11 @@ public partial class FollowPage : ContentPage
 	public FollowPage()
 	{
 		InitializeComponent();
+		BindingContext = (App.Current as App).Manager.CurrentUser;
+	}
+
+	public async void GoToDetail(object sender, EventArgs e)
+	{
+		await Navigation.PushAsync(new DetailledPage((sender as CollectionView).SelectedItem as Game));
 	}
 }

Sources/Stim/MauiProgram.cs

@@ -1,4 +1,6 @@
-namespace Stim;
+using CommunityToolkit.Maui;
+
+namespace Stim;
 
 public static class MauiProgram
 {
@@ -7,6 +9,7 @@ public static class MauiProgram
 		var builder = MauiApp.CreateBuilder();
 		builder
 			.UseMauiApp<App>()
+			.UseMauiCommunityToolkit()
 			.ConfigureFonts(fonts =>
 			{
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");

Sources/Stim/Stim.csproj

@@ -51,6 +51,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
 	  <PackageReference Include="MailKit" Version="4.0.0" />
 	</ItemGroup>
 
@@ -76,6 +77,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="AddGameMessagePopup.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="AddGamePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

Sources/Stub/Stub.csproj

@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Stim.Model\Model.csproj" />
   </ItemGroup>

Sources/TestProject1/Test.csproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Maui" Version="5.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">