ALL PAGES OPTI FULL (jules tu sera content) / = view

test_old_branch
Jérémy Mouyon 1 year ago
parent 1d23538ebc
commit c1b71c9d80

@ -20,62 +20,19 @@
Aspect="AspectFit" Aspect="AspectFit"
/> />
<!-- Ci dessous, la content view qu'il faudra binder quand on sera faire--> <!-- Play / Continue / Leaderboard / Rules / Settings / Credits -->
<controls:ButtonShadow></controls:ButtonShadow>
<Border Stroke="Transparent"> <controls:ButtonShadow></controls:ButtonShadow>
<Button
Text="Play"
Style="{StaticResource MainButton}"/>
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Border Stroke="Transparent"> <controls:ButtonShadow></controls:ButtonShadow>
<Button
Text="Continue"
Style="{StaticResource MainButton}"/>
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Border Stroke="Transparent"> <controls:ButtonShadow></controls:ButtonShadow>
<Button
Text="Leaderboard"
Style="{StaticResource MainButton}"/>
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Border Stroke="Transparent"> <controls:ButtonShadow></controls:ButtonShadow>
<Button
Text="Rules"
Style="{StaticResource MainButton}"/>
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Border Stroke="Transparent"> <controls:ButtonShadow></controls:ButtonShadow>
<Button
Text="Settings"
Style="{StaticResource MainButton}"/>
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
<Border Stroke="Transparent">
<Button
Text="Credits"
Style="{StaticResource MainButton}"/>
<Border.Shadow>
<Shadow></Shadow>
</Border.Shadow>
</Border>
</VerticalStackLayout> </VerticalStackLayout>

@ -6,8 +6,7 @@
Title="Credits"> Title="Credits">
<ScrollView> <ScrollView>
<VerticalStackLayout> <VerticalStackLayout>
<Grid ColumnDefinitions="*, 4*,*" <Grid Style="{StaticResource GridMain}">
Margin="10, 0">
<controls:GoBack></controls:GoBack> <controls:GoBack></controls:GoBack>
<Label Text="Credits" <Label Text="Credits"
Style="{StaticResource Title}"/> Style="{StaticResource Title}"/>
@ -31,9 +30,7 @@
Style="{StaticResource SubTitle}"/> Style="{StaticResource SubTitle}"/>
<Image <Image
Source="uca.png" Source="uca.png"
HeightRequest="300" Style="{StaticResource Logo}"/>
Aspect="AspectFit"
/>

@ -2,6 +2,7 @@
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentPage 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"
x:Class="Qwirkle.Pages.Gameboard" x:Class="Qwirkle.Pages.Gameboard"
xmlns:controls="clr-namespace:Qwirkle.Views"
Title="Gameboard"> Title="Gameboard">
<VerticalStackLayout MaximumHeightRequest="1080" <VerticalStackLayout MaximumHeightRequest="1080"
MaximumWidthRequest="1920"> MaximumWidthRequest="1920">

@ -7,27 +7,16 @@
<ScrollView> <ScrollView>
<VerticalStackLayout Spacing="25" Padding="5, 5, 5, 10"> <VerticalStackLayout Spacing="25" Padding="5, 5, 5, 10">
<Grid ColumnDefinitions="*, 4*,*" <Grid Style="{StaticResource GridMain}">
Margin="10, 0">
<controls:GoBack></controls:GoBack> <controls:GoBack></controls:GoBack>
<Label FontSize="Header" <Label Text="Leaderboard"
Grid.Column="1" Style="{StaticResource Title}"/>
Grid.Row="0"
FontAttributes="Bold"
HorizontalOptions="Center"
Padding="50, 10"
Text="Leaderboard"/>
</Grid> </Grid>
<Border Stroke="{StaticResource Gray800}" <Border Style="{StaticResource TabBorder}">
StrokeThickness="4"
Margin="10, 0">
<Border.Shadow> <Border.Shadow>
<Shadow Brush="Black" <Shadow/>
Offset="5, 5"
Radius="10"
Opacity="0.6"/>
</Border.Shadow> </Border.Shadow>
<Border.StrokeShape> <Border.StrokeShape>
<RoundRectangle CornerRadius="3"/> <RoundRectangle CornerRadius="3"/>
@ -35,57 +24,51 @@
<VerticalStackLayout> <VerticalStackLayout>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:LeaderboardLine></controls:LeaderboardLine> <controls:LeaderboardLine></controls:LeaderboardLine>
</VerticalStackLayout> </VerticalStackLayout>
</Border> </Border>
<controls:TileSquare/>
<controls:TileRhombus/>
<controls:TileCircle/>
<controls:TileStar/>
<controls:TileShuriken/>
<controls:TileClub/>
</VerticalStackLayout> </VerticalStackLayout>

