Everything bloody works !! Deleted the tiles png files now that we don't need them

11 months ago · a6746b66d8
parent b8565d384a
commit a6746b66d8
4 changed files with 116 additions and 61 deletions
--- a/Qwirkle/QwirkleViews/Resources/Images/club.png
+++ b/Qwirkle/QwirkleViews/Resources/Images/club.png
--- a/Qwirkle/QwirkleViews/Resources/Images/shuriken.png
+++ b/Qwirkle/QwirkleViews/Resources/Images/shuriken.png
--- a/Qwirkle/QwirkleViews/Resources/Images/star.png
+++ b/Qwirkle/QwirkleViews/Resources/Images/star.png
--- a/Qwirkle/QwirkleViews/Views/TileView.xaml
+++ b/Qwirkle/QwirkleViews/Views/TileView.xaml
@ -17,6 +17,94 @@
    </ContentView.Resources>
    <Grid>

+            <!-- Étoile / Star -->
+        <Grid
+            IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource StarToVisibilityConverter}}">
+            <Ellipse HeightRequest="10"
+                     WidthRequest="50"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     Grid.Row="0"
+                     Grid.Column="0" />
+            <Ellipse HeightRequest="10"
+                     WidthRequest="50"
+                     Rotation="45"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     Grid.Row="0"
+                     Grid.Column="0"/>
+            <Ellipse HeightRequest="10"
+                     WidthRequest="50"
+                     Rotation="90"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     Grid.Row="0"
+                     Grid.Column="0" />
+            <Ellipse HeightRequest="10"
+                     WidthRequest="50"
+                     Rotation="135"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     Grid.Row="0"
+                     Grid.Column="0" />
+        </Grid>
+
+            <!-- Shuriken -->
+        <Grid
+            IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource ShurikenToVisibilityConverter}}">
+            <Ellipse HeightRequest="10"
+                     WidthRequest="50"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     Grid.Row="0"
+                     Grid.Column="0" />
+            <Ellipse HeightRequest="10"
+                     WidthRequest="50"
+                     Rotation="90"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     Grid.Row="0"
+                     Grid.Column="0" />
+        </Grid>
+        
+            <!-- Trèfle / Club -->
+        <Grid
+            RowDefinitions="60"
+            ColumnDefinitions="60"
+            Padding="5, 5, 0, 0"
+            IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource ClubToVisibilityConverter}}">
+            <Ellipse HeightRequest="26"
+                     WidthRequest="26"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     HorizontalOptions="Start" 
+                     VerticalOptions="Center"
+                     Grid.Column="0"
+                     Grid.Row="0"/>
+            <Ellipse HeightRequest="26"
+                     WidthRequest="26"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     HorizontalOptions="End"
+                     VerticalOptions="Center"
+                     Grid.Column="0"
+                     Grid.Row="0" />
+            <Ellipse HeightRequest="26"
+                     WidthRequest="26"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     VerticalOptions="End"
+                     HorizontalOptions="Center"
+                     Grid.Column="0"
+                     Grid.Row="0" />
+            <Ellipse HeightRequest="26"
+                     WidthRequest="26"
+                     Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+                     VerticalOptions="Start"
+                     HorizontalOptions="Center"
+                     Grid.Column="0"
+                     Grid.Row="0"/>
+            <Rectangle HeightRequest="20"
+                       WidthRequest="20"
+                       StrokeThickness="0"
+                       VerticalOptions="Center"
+                       HorizontalOptions="Center"
+                       Grid.Column="0"
+                       Grid.Row="0"
+                       Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}" />
+        </Grid>
+        
        <Rectangle HeightRequest="70"
        Grid.Row="0"
        Grid.Column="0"
@ -25,69 +113,36 @@
        HorizontalOptions="Center"
        BackgroundColor="Transparent"/>

+            <!--Rond / round-->
+        <Ellipse HeightRequest="50"
+            WidthRequest="50"
+            Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+            VerticalOptions="Center"
+            HorizontalOptions="Center"
+            IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource RoundToVisibilityConverter}}" />

-        <!--Rond / round-->
-    <Ellipse HeightRequest="50"
-        WidthRequest="50"
-        Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
-        VerticalOptions="Center"
-        HorizontalOptions="Center"
-        IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource RoundToVisibilityConverter}}" />
-
-        <!--Losange / Rhombus-->
-    <Rectangle HeightRequest="35"
-        Grid.Row="0"
-        Grid.Column="0"
-        Rotation="45"
-        WidthRequest="35"
-        VerticalOptions="Center"
-        HorizontalOptions="Center"
-        Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
-        IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource RhombusToVisibilityConverter}}" />
+            <!--Losange / Rhombus-->
+        <Rectangle HeightRequest="35"
+            Grid.Row="0"
+            Grid.Column="0"
+            Rotation="45"
+            StrokeThickness="0"
+            WidthRequest="35"
+            VerticalOptions="Center"
+            HorizontalOptions="Center"
+            Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+            IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource RhombusToVisibilityConverter}}" />

-        <!--Carre / Square-->
-    <Rectangle HeightRequest="40"
-        Grid.Row="0"
-        Grid.Column="0"
-        WidthRequest="40"
-        VerticalOptions="Center"
-        HorizontalOptions="Center"
-        Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
-        IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource SquareToVisibilityConverter}}" />
-
-        <!--Trefle / Club-->
-    <Image Source="club.png"
-        Grid.Row="0"
-        Grid.Column="0"
-        WidthRequest="100"
-        HeightRequest="100"
-        IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource ClubToVisibilityConverter}}">
-            <Image.Behaviors>
-                <toolkit:IconTintColorBehavior TintColor="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"/>
-            </Image.Behaviors>
-    </Image>
-
-    <Image Source="shuriken.png"
-        Grid.Row="0"
-        Grid.Column="0"
-        WidthRequest="60"
-        HeightRequest="60"
-        IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource ShurikenToVisibilityConverter}}">
-            <Image.Behaviors>
-                <toolkit:IconTintColorBehavior TintColor="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"/>
-            </Image.Behaviors>
-    </Image>
-
-    <Image Source="star.png"
-        Grid.Row="0"
-        Grid.Column="0"
-        WidthRequest="60"
-        HeightRequest="60"
-        IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource StarToVisibilityConverter}}">
-        <Image.Behaviors>
-            <toolkit:IconTintColorBehavior TintColor="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"/>
-        </Image.Behaviors>
-    </Image>
+            <!--Carre / Square-->
+        <Rectangle HeightRequest="40"
+            Grid.Row="0"
+            Grid.Column="0"
+            WidthRequest="40"
+            StrokeThickness="0"
+            VerticalOptions="Center"
+            HorizontalOptions="Center"
+            Fill="{Binding Color, Source={x:Reference Root}, Converter={StaticResource Int2ColorConverter}}"
+            IsVisible="{Binding Shape, Source={x:Reference Root}, Converter={StaticResource SquareToVisibilityConverter}}" />
        
    </Grid>
 </ContentView>