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

Merge pull request 'Correctif de bugs de build. + AppIcon et SplashScreen perso' (#13) from remi into master

Browse Source 
Reviewed-on: remi.lavergne/SAE2.01-IHM_-_Remi_LAVERGNE_-_Yvan_CALATAYUD#13

Auto-Approuvé
pull/15/head
Rémi LAVERGNE 2 years ago
parent 5f8c09a2b4 8b697484e7
commit 7aef0fba3a
13 changed files with 68 additions and 60 deletions
Show Stats Download Patch File Download Diff File

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

Binary file not shown.

63
GameAtlas/GameAtlas/AppShell.xaml
Unescape View File

@ -4,38 +4,39 @@
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:views="clr-namespace:GameAtlas.Views"
Shell.FlyoutBehavior="Disabled">
Shell.FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False">
<Shell.Resources>
<ResourceDictionary>
<Style x:Key="BaseStyle" TargetType="Element">
<Setter Property="Shell.ForegroundColor" Value="{StaticResource Gray1000}" />
<Setter Property="Shell.UnselectedColor" Value="{StaticResource Gray300}" />
<Setter Property="Shell.TabBarBackgroundColor" Value="{StaticResource Gray1000}" />
<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>
<TabBar>
<ShellContent
Title="Accueil"
Icon="home"
ContentTemplate="{DataTemplate views:PageAcceuil}"
Route="PageAccueil" />
<ShellContent
Title="Parcourir"
Icon="console"
ContentTemplate="{DataTemplate views:PageParcourir}"
Route="PageParcourir" />
<ShellContent
Title="Profil"
Icon="account"
ContentTemplate="{DataTemplate views:PageProfil}"
Route="PageProfil" />
<Shell.Resources>
<ResourceDictionary>
<Style x:Key="BaseStyle" TargetType="Element">
<Setter Property="Shell.ForegroundColor" Value="{StaticResource Gray1000}" />
<Setter Property="Shell.UnselectedColor" Value="{StaticResource Gray300}" />
<Setter Property="Shell.TabBarBackgroundColor" Value="{StaticResource Gray1000}" />
<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>
<TabBar>
<ShellContent
Title="Accueil"
Icon="home"
ContentTemplate="{DataTemplate views:PageAcceuil}"
Route="PageAccueil" />
<ShellContent
Title="Parcourir"
Icon="console"
ContentTemplate="{DataTemplate views:PageParcourir}"
Route="PageParcourir" />
<ShellContent
Title="Profil"
Icon="account"
ContentTemplate="{DataTemplate views:PageProfil}"
Route="PageProfil" />
</TabBar>

8
GameAtlas/GameAtlas/AppShell.xaml.cs
Unescape View File

@ -1,9 +1,13 @@
namespace GameAtlas;
using GameAtlas.Views;
namespace GameAtlas;
public partial class AppShell : Shell
{
public AppShell()
{
InitializeComponent();
}
Routing.RegisterRoute(nameof(PageJeu), typeof(PageJeu));
}
}

13
GameAtlas/GameAtlas/GameAtlas.csproj
Unescape View File

@ -1,6 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<UseShortFileNames>True</UseShortFileNames>
<IntermediateOutputPath>C:\Apps\GameAtlas</IntermediateOutputPath>
<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
@ -15,7 +20,7 @@
<ApplicationTitle>GameAtlas</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.gameatlas</ApplicationId>
<ApplicationId>com.iut-clermont-auvergne.gameatlas</ApplicationId>
<ApplicationIdGuid>a4373575-ecb5-4bcd-9c57-7366fb6946a7</ApplicationIdGuid>
<!-- Versions -->
@ -32,10 +37,10 @@
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<MauiIcon Include="Resources\AppIcon\appicon.png" />
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
<MauiSplashScreen Include="Resources\Splash\logosplash.png" Color="#312F2F" />
<!-- Images -->
<MauiImage Include="Resources\Images\*" />

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

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

BIN
GameAtlas/GameAtlas/Resources/AppIcon/appicon.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 561 KiB

4
GameAtlas/GameAtlas/Resources/AppIcon/appicon.svg
Unescape View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg">
<rect x="0" y="0" width="456" height="456" fill="#512BD4" />
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 231 B

8
GameAtlas/GameAtlas/Resources/AppIcon/appiconfg.svg
Unescape View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
GameAtlas/GameAtlas/Resources/Splash/logosplash.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 MiB

8
GameAtlas/GameAtlas/Resources/Splash/splash.svg
Unescape View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

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

@ -6,6 +6,15 @@
<Grid x:Name="outerGrid">
<Grid.Background>
<LinearGradientBrush EndPoint="1,0">
<GradientStop Color="#DFE4FF"
Offset="0.1" />
<GradientStop Color="#FDF7E6"
Offset="1.0" />
</LinearGradientBrush>
</Grid.Background>
<ScrollView>
<Grid RowDefinitions="166,*" ColumnDefinitions="30,*,30" Padding="10,20,10,0">

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

@ -5,7 +5,16 @@
Title="PageProfil">
<Grid x:Name="outerGrid" RowDefinitions="50,35,*" ColumnDefinitions="70,*,70" ColumnSpacing="15" RowSpacing="30" Padding="10,20,10,0">
<Grid.Background>
<LinearGradientBrush EndPoint="1,0">
<GradientStop Color="#DFE4FF"
Offset="0.1" />
<GradientStop Color="#FDF7E6"
Offset="1.0" />
</LinearGradientBrush>
</Grid.Background>
<Grid RowDefinitions="50" ColumnDefinitions="50" HorizontalOptions="End" >
<Frame Grid.Row="0" WidthRequest="50" HeightRequest="50" CornerRadius="25" VerticalOptions="Start" >
<Frame.Background>

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

@ -9,6 +9,6 @@ public partial class PageProfil : ContentPage
async void OnGame_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
{
await Shell.Current.GoToAsync(nameof(DetailPage));
await Shell.Current.GoToAsync(nameof(PageJeu));
}
}
Write Preview
Loading…
Cancel
Save