@ -6,27 +6,18 @@
Title="Scoreboard"> Title="Scoreboard">
<ScrollView> <ScrollView>
<VerticalStackLayout Spacing="25" Padding="5, 5, 5, 10"> <VerticalStackLayout Spacing="25" Padding="5, 5, 5, 10">
<Grid ColumnDefinitions="*, 4*,*"
Margin="10, 0"> <Grid Style="{StaticResource GridMain}">
<controls:GoBack></controls:GoBack> <controls:GoBack></controls:GoBack>
<Label FontSize="Header" <Label Text="Scoreboard"
Grid.Column="1" Style="{StaticResource Title}"
Grid.Row="0" />
FontAttributes="Bold"
HorizontalOptions="Center"
Padding="50, 10"
Text="Scoreboard"/>
</Grid> </Grid>
<Border Stroke="{StaticResource Gray800}" <Border Style="{StaticResource TabBorder}">
StrokeThickness="4"
Margin="10, 0">
<Border.Shadow> <Border.Shadow>
<Shadow Brush="Black" <Shadow/>
Offset="5, 5"
Radius="10"
Opacity="0.6"/>
</Border.Shadow> </Border.Shadow>
<Border.StrokeShape> <Border.StrokeShape>
<RoundRectangle CornerRadius="3"/> <RoundRectangle CornerRadius="3"/>
@ -34,19 +25,19 @@
<VerticalStackLayout> <VerticalStackLayout>
<controls:ScoreboardLine></controls:ScoreboardLine> <controls:ScoreboardLine></controls:ScoreboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:ScoreboardLine></controls:ScoreboardLine> <controls:ScoreboardLine></controls:ScoreboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:ScoreboardLine></controls:ScoreboardLine> <controls:ScoreboardLine></controls:ScoreboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:ScoreboardLine></controls:ScoreboardLine> <controls:ScoreboardLine></controls:ScoreboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
<controls:ScoreboardLine></controls:ScoreboardLine> <controls:ScoreboardLine></controls:ScoreboardLine>
<Rectangle HeightRequest="2" BackgroundColor="Black"/> <Rectangle/>
</VerticalStackLayout> </VerticalStackLayout>
</Border> </Border>

@ -2,6 +2,7 @@
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui" <ContentPage 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"
x:Class="Qwirkle.Pages.SetPlayers" x:Class="Qwirkle.Pages.SetPlayers"
xmlns:controls="clr-namespace:Qwirkle.Views"
Title="SetPlayers"> Title="SetPlayers">
<ScrollView> <ScrollView>
<VerticalStackLayout> <VerticalStackLayout>
@ -10,29 +11,13 @@
Text="SetPlayers" Text="SetPlayers"
Style="{StaticResource Title}"/> Style="{StaticResource Title}"/>
<Label <controls:EntryPlayer></controls:EntryPlayer>
Text="Players 1"
Style="{StaticResource ContentStart}"/>
<Entry Text="Entry tag of player1"/>
<Label
Text="Players 2"
Style="{StaticResource ContentStart}"/>
<Entry Text="Entry tag of player2"/> <controls:EntryPlayer></controls:EntryPlayer>
<Label <controls:EntryPlayer></controls:EntryPlayer>
Text="Players 3"
Style="{StaticResource ContentStart}"/>
<Entry Text="Entry tag of player3"/>
<Label
Text="Players 4"
Style="{StaticResource ContentStart}"/>
<Entry Text="Entry tag of player4"/> <controls:EntryPlayer></controls:EntryPlayer>
<Button Text="Confirm" <Button Text="Confirm"

