remi.lavergne
/
GameAtlas
1
5
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases 2 Wiki Activity

Merge pull request 'Fusion des correctifs d'affichage pour les deux nouvelles pages' (#11) from remi into master

Browse Source 
Reviewed-on: remi.lavergne/SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD#11
pull/13/head^2
Rémi LAVERGNE 2 years ago
parent 5514313b92 2c6ee01f11
commit ca3b1539d7
12 changed files with 497 additions and 504 deletions
Show Stats Download Patch File Download Diff File

BIN
GameAtlas/.vs/GameAtlas/v17/.suo
View File

Binary file not shown.

67
GameAtlas/GameAtlas/AppShell.xaml
Unescape View File

@ -4,60 +4,39 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:views="clr-namespace:GameAtlas.Views" xmlns:views="clr-namespace:GameAtlas.Views"
Shell.NavBarIsVisible="False"
Shell.FlyoutBehavior="Disabled"> Shell.FlyoutBehavior="Disabled">
<TabBar> <Shell.Resources>
<Tab Title="Connexion"> <ResourceDictionary>
<ShellContent <Style x:Key="BaseStyle" TargetType="Element">
Title="Connexion" <Setter Property="Shell.ForegroundColor" Value="{StaticResource Gray1000}" />
ContentTemplate="{DataTemplate views:PageConnexion}" <Setter Property="Shell.UnselectedColor" Value="{StaticResource Gray300}" />
Route="Views/PageConnexion" /> <Setter Property="Shell.TabBarBackgroundColor" Value="{StaticResource Gray1000}" />
</Tab> <Setter Property="Shell.TabBarForegroundColor" Value="{StaticResource White}"/>
<Setter Property="Shell.TabBarUnselectedColor" Value="{StaticResource Gray300}"/>
</Style>
<Style TargetType="TabBar" BasedOn="{StaticResource BaseStyle}" />
<Style TargetType="FlyoutItem" BasedOn="{StaticResource BaseStyle}" />
</ResourceDictionary>
</Shell.Resources>
<Tab Title="Inscription"> <TabBar>
<ShellContent
Title="Connexion"
ContentTemplate="{DataTemplate views:PageInscription}"
Route="Views/PageInscription" />
</Tab>
<Tab Title="Accueil">
<ShellContent <ShellContent
Title="Accueil" Title="Accueil"
Icon="home"
ContentTemplate="{DataTemplate views:PageAcceuil}" ContentTemplate="{DataTemplate views:PageAcceuil}"
Route="Views/PageAcceuil" /> Route="PageAccueil" />
</Tab>
<Tab Title="Profil">
<ShellContent
Title="Profil"
ContentTemplate="{DataTemplate views:PageProfil}"
Route="Views/PageProfil" />
</Tab>
<Tab Title="Jeu">
<ShellContent
Title="Jeu"
ContentTemplate="{DataTemplate views:PageJeu}"
Route="Views/PageJeu" />
</Tab>
</TabBar>
<FlyoutItem>
<ShellContent <ShellContent
Title="Parcourir" Title="Parcourir"
Icon="console"
ContentTemplate="{DataTemplate views:PageParcourir}" ContentTemplate="{DataTemplate views:PageParcourir}"
Route="Views/PageParcourir" /> Route="PageParcourir" />
</FlyoutItem>
<FlyoutItem>
<ShellContent <ShellContent
Title="Jeu" Title="Profil"
ContentTemplate="{DataTemplate views:PageJeu}" Icon="account"
Route="Views/PageJeu" /> ContentTemplate="{DataTemplate views:PageProfil}"
</FlyoutItem> Route="PageProfil" />
</TabBar>
</Shell> </Shell>

2
GameAtlas/GameAtlas/GameAtlas.csproj.user
Unescape View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen> <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
<ActiveDebugFramework>net7.0-android</ActiveDebugFramework> <ActiveDebugFramework>net7.0-android</ActiveDebugFramework>
<ActiveDebugProfile>Xiaomi 2201117SY (Android 12.0 - API 31)</ActiveDebugProfile> <ActiveDebugProfile>Pixel 5 - API 33 (1) (Android 13.0 - API 33)</ActiveDebugProfile>
<SelectedPlatformGroup>PhysicalDevice</SelectedPlatformGroup> <SelectedPlatformGroup>PhysicalDevice</SelectedPlatformGroup>
<DefaultDevice>pixel_5_-_api_33_1</DefaultDevice> <DefaultDevice>pixel_5_-_api_33_1</DefaultDevice>
</PropertyGroup> </PropertyGroup>

12
GameAtlas/GameAtlas/Resources/Styles/Colors.xaml
Unescape View File

