jeremy.mouyon
/
sae201_qwirkle
3
5
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Update : set players / styles / appshelle / main page / maui progm for font / nugets.. Delete : old font / old image. Add : Style / new logo transparent qwirkle

Browse Source
test_old_branch
Jérémy Mouyon 1 year ago
parent 62539a0f5e
commit 34ff7a9084
13 changed files with 139 additions and 89 deletions
Show Stats Download Patch File Download Diff File

53
Qwirkle/Qwirkle/AppShell.xaml
Unescape View File

@ -5,32 +5,31 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Qwirkle" xmlns:local="clr-namespace:Qwirkle"
xmlns:localPages="clr-namespace:Qwirkle.Pages" xmlns:localPages="clr-namespace:Qwirkle.Pages"
Shell.FlyoutBehavior="Disabled" Shell.FlyoutBehavior="Flyout"
Title="Qwirkle"> Title="Qwirkle">
<TabBar>
<ShellContent <ShellContent
Title="Home" ContentTemplate="{DataTemplate local:MainPage}"
ContentTemplate="{DataTemplate local:MainPage}" Route="MainPage" />
Route="MainPage" /> <ShellContent
<ShellContent Title="SetPlayers"
Title="SetPlayers" ContentTemplate="{DataTemplate localPages:SetPlayers}"
ContentTemplate="{DataTemplate localPages:SetPlayers}" Route="SetPlayers" />
Route="SetPlayers" /> <ShellContent
<ShellContent Title="Gameboard"
Title="Gameboard" ContentTemplate="{DataTemplate localPages:Gameboard}"
ContentTemplate="{DataTemplate localPages:Gameboard}" Route="Gameboard" />
Route="Gameboard" /> <ShellContent
<ShellContent Title="Leaderboard"
Title="Leaderboard" ContentTemplate="{DataTemplate localPages:Leaderboard}"
ContentTemplate="{DataTemplate localPages:Leaderboard}" Route="Leaderboard" />
Route="Leaderboard" /> <ShellContent
<ShellContent Title="Scoreboard"
Title="Scoreboard" ContentTemplate="{DataTemplate localPages:Scoreboard}"
ContentTemplate="{DataTemplate localPages:Scoreboard}" Route="Scoreboard" />
Route="Scoreboard" /> <ShellContent
<ShellContent Title="Settings"
Title="Settings" ContentTemplate="{DataTemplate localPages:Settings}"
ContentTemplate="{DataTemplate localPages:Settings}" Route="Settings" />
Route="Settings" />
</TabBar>
</Shell> </Shell>

57
Qwirkle/Qwirkle/MainPage.xaml
Unescape View File

@ -10,45 +10,82 @@
<Label <Label
Text="QWIRKLE" Text="QWIRKLE"
FontSize="Header" FontSize="100"
FontFamily="DiloWorld"
HorizontalTextAlignment="Center" HorizontalTextAlignment="Center"
/> />
<Image <Image
Source="qwirklelogo.jpeg" Source="qwirklelogo.png"
HeightRequest="185" HeightRequest="300"
Aspect="AspectFit" Aspect="AspectFit"
/> />
<Button <Border Stroke="Transparent">
<Button
WidthRequest="200"
Text="Play" Text="Play"
HorizontalOptions="Center" HorizontalOptions="Center"
/> />
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Button <Border Stroke="Transparent">
<Button
WidthRequest="200"
Text="Continue" Text="Continue"
HorizontalOptions="Center" HorizontalOptions="Center"
/> />
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Button <Border Stroke="Transparent">
<Button
WidthRequest="200"
Text="Leaderboard" Text="Leaderboard"
HorizontalOptions="Center" HorizontalOptions="Center"
/> />
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Button <Border Stroke="Transparent">
<Button
WidthRequest="200"
Text="Rules" Text="Rules"
HorizontalOptions="Center" HorizontalOptions="Center"
/> />
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Button <Border Stroke="Transparent">
<Button
WidthRequest="200"
Text="Settings" Text="Settings"
HorizontalOptions="Center" HorizontalOptions="Center"
/> />
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Button <Border Stroke="Transparent">
<Button
WidthRequest="200"
Text="Credits" Text="Credits"
HorizontalOptions="Center" HorizontalOptions="Center"
/> />
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
</VerticalStackLayout> </VerticalStackLayout>

6
Qwirkle/Qwirkle/MauiProgram.cs
Unescape View File