@ -7,16 +7,10 @@
<ScrollView> <ScrollView>
<VerticalStackLayout Spacing="25" Padding="5"> <VerticalStackLayout Spacing="25" Padding="5">
<Grid ColumnDefinitions="*, 4*,*" <Grid Style="{StaticResource GridMain}">
Margin="10, 0">
<controls:GoBack></controls:GoBack> <controls:GoBack></controls:GoBack>
<Label FontSize="Header" <Label Text="Settings"
Grid.Column="1" Style="{StaticResource Title}"/>
Grid.Row="0"
FontAttributes="Bold"
HorizontalOptions="Center"
Padding="50, 10"
Text="Settings"/>
</Grid> </Grid>
<VerticalStackLayout> <VerticalStackLayout>
@ -28,27 +22,16 @@
HorizontalOptions="Center"> HorizontalOptions="Center">
<Label <Label
Text="Sound" Text="Sound"
VerticalOptions="Start" Style="{StaticResource ContentSetting}"
HorizontalOptions="Start" />
FontAttributes="Bold"
FontSize="20"
Margin="10"/>
<Switch <Switch/>
IsToggled="True"
HorizontalOptions="Center"
ThumbColor="AliceBlue"/>
</HorizontalStackLayout> </HorizontalStackLayout>
<Slider Value="5" <Slider Style="{StaticResource SliderSound}"/>
Grid.Row="0"
Grid.Column="2"
WidthRequest="500"
HorizontalOptions="Center"
VerticalOptions="Center"/>
</Grid> </Grid>
<Rectangle HeightRequest="2" BackgroundColor="Black" /> <Rectangle></Rectangle>
</VerticalStackLayout> </VerticalStackLayout>
</VerticalStackLayout> </VerticalStackLayout>

@ -118,6 +118,9 @@
<MauiXaml Update="Views\ButtonShadow.xaml"> <MauiXaml Update="Views\ButtonShadow.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>
<MauiXaml Update="Views\EntryPlayer.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\GoBack.xaml"> <MauiXaml Update="Views\GoBack.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</MauiXaml> </MauiXaml>

@ -23,6 +23,12 @@
<Setter Property="Stroke" Value="Transparent" /> <Setter Property="Stroke" Value="Transparent" />
</Style> </Style>
<Style TargetType="Border" x:Key="TabBorder">
<Setter Property="Stroke" Value="{StaticResource Gray800}" />
<Setter Property="StrokeThickness" Value="4" />
<Setter Property="Margin" Value="10, 0" />
</Style>
<Style TargetType="BoxView"> <Style TargetType="BoxView">
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" /> <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
</Style> </Style>
@ -75,6 +81,11 @@
<Setter Property="VerticalOptions" Value="End"/> <Setter Property="VerticalOptions" Value="End"/>
</Style> </Style>
<Style TargetType="Image" x:Key="Logo">
<Setter Property="HeightRequest" Value="300" />
<Setter Property="Aspect" Value="AspectFit"/>
</Style>
<Style TargetType="CheckBox"> <Style TargetType="CheckBox">
<Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" /> <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
<Setter Property="MinimumHeightRequest" Value="44"/> <Setter Property="MinimumHeightRequest" Value="44"/>
@ -236,6 +247,7 @@
<Setter Property="FontAttributes" Value="Bold" /> <Setter Property="FontAttributes" Value="Bold" />
</Style> </Style>
<Style TargetType="Label" x:Key="ContentCenter"> <Style TargetType="Label" x:Key="ContentCenter">
<Setter Property="TextColor" Value="Black" /> <Setter Property="TextColor" Value="Black" />
<Setter Property="FontSize" Value="20" /> <Setter Property="FontSize" Value="20" />
@ -248,6 +260,24 @@
<Setter Property="HorizontalOptions" Value="Start" /> <Setter Property="HorizontalOptions" Value="Start" />
</Style> </Style>
<Style TargetType="Label" x:Key="ContentSetting">
<Setter Property="TextColor" Value="Black" />
<Setter Property="FontSize" Value="20" />
<Setter Property="HorizontalOptions" Value="Start" />
<Setter Property="VerticalOptions" Value="Start" />
<Setter Property="FontAttributes" Value="Bold" />
<Setter Property="Margin" Value="10" />
</Style>
<Style TargetType="Label" x:Key="ContentTab">
<Setter Property="Grid.Row" Value="0" />
<Setter Property="FontSize" Value="Medium" />
<Setter Property="Padding" Value="5,0" />
<Setter Property="VerticalOptions" Value="Center" />
<Setter Property="FontAttributes" Value="Bold" />
<Setter Property="TextColor" Value="DarkSlateGrey" />
</Style>
<Style TargetType="ListView"> <Style TargetType="ListView">
<Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" /> <Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
<Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" /> <Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
@ -363,10 +393,10 @@
</Style> </Style>
<Style TargetType="Shadow"> <Style TargetType="Shadow">
<Setter Property="Radius" Value="15" /> <Setter Property="Radius" Value="10" />
<Setter Property="Opacity" Value="0.5" /> <Setter Property="Opacity" Value="0.6" />
<Setter Property="Brush" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" /> <Setter Property="Brush" Value="Black" />
<Setter Property="Offset" Value="10,10" /> <Setter Property="Offset" Value="5, 5" />
</Style> </Style>
<Style TargetType="Slider"> <Style TargetType="Slider">
@ -389,11 +419,24 @@
</Setter> </Setter>
</Style> </Style>
<Style TargetType="Slider" x:Key="SliderSound">
<Setter Property="Value" Value="5" />
<Setter Property="Grid.Row" Value="0" />
<Setter Property="Grid.Column" Value="2" />
<Setter Property="WidthRequest" Value="500" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="VerticalOptions" Value="Center" />
</Style>
<Style TargetType="SwipeItem"> <Style TargetType="SwipeItem">
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" /> <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
</Style> </Style>
<Style TargetType="Switch"> <Style TargetType="Switch">
<Setter Property="IsToggled" Value="True" />
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="ThumbColor" Value="AliceBlue" />
<Setter Property="VisualStateManager.VisualStateGroups"> <Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList> <VisualStateGroupList>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
@ -473,4 +516,20 @@
<Style TargetType="ScrollView" > <Style TargetType="ScrollView" >
<Setter Property="BackgroundColor" Value="#efca85"/> <Setter Property="BackgroundColor" Value="#efca85"/>
</Style> </Style>
<Style TargetType="Rectangle" >
<Setter Property="HeightRequest" Value="2"/>
<Setter Property="BackgroundColor" Value="Black"/>
</Style>
<Style TargetType="Rectangle" x:Key="RectangleTab">
<Setter Property="WidthRequest" Value="2"/>
<Setter Property="BackgroundColor" Value="Black"/>
<Setter Property="Grid.RowSpan" Value="20"/>
</Style>
<Style TargetType="Grid" x:Key="GridMain">
<Setter Property="ColumnDefinitions" Value="*, 4*, *"/>
<Setter Property="Margin" Value="10, 0"/>
</Style>
</ResourceDictionary> </ResourceDictionary>