@ -4,22 +4,22 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
<Color x:Key="Primary">#512BD4</Color> <Color x:Key="Primary">#FAD05D</Color>
<Color x:Key="Secondary">#DFD8F7</Color> <Color x:Key="Secondary">#C8D1FF</Color>
<Color x:Key="Tertiary">#2B0B98</Color> <Color x:Key="Tertiary">#D9D9D9</Color>
<Color x:Key="White">White</Color> <Color x:Key="White">White</Color>
<Color x:Key="Black">Black</Color> <Color x:Key="Black">Black</Color>
<Color x:Key="Gray100">#E1E1E1</Color> <Color x:Key="Gray100">#E1E1E1</Color>
<Color x:Key="Gray200">#C8C8C8</Color> <Color x:Key="Gray200">#C8C8C8</Color>
<Color x:Key="Gray300">#ACACAC</Color> <Color x:Key="Gray300">#A0A0A0</Color>
<Color x:Key="Gray400">#919191</Color> <Color x:Key="Gray400">#919191</Color>
<Color x:Key="Gray500">#6E6E6E</Color> <Color x:Key="Gray500">#5E5E5E</Color>
<Color x:Key="Gray600">#404040</Color> <Color x:Key="Gray600">#404040</Color>
<Color x:Key="Gray900">#212121</Color> <Color x:Key="Gray900">#212121</Color>
<Color x:Key="Gray950">#141414</Color> <Color x:Key="Gray950">#141414</Color>
<Color x:Key="Gray1000">#121212</Color>
<SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}"/> <SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}"/>
<SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}"/> <SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}"/>
<SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource Tertiary}"/>
<SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}"/> <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}"/>
<SolidColorBrush x:Key="BlackBrush" Color="{StaticResource Black}"/> <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource Black}"/>
<SolidColorBrush x:Key="Gray100Brush" Color="{StaticResource Gray100}"/> <SolidColorBrush x:Key="Gray100Brush" Color="{StaticResource Gray100}"/>

5
GameAtlas/GameAtlas/Resources/Styles/Styles.xaml
Unescape View File

@ -132,8 +132,8 @@
<Style TargetType="Frame"> <Style TargetType="Frame">
<Setter Property="HasShadow" Value="False" /> <Setter Property="HasShadow" Value="False" />
<Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" /> <Setter Property="CornerRadius" Value="0" />
<Setter Property="CornerRadius" Value="8" /> <Setter Property="Padding" Value="0" />
</Style> </Style>
<Style TargetType="ImageButton"> <Style TargetType="ImageButton">
@ -407,7 +407,6 @@
<Style TargetType="Image" x:Key="Stars"> <Style TargetType="Image" x:Key="Stars">
<Setter Property="Source" Value="star.png"/> <Setter Property="Source" Value="star.png"/>
<Setter Property="HorizontalOptions" Value="Start"/> <Setter Property="HorizontalOptions" Value="Start"/>

3
GameAtlas/GameAtlas/Views/PageJeu.xaml
Unescape View File

@ -10,6 +10,9 @@
<Grid RowDefinitions="166,*" ColumnDefinitions="30,*,30" Padding="10,20,10,0"> <Grid RowDefinitions="166,*" ColumnDefinitions="30,*,30" Padding="10,20,10,0">
<Image Source="arrowback" VerticalOptions="Start" WidthRequest="30"> <Image Source="arrowback" VerticalOptions="Start" WidthRequest="30">
<Image.GestureRecognizers>
<TapGestureRecognizer Tapped="Back_Tapped"/>
</Image.GestureRecognizers>
</Image> </Image>
<Border Grid.Row="0" Grid.Column="1" WidthRequest="290" HeightRequest="166" StrokeShape="RoundRectangle 5" VerticalOptions="Start" HorizontalOptions="Center"> <Border Grid.Row="0" Grid.Column="1" WidthRequest="290" HeightRequest="166" StrokeShape="RoundRectangle 5" VerticalOptions="Start" HorizontalOptions="Center">

5
GameAtlas/GameAtlas/Views/PageJeu.xaml.cs
Unescape View File

@ -13,5 +13,8 @@ public partial class PageJeu : ContentPage
InitializeComponent(); InitializeComponent();
} }
async void Back_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
{
await Navigation.PopAsync();
}
} }

4
GameAtlas/GameAtlas/Views/PageProfil.xaml
Unescape View File

@ -82,6 +82,10 @@
</Border.Shadow> </Border.Shadow>
<Frame HasShadow="False" HeightRequest="97.5" CornerRadius="5" IsClippedToBounds="True"> <Frame HasShadow="False" HeightRequest="97.5" CornerRadius="5" IsClippedToBounds="True">
<Image HeightRequest="97.5" Source="{Binding .}" Aspect="AspectFill"/> <Image HeightRequest="97.5" Source="{Binding .}" Aspect="AspectFill"/>
<Frame.GestureRecognizers>
<TapGestureRecognizer Tapped="OnGame_Tapped"/>
</Frame.GestureRecognizers>
</Frame> </Frame>
</Border> </Border>
</DataTemplate> </DataTemplate>

