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

its beautiful now !
continuous-integration/drone/push Build is passing Details

Browse Source
test_old_branch
Jérémy Mouyon 11 months ago
parent 697c2e2e55
commit 4297dd49a8
4 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File

5
Qwirkle/QwirkleViews/AppShell.xaml
Unescape View File

@ -6,8 +6,9 @@
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="Disabled"
Title="Qwirkle" FlyoutBackgroundColor="White"
FlyoutBackgroundColor="White"> IsVisible="False"
>

30
Qwirkle/QwirkleViews/Pages/Gameboard.xaml
Unescape View File

@ -13,7 +13,7 @@
<x:Double x:Key="HorizontalSpacing">1</x:Double> <x:Double x:Key="HorizontalSpacing">1</x:Double>
<toolkit:MultiMathExpressionConverter x:Key="multiMathExpressionConverter" /> <toolkit:MultiMathExpressionConverter x:Key="multiMathExpressionConverter" />
</ContentPage.Resources> </ContentPage.Resources>
<Grid> <Grid BackgroundColor="#efca85">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="4*" /> <RowDefinition Height="4*" />
@ -38,10 +38,25 @@
<Image Source="bag.png"></Image> <Image Source="bag.png"></Image>
</Border> </Border>
<Button HorizontalOptions="Start" Grid.Row="0" Grid.Column="1" Text="Swap" WidthRequest="200" HeightRequest="10" FontSize="20" Margin="20" Clicked="OnButtonSwapClicked"></Button> <Button
HorizontalOptions="Start"
<Button HorizontalOptions="End" Grid.Row="2" Grid.Column="1" Text="Skip / End Turn" WidthRequest="200" HeightRequest="10" FontSize="20" Margin="20" Clicked="OnButtonSkipClicked"></Button> Grid.Row="0" Grid.Column="1"
<Button HorizontalOptions="Start" Grid.Row="2" Grid.Column="1" Text="Settings" WidthRequest="200" HeightRequest="10" FontSize="20" Margin="20" ></Button> Text="Swap"
Clicked="OnButtonSwapClicked"
Style="{StaticResource GameButton}"/>
<Button
HorizontalOptions="End"
Grid.Row="2" Grid.Column="1"
Text="Skip / End Turn" WidthRequest="200"
Clicked="OnButtonSkipClicked"
Style="{StaticResource GameButton}"/>
<Button
HorizontalOptions="Start"
Grid.Row="2" Grid.Column="1"
Text="Settings"
Style="{StaticResource GameButton}"/>
<CollectionView Grid.Row="0" Grid.Column="1" ItemsSource="{Binding PlayerList[0].Tiles}" <CollectionView Grid.Row="0" Grid.Column="1" ItemsSource="{Binding PlayerList[0].Tiles}"
HorizontalOptions="Center" HorizontalOptions="Center"
@ -128,7 +143,8 @@
<ScrollView Grid.Row="1" Grid.Column="1" VerticalOptions="FillAndExpand"> <ScrollView Grid.Row="1" Grid.Column="1" VerticalOptions="FillAndExpand">
<CollectionView ItemsSource="{Binding Board.ReadCells}" <CollectionView ItemsSource="{Binding Board.ReadCells}"
HorizontalOptions="Center" HorizontalOptions="Center"
VerticalOptions="Center" HorizontalScrollBarVisibility="Never" VerticalScrollBarVisibility="Never"> VerticalOptions="Center" HorizontalScrollBarVisibility="Never" VerticalScrollBarVisibility="Never"
>
<CollectionView.HeightRequest> <CollectionView.HeightRequest>
@ -174,7 +190,7 @@
</CollectionView> </CollectionView>
</ScrollView> </ScrollView>
<controls:Scoreboard HorizontalOptions="End" Grid.Row="1" Grid.Column="1" ></controls:Scoreboard> <controls:Scoreboard InputTransparent="True" HorizontalOptions="End" Grid.Row="1" Grid.Column="1" ></controls:Scoreboard>