@ -4,7 +4,7 @@
x:Class="Qwirkle.Views.ButtonShadow"> x:Class="Qwirkle.Views.ButtonShadow">
<Border Stroke="Transparent"> <Border Stroke="Transparent">
<Button <Button
Text="Settings" Text="Example"
Style="{StaticResource MainButton}"/> Style="{StaticResource MainButton}"/>
<Border.Shadow> <Border.Shadow>
<Shadow></Shadow> <Shadow></Shadow>

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="Qwirkle.Views.EntryPlayer">
<VerticalStackLayout Padding="10">
<Label
Text="Players X"
Style="{StaticResource ContentStart}"/>
<Entry Text="Entry tag of player X"/>
</VerticalStackLayout>
</ContentView>

@ -0,0 +1,9 @@
namespace Qwirkle.Views;
public partial class EntryPlayer : ContentView
{
public EntryPlayer()
{
InitializeComponent();
}
}

@ -7,59 +7,33 @@
RowDefinitions="50"> RowDefinitions="50">
<Label <Label
Grid.Row="0"
Grid.Column="0"
FontSize="Medium"
FontAttributes="Bold"
Padding="5, 0"
Text="Player Tag" Text="Player Tag"
TextColor="DarkSlateGrey" Style="{StaticResource ContentTab}"
VerticalOptions="Center"/> />
<Rectangle
<Rectangle WidthRequest="2" Grid.Column="1"/>
Grid.Column="1"
Grid.RowSpan="20"
BackgroundColor="Black"/>
<Label <Label
Grid.Row="0"
Grid.Column="2" Grid.Column="2"
FontSize="Medium"
FontAttributes="Bold"
Padding="5, 0"
Text="Date" Text="Date"
TextColor="DarkSlateGrey" Style="{StaticResource ContentTab}"/>
VerticalOptions="Center"/>
<Rectangle WidthRequest="2" <Rectangle
Grid.Column="3" Grid.Column="3"/>
Grid.RowSpan="20"
BackgroundColor="Black"/>
<Label <Label
Grid.Row="0"
Grid.Column="4" Grid.Column="4"
FontSize="Medium"
FontAttributes="Bold"
Padding="5, 0"
Text="Points" Text="Points"
TextColor="DarkSlateGrey" Style="{StaticResource ContentTab}"/>
VerticalOptions="Center"/>
<Rectangle WidthRequest="2" <Rectangle
Grid.Column="5" Grid.Column="5"/>
Grid.RowSpan="20"
BackgroundColor="Black"/>
<Label <Label
Grid.Row="0"
Grid.Column="6" Grid.Column="6"
FontSize="Medium" Style="{StaticResource ContentTab}"
FontAttributes="Bold"
Padding="5, 0"
Text="Victories" Text="Victories"
TextColor="DarkSlateGrey" />
VerticalOptions="Center"/>
</Grid> </Grid>
</ContentView> </ContentView>
Loading…
Cancel
Save