5
GameAtlas/GameAtlas/Views/PageProfil.xaml.cs
Unescape View File

@ -6,4 +6,9 @@ public partial class PageProfil : ContentPage
{ {
InitializeComponent(); InitializeComponent();
} }
async void OnGame_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
{
await Shell.Current.GoToAsync(nameof(DetailPage));
}
} }

10
GameAtlas/GameAtlas/obj/GameAtlas.csproj.nuget.dgspec.json
Unescape View File

@ -1,17 +1,17 @@
{ {
"format": 1, "format": 1,
"restore": { "restore": {
"C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM\\GameAtlas\\GameAtlas\\GameAtlas.csproj": {} "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD\\GameAtlas\\GameAtlas\\GameAtlas.csproj": {}
}, },
"projects": { "projects": {
"C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM\\GameAtlas\\GameAtlas\\GameAtlas.csproj": { "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD\\GameAtlas\\GameAtlas\\GameAtlas.csproj": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM\\GameAtlas\\GameAtlas\\GameAtlas.csproj", "projectUniqueName": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD\\GameAtlas\\GameAtlas\\GameAtlas.csproj",
"projectName": "GameAtlas", "projectName": "GameAtlas",
"projectPath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM\\GameAtlas\\GameAtlas\\GameAtlas.csproj", "projectPath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD\\GameAtlas\\GameAtlas\\GameAtlas.csproj",
"packagesPath": "C:\\Users\\remib\\.nuget\\packages\\", "packagesPath": "C:\\Users\\remib\\.nuget\\packages\\",
"outputPath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM\\GameAtlas\\GameAtlas\\obj\\", "outputPath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD\\GameAtlas\\GameAtlas\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"crossTargeting": true, "crossTargeting": true,
"fallbackFolders": [ "fallbackFolders": [

6
GameAtlas/GameAtlas/obj/project.assets.json
Unescape View File

@ -25006,11 +25006,11 @@
"project": { "project": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM\\GameAtlas\\GameAtlas\\GameAtlas.csproj", "projectUniqueName": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD\\GameAtlas\\GameAtlas\\GameAtlas.csproj",
"projectName": "GameAtlas", "projectName": "GameAtlas",
"projectPath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM\\GameAtlas\\GameAtlas\\GameAtlas.csproj", "projectPath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD\\GameAtlas\\GameAtlas\\GameAtlas.csproj",
"packagesPath": "C:\\Users\\remib\\.nuget\\packages\\", "packagesPath": "C:\\Users\\remib\\.nuget\\packages\\",
"outputPath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM\\GameAtlas\\GameAtlas\\obj\\", "outputPath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD\\GameAtlas\\GameAtlas\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"crossTargeting": true, "crossTargeting": true,
"fallbackFolders": [ "fallbackFolders": [

4
GameAtlas/GameAtlas/obj/project.nuget.cache
Unescape View File

@ -1,8 +1,8 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "vMdiSc1+yYZdXqHO8vvS1Aw4ovTk9USRxvEIpx0dZVsodI8erEF3LkRbetynExN+6SXraNXLDCnd3LmsAqg4Pg==", "dgSpecHash": "Y3w0Y+Ey7hhZQ692A3sWO4Tvq09uqTQ0u8HSHrvAkqfCxRFvhorB4m2e447JPeTRbl778JhvAgvs+G5e0QiOgg==",
"success": true, "success": true,
"projectFilePath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM\\GameAtlas\\GameAtlas\\GameAtlas.csproj", "projectFilePath": "C:\\Users\\remib\\OneDrive\\Bureau\\1A\\SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD\\GameAtlas\\GameAtlas\\GameAtlas.csproj",
"expectedPackageFiles": [ "expectedPackageFiles": [
"C:\\Users\\remib\\.nuget\\packages\\communitytoolkit.maui\\5.0.0\\communitytoolkit.maui.5.0.0.nupkg.sha512", "C:\\Users\\remib\\.nuget\\packages\\communitytoolkit.maui\\5.0.0\\communitytoolkit.maui.5.0.0.nupkg.sha512",
"C:\\Users\\remib\\.nuget\\packages\\communitytoolkit.maui.core\\5.0.0\\communitytoolkit.maui.core.5.0.0.nupkg.sha512", "C:\\Users\\remib\\.nuget\\packages\\communitytoolkit.maui.core\\5.0.0\\communitytoolkit.maui.core.5.0.0.nupkg.sha512",

Write Preview
Loading…
Cancel
Save