@ -11,8 +11,10 @@ namespace Qwirkle
.UseMauiApp<App>() .UseMauiApp<App>()
.ConfigureFonts(fonts => .ConfigureFonts(fonts =>
{ {
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); //fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); //fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
fonts.AddFont("DiloWorld.ttf", "DiloWorld");
fonts.AddFont("Lexend-Medium.ttf", "Lexend-Meduim");
}); });
#if DEBUG #if DEBUG

68
Qwirkle/Qwirkle/Pages/SetPlayers.xaml
Unescape View File

@ -3,48 +3,50 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Qwirkle.Pages.SetPlayers" x:Class="Qwirkle.Pages.SetPlayers"
Title="SetPlayers"> Title="SetPlayers">
<VerticalStackLayout> <ScrollView>
<VerticalStackLayout>
<Label
Text="SetPlayers" <Label
FontSize="51" Text="SetPlayers"
VerticalOptions="Center" FontSize="51"
HorizontalOptions="Center" /> VerticalOptions="Center"
HorizontalOptions="Center" />
<Label <Label
Text="Players 1" Text="Players 1"
FontSize="20" FontSize="20"
HorizontalOptions="Start" /> HorizontalOptions="Start" />
<Entry Text="Entry tag of player1" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/> <Entry Text="Entry tag of player1" TextColor="Gray" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
<Label <Label
Text="Players 2" Text="Players 2"
FontSize="20" FontSize="20"
HorizontalOptions="Start" /> HorizontalOptions="Start" />
<Entry Text="Entry tag of player2" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/> <Entry Text="Entry tag of player2" TextColor="Gray" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
<Label <Label
Text="Players 3" Text="Players 3"
FontSize="20" FontSize="20"
HorizontalOptions="Start" /> HorizontalOptions="Start" />
<Entry Text="Entry tag of player3" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/> <Entry Text="Entry tag of player3" TextColor="Gray" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
<Label <Label
Text="Players 4" Text="Players 4"
FontSize="20" FontSize="20"
HorizontalOptions="Start" /> HorizontalOptions="Start" />
<Entry Text="Entry tag of player4" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/> <Entry Text="Entry tag of player4" TextColor="Gray" HorizontalOptions="Start" MinimumWidthRequest="200" Margin="10"/>
<Button Text="Confirm" <Button Text="Confirm"
Margin="200" Margin="200"
HorizontalOptions="Center" HorizontalOptions="Center"
VerticalOptions="End" VerticalOptions="End"
/> />
</VerticalStackLayout> </VerticalStackLayout>
</ScrollView>
</ContentPage> </ContentPage>

6
Qwirkle/Qwirkle/Qwirkle.csproj
Unescape View File

@ -56,6 +56,12 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" /> <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Remove="Resources\Fonts\DiloWorld.ttf" />
<None Remove="Resources\Fonts\Lexend-Medium.ttf" />
<None Remove="Resources\Images\qwirklelogo.png" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" /> <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" /> <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />

BIN
Qwirkle/Qwirkle/Resources/Fonts/DiloWorld.ttf
View File

Binary file not shown.

BIN
Qwirkle/Qwirkle/Resources/Fonts/Lexend-Medium.ttf
View File

Binary file not shown.

BIN
Qwirkle/Qwirkle/Resources/Fonts/OpenSans-Regular.ttf
View File

Binary file not shown.

BIN
Qwirkle/Qwirkle/Resources/Fonts/OpenSans-Semibold.ttf
View File

Binary file not shown.

BIN
Qwirkle/Qwirkle/Resources/Images/dotnet_bot.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 89 KiB

BIN
Qwirkle/Qwirkle/Resources/Images/qwirklelogo.jpeg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 55 KiB

BIN
Qwirkle/Qwirkle/Resources/Images/qwirklelogo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 294 KiB

38
Qwirkle/Qwirkle/Resources/Styles/Styles.xaml
Unescape View File

