Small code quality improvements

NikolayIT · Jun 14, 2016 · 502eb3d · 502eb3d
1 parent 0f0d5ad
commit 502eb3d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/Source/Santase.Logic/Cards/CardCollection.cs b/Source/Santase.Logic/Cards/CardCollection.cs
@@ -58,10 +58,7 @@ public void Clear()
 
         public bool Contains(Card item)
         {
-            unchecked
-            {
-                return ((this.cards >> item.GetHashCode()) & 1) == 1;
-            }
+            return ((this.cards >> item.GetHashCode()) & 1) == 1;
         }
 
         public void CopyTo(Card[] array, int arrayIndex)

diff --git a/...s/Santase.Tests.GameSimulations/GameSimulators/SmartAndBestExternalPlayerGameSimulator.cs b/...s/Santase.Tests.GameSimulations/GameSimulators/SmartAndBestExternalPlayerGameSimulator.cs
@@ -1,7 +1,6 @@
 namespace Santase.Tests.GameSimulations.GameSimulators
 {
     using Santase.AI.BotskoPlayer;
-    using Santase.AI.ProPlayer;
     using Santase.AI.SmartPlayer;
     using Santase.Logic.GameMechanics;
     using Santase.Logic.Players;

diff --git a/Source/UI/Santase.UI.WindowsUniversal/App.xaml b/Source/UI/Santase.UI.WindowsUniversal/App.xaml
@@ -2,7 +2,5 @@
     x:Class="Santase.UI.WindowsUniversal.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Santase.UI.WindowsUniversal"
     RequestedTheme="Light">
-
 </Application>
diff --git a/Source/UI/Santase.UI.WindowsUniversal/App.xaml.cs b/Source/UI/Santase.UI.WindowsUniversal/App.xaml.cs
@@ -10,7 +10,7 @@
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.
     /// </summary>
-    public sealed partial class App : Application
+    public sealed partial class App
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="App"/> class.

diff --git a/Source/UI/Santase.UI.WindowsUniversal/MainPage.xaml b/Source/UI/Santase.UI.WindowsUniversal/MainPage.xaml
@@ -4,15 +4,15 @@
     xmlns:local="using:Santase.UI.WindowsUniversal"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:Universal="using:Microsoft.AdMediator.Universal"
+    xmlns:universal="using:Microsoft.AdMediator.Universal"
     x:Class="Santase.UI.WindowsUniversal.MainPage"
     mc:Ignorable="d" Background="DarkGreen">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="7*"/>
             <RowDefinition Height="20*"/>
             <RowDefinition Height="10*"/>
-            <RowDefinition Height="100" x:Name="AdRow"/>
+            <RowDefinition Height="100"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="20*"/>
@@ -22,12 +22,12 @@
             <ColumnDefinition Width="20*"/>
         </Grid.ColumnDefinitions>
         <StackPanel Grid.Column="0" HorizontalAlignment="Center" Grid.Row="0" Grid.ColumnSpan="5" VerticalAlignment="Stretch" Orientation="Horizontal">
-            <local:CardControl x:Name="OtherPlayerCard1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="1,0,1,0"/>
-            <local:CardControl x:Name="OtherPlayerCard2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
-            <local:CardControl x:Name="OtherPlayerCard3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
-            <local:CardControl x:Name="OtherPlayerCard4" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
-            <local:CardControl x:Name="OtherPlayerCard5" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
-            <local:CardControl x:Name="OtherPlayerCard6" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
+            <local:CardControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="1,0,1,0"/>
+            <local:CardControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
+            <local:CardControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
+            <local:CardControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
+            <local:CardControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
+            <local:CardControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="-48,0,1,0"/>
         </StackPanel>
         <StackPanel Grid.Column="0" HorizontalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="5" VerticalAlignment="Stretch" Orientation="Horizontal">
             <local:CardControl x:Name="PlayerCard1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="1,0,1,0" Tapped="PlayerCardTapped" />
@@ -56,8 +56,8 @@
         <TextBlock x:Name="PlayerRoundPoints" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Right" TextWrapping="Wrap" Text="0" VerticalAlignment="Bottom" FontSize="32" FontWeight="Bold" Foreground="WhiteSmoke"/>
         <TextBlock x:Name="OtherPlayerTotalPoints" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" FontSize="36" FontWeight="ExtraBold" Foreground="WhiteSmoke"/>
         <TextBlock x:Name="PlayerTotalPoints" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" TextWrapping="Wrap" Text="0" VerticalAlignment="Bottom" FontSize="36" FontWeight="ExtraBold" Foreground="WhiteSmoke"/>
-        <Universal:AdMediatorControl Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="5" x:Name="AdMediator_2D55AF" HorizontalAlignment="Stretch" Id="AdMediator-Id-9EF27C9E-AEA0-4FC0-9307-462B7AA56267" VerticalAlignment="Stretch"/>
-        <TextBlock x:Name="ProgramVersion" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" TextWrapping="Wrap" Text="Santase v1.3" VerticalAlignment="Top" FontSize="20" Foreground="Azure" FontWeight="Bold"/>
+        <universal:AdMediatorControl Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="5" HorizontalAlignment="Stretch" Id="AdMediator-Id-9EF27C9E-AEA0-4FC0-9307-462B7AA56267" VerticalAlignment="Stretch"/>
+        <TextBlock x:Name="ProgramVersion" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" TextWrapping="Wrap" Text="Santase v1.4" VerticalAlignment="Top" FontSize="20" Foreground="Azure" FontWeight="Bold"/>
         <TextBlock x:Name="TotalResult" Grid.Row="0" Grid.Column="4" HorizontalAlignment="Center" TextWrapping="Wrap" Text="0-0" VerticalAlignment="Top" FontSize="22" Foreground="WhiteSmoke" FontWeight="ExtraBold"/>
     </Grid>
 </Page>