diff --git a/Qwirkle/QwirkleViews/Resources/Images/club.png b/Qwirkle/QwirkleViews/Resources/Images/club.png index f80f8c9..edc42b2 100644 Binary files a/Qwirkle/QwirkleViews/Resources/Images/club.png and b/Qwirkle/QwirkleViews/Resources/Images/club.png differ diff --git a/Qwirkle/QwirkleViews/Resources/Images/shuriken.png b/Qwirkle/QwirkleViews/Resources/Images/shuriken.png index 129e451..5be17cc 100644 Binary files a/Qwirkle/QwirkleViews/Resources/Images/shuriken.png and b/Qwirkle/QwirkleViews/Resources/Images/shuriken.png differ diff --git a/Qwirkle/QwirkleViews/Resources/Images/star.png b/Qwirkle/QwirkleViews/Resources/Images/star.png index 7c4de6a..ae60d60 100644 Binary files a/Qwirkle/QwirkleViews/Resources/Images/star.png and b/Qwirkle/QwirkleViews/Resources/Images/star.png differ diff --git a/Qwirkle/QwirkleViews/Views/TileView.xaml b/Qwirkle/QwirkleViews/Views/TileView.xaml index c91e19c..54191fb 100644 --- a/Qwirkle/QwirkleViews/Views/TileView.xaml +++ b/Qwirkle/QwirkleViews/Views/TileView.xaml @@ -4,16 +4,16 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="Qwirkle.Views.TileView" xmlns:conv="clr-namespace:Qwirkle.Converters" - x:Name="root" + x:Name="Root" xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"> - - - - - - - + + + + + + + @@ -29,10 +29,10 @@ + IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource RoundToVisibilityConverter}}" /> + Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}" + IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource RhombusToVisibilityConverter}}" /> + Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}" + IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource SquareToVisibilityConverter}}" /> - + IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource ClubToVisibilityConverter}}"> - + @@ -72,24 +72,22 @@ Grid.Column="0" WidthRequest="60" HeightRequest="60" - IsVisible="{Binding Shape, Source={x:Reference root}, Converter={StaticResource shurikenToVisibilityConverter}}"> + IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource ShurikenToVisibilityConverter}}"> - + - + IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource StarToVisibilityConverter}}"> - + - - - + \ No newline at end of file diff --git a/Qwirkle/QwirkleViews/Views/TileView.xaml.cs b/Qwirkle/QwirkleViews/Views/TileView.xaml.cs index d7f0ad1..73f9f47 100644 --- a/Qwirkle/QwirkleViews/Views/TileView.xaml.cs +++ b/Qwirkle/QwirkleViews/Views/TileView.xaml.cs @@ -21,7 +21,7 @@ public partial class TileView : ContentView } public static readonly BindableProperty ColorProperty = - BindableProperty.Create(nameof(Color), typeof(string), typeof(TileView), "", propertyChanged: OnColorChanged); + BindableProperty.Create(nameof(Color), typeof(string), typeof(TileView), "", propertyChanged: OnColorChanged); public string Color { @@ -37,13 +37,11 @@ public partial class TileView : ContentView public static readonly BindableProperty ShapeProperty = - BindableProperty.Create("Shape", typeof(string), typeof(TileView), ""); + BindableProperty.Create(nameof(Shape), typeof(string), typeof(TileView), ""); public string Shape { get => (string)GetValue(ShapeProperty); set => SetValue(ShapeProperty, value); } - - } \ No newline at end of file