@ -26,8 +26,8 @@
<Style TargetType="Button"> <Style TargetType="Button">
<Setter Property="TextColor" Value="Black" /> <Setter Property="TextColor" Value="Black" />
<Setter Property="BackgroundColor" Value="White" /> <Setter Property="BackgroundColor" Value="White" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="Lexend-Medium"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="25"/>
<Setter Property="BorderWidth" Value="0"/> <Setter Property="BorderWidth" Value="0"/>
<Setter Property="CornerRadius" Value="8"/> <Setter Property="CornerRadius" Value="8"/>
<Setter Property="Padding" Value="14,10"/> <Setter Property="Padding" Value="14,10"/>
@ -35,15 +35,19 @@
<Setter Property="MinimumWidthRequest" Value="44"/> <Setter Property="MinimumWidthRequest" Value="44"/>
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup>
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal">
<VisualState x:Name="Disabled">
<VisualState.Setters> <VisualState.Setters>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" /> <Setter Property="Scale"
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" /> Value="1" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Property="Scale"
Value="1.05" />
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="PointerOver" />
</VisualStateGroup> </VisualStateGroup>
</VisualStateGroupList> </VisualStateGroupList>
</Setter> </Setter>
@ -70,7 +74,7 @@
<Style TargetType="DatePicker"> <Style TargetType="DatePicker">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="Lexend-Meduim"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
<Setter Property="MinimumHeightRequest" Value="44"/> <Setter Property="MinimumHeightRequest" Value="44"/>
<Setter Property="MinimumWidthRequest" Value="44"/> <Setter Property="MinimumWidthRequest" Value="44"/>
@ -91,7 +95,7 @@
<Style TargetType="Editor"> <Style TargetType="Editor">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="Lexend-Meduim"/>
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" /> <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
<Setter Property="MinimumHeightRequest" Value="44"/> <Setter Property="MinimumHeightRequest" Value="44"/>
@ -113,7 +117,7 @@
<Style TargetType="Entry"> <Style TargetType="Entry">
<Setter Property="TextColor" Value="Black" /> <Setter Property="TextColor" Value="Black" />
<Setter Property="BackgroundColor" Value="White" /> <Setter Property="BackgroundColor" Value="White" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="Lexend-Meduim"/>
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="PlaceholderColor" Value="Red" /> <Setter Property="PlaceholderColor" Value="Red" />
<Setter Property="MinimumHeightRequest" Value="44"/> <Setter Property="MinimumHeightRequest" Value="44"/>
@ -163,7 +167,7 @@
<Style TargetType="Label"> <Style TargetType="Label">
<Setter Property="TextColor" Value="DarkSlateGrey" /> <Setter Property="TextColor" Value="DarkSlateGrey" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular" /> <Setter Property="FontFamily" Value="Lexend-Meduim" />
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
@ -206,7 +210,7 @@
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
<Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" /> <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="Lexend-Meduim"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
<Setter Property="MinimumHeightRequest" Value="44"/> <Setter Property="MinimumHeightRequest" Value="44"/>
<Setter Property="MinimumWidthRequest" Value="44"/> <Setter Property="MinimumWidthRequest" Value="44"/>
@ -244,7 +248,7 @@
<Style TargetType="RadioButton"> <Style TargetType="RadioButton">
<Setter Property="BackgroundColor" Value="Transparent"/> <Setter Property="BackgroundColor" Value="Transparent"/>
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="Lexend-Meduim"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
<Setter Property="MinimumHeightRequest" Value="44"/> <Setter Property="MinimumHeightRequest" Value="44"/>
<Setter Property="MinimumWidthRequest" Value="44"/> <Setter Property="MinimumWidthRequest" Value="44"/>
@ -271,7 +275,7 @@
<Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" /> <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
<Setter Property="CancelButtonColor" Value="{StaticResource Gray500}" /> <Setter Property="CancelButtonColor" Value="{StaticResource Gray500}" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular" /> <Setter Property="FontFamily" Value="Lexend-Meduim" />
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="MinimumHeightRequest" Value="44"/> <Setter Property="MinimumHeightRequest" Value="44"/>
<Setter Property="MinimumWidthRequest" Value="44"/> <Setter Property="MinimumWidthRequest" Value="44"/>
@ -294,7 +298,7 @@
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
<Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" /> <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
<Setter Property="BackgroundColor" Value="Transparent" /> <Setter Property="BackgroundColor" Value="Transparent" />
<Setter Property="FontFamily" Value="OpenSansRegular" /> <Setter Property="FontFamily" Value="Lexend-Meduim" />
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
@ -366,7 +370,7 @@
<Style TargetType="TimePicker"> <Style TargetType="TimePicker">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" /> <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
<Setter Property="BackgroundColor" Value="Transparent"/> <Setter Property="BackgroundColor" Value="Transparent"/>
<Setter Property="FontFamily" Value="OpenSansRegular"/> <Setter Property="FontFamily" Value="Lexend-Meduim"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
<Setter Property="MinimumHeightRequest" Value="44"/> <Setter Property="MinimumHeightRequest" Value="44"/>
<Setter Property="MinimumWidthRequest" Value="44"/> <Setter Property="MinimumWidthRequest" Value="44"/>

Write Preview
Loading…
Cancel
Save