26
Qwirkle/QwirkleViews/Resources/Styles/Styles.xaml
Unescape View File

@ -81,6 +81,13 @@
<Setter Property="VerticalOptions" Value="End"/> <Setter Property="VerticalOptions" Value="End"/>
</Style> </Style>
<Style TargetType="Button" x:Key="GameButton">
<Setter Property="WidthRequest" Value="200" />
<Setter Property="HeightRequest" Value="10" />
<Setter Property="FontSize" Value="20"/>
<Setter Property="Margin" Value="20"/>
</Style>
<Style TargetType="Image" x:Key="Logo"> <Style TargetType="Image" x:Key="Logo">
<Setter Property="HeightRequest" Value="300" /> <Setter Property="HeightRequest" Value="300" />
<Setter Property="Aspect" Value="AspectFit"/> <Setter Property="Aspect" Value="AspectFit"/>
@ -275,7 +282,7 @@
<Setter Property="Padding" Value="5,0" /> <Setter Property="Padding" Value="5,0" />
<Setter Property="VerticalOptions" Value="Center" /> <Setter Property="VerticalOptions" Value="Center" />
<Setter Property="FontAttributes" Value="Bold" /> <Setter Property="FontAttributes" Value="Bold" />
<Setter Property="TextColor" Value="DarkSlateGrey" /> <Setter Property="TextColor" Value="Black" />
</Style> </Style>
<Style TargetType="ListView"> <Style TargetType="ListView">
@ -480,17 +487,20 @@
<Style TargetType="Page" ApplyToDerivedTypes="True"> <Style TargetType="Page" ApplyToDerivedTypes="True">
<Setter Property="Padding" Value="0"/> <Setter Property="Padding" Value="0"/>
<Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" /> <Setter Property="Shell.BackgroundColor" Value="{StaticResource OffBlack}" />
</Style> </Style>
<Style TargetType="Shell" ApplyToDerivedTypes="True"> <Style TargetType="Shell" ApplyToDerivedTypes="True">
<Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" /> <Setter Property="Shell.Title" Value="Qwirkle Game" />
<Setter Property="Shell.ForegroundColor" Value="Green" /> <Setter Property="Shell.BackgroundColor" Value="#efca85" />
<Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" /> <Setter Property="Shell.TabBarIsVisible" Value="False" />
<Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" /> <Setter Property="Shell.FlyoutBehavior" Value="Disabled" />
<Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" />
<Setter Property="Shell.DisabledColor" Value="DimGray" />
<Setter Property="Shell.UnselectedColor" Value="DimGray" />
<Setter Property="Shell.NavBarHasShadow" Value="False" /> <Setter Property="Shell.NavBarHasShadow" Value="False" />
<Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" /> <Setter Property="Shell.NavBarIsVisible" Value="False" />
<Setter Property="Shell.TabBarBackgroundColor" Value="DimGray" />
<Setter Property="Shell.TabBarForegroundColor" Value="Green" /> <Setter Property="Shell.TabBarForegroundColor" Value="Green" />
<Setter Property="Shell.TabBarTitleColor" Value="CornflowerBlue" /> <Setter Property="Shell.TabBarTitleColor" Value="CornflowerBlue" />
<Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" /> <Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />

1
Qwirkle/QwirkleViews/Views/Scoreboard.xaml
Unescape View File

@ -8,7 +8,6 @@
<VerticalStackLayout MaximumWidthRequest="200" Background="Transparent"> <VerticalStackLayout MaximumWidthRequest="200" Background="Transparent">
<CollectionView ItemsSource="{Binding ScoreboardList}" BindingContext="{x:Reference root}"> <CollectionView ItemsSource="{Binding ScoreboardList}" BindingContext="{x:Reference root}">
<CollectionView.ItemsLayout> <CollectionView.ItemsLayout>
<GridItemsLayout Orientation="Vertical"/> <GridItemsLayout Orientation="Vertical"/>

Write Preview
Loading…
Cancel
Save