diff --git a/Schnacc.Domain.IntegrationTests/PlayareaTest.cs b/Schnacc.Domain.IntegrationTests/PlayareaTest.cs index 7abc6c4..500e005 100644 --- a/Schnacc.Domain.IntegrationTests/PlayareaTest.cs +++ b/Schnacc.Domain.IntegrationTests/PlayareaTest.cs @@ -13,7 +13,7 @@ public class PlayareaTest private Playarea.Playarea _testee; [Scenario] - private void WhenTheSnakeCollidesInFruitItGrows() + public void WhenTheSnakeCollidesInFruitItGrows() { IFoodFactory foodFactory = null; @@ -46,7 +46,7 @@ private void WhenTheSnakeCollidesInFruitItGrows() } [Scenario] - private void SnakeCannotBeResetUnlessTheGameIsOver() + public void SnakeCannotBeResetUnlessTheGameIsOver() { IFoodFactory foodFactory = null; "Given a food factory" @@ -91,7 +91,7 @@ private void SnakeCannotBeResetUnlessTheGameIsOver() } [Scenario] - private void SnakeCannotMoveWhenTheGameIsOver() + public void SnakeCannotMoveWhenTheGameIsOver() { IFoodFactory foodFactory = null; "Given a food factory" @@ -138,7 +138,7 @@ private void SnakeCannotMoveWhenTheGameIsOver() } [Scenario] - private void GameIsOverWhenSnakeCollidesWithRightWall() + public void GameIsOverWhenSnakeCollidesWithRightWall() { IFoodFactory foodFactory = null; @@ -174,7 +174,7 @@ private void GameIsOverWhenSnakeCollidesWithRightWall() } [Scenario] - private void GameIsOverWhenSnakeCollidesWithLeftWall() + public void GameIsOverWhenSnakeCollidesWithLeftWall() { IFoodFactory foodFactory = null; @@ -210,7 +210,7 @@ private void GameIsOverWhenSnakeCollidesWithLeftWall() } [Scenario] - private void GameIsOverWhenSnakeCollidesWithTopWall() + public void GameIsOverWhenSnakeCollidesWithTopWall() { IFoodFactory foodFactory = null; @@ -246,7 +246,7 @@ private void GameIsOverWhenSnakeCollidesWithTopWall() } [Scenario] - private void GameIsOverWhenSnakeCollidesWithBottomWall() + public void GameIsOverWhenSnakeCollidesWithBottomWall() { IFoodFactory foodFactory = null; "Given a food factory" @@ -281,7 +281,7 @@ private void GameIsOverWhenSnakeCollidesWithBottomWall() } [Scenario] - private void GameIsOverWhenSnakeCollidesWithItself() + public void GameIsOverWhenSnakeCollidesWithItself() { IFoodFactory foodFactory = null; "Given a food factory" diff --git a/Schnacc.Domain.IntegrationTests/SnakeMovementTest.cs b/Schnacc.Domain.IntegrationTests/SnakeMovementTest.cs index bbce4cd..0fec7b2 100644 --- a/Schnacc.Domain.IntegrationTests/SnakeMovementTest.cs +++ b/Schnacc.Domain.IntegrationTests/SnakeMovementTest.cs @@ -6,7 +6,6 @@ namespace Schnacc.Domain.IntegrationTests { - [SuppressMessage("ReSharper", "TooManyDeclarations")] public class SnakeMovementTest { private Snake.Snake _testee; @@ -36,7 +35,7 @@ private void WhenASnakeGrowsASnakeBodyPartShouldBeAdded() [Scenario] [Example(0, 0)] - private void BodyOfSnakeIsFollowingTheSnakeHeadRightwards(int startRow, int startColumn) + public void BodyOfSnakeIsFollowingTheSnakeHeadRightwards(int startRow, int startColumn) { this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Right); @@ -74,7 +73,7 @@ private void BodyOfSnakeIsFollowingTheSnakeHeadRightwards(int startRow, int star [Scenario] [Example(0, 0)] - private void BodyOfSnakeIsFollowingTheSnakeHeadLeftwards(int startRow, int startColumn) + public void BodyOfSnakeIsFollowingTheSnakeHeadLeftwards(int startRow, int startColumn) { this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Left); @@ -112,7 +111,7 @@ private void BodyOfSnakeIsFollowingTheSnakeHeadLeftwards(int startRow, int start [Scenario] [Example(0, 0)] - private void BodyOfSnakeIsFollowingTheSnakeHeadUpwards(int startRow, int startColumn) + public void BodyOfSnakeIsFollowingTheSnakeHeadUpwards(int startRow, int startColumn) { this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Up); @@ -150,7 +149,7 @@ private void BodyOfSnakeIsFollowingTheSnakeHeadUpwards(int startRow, int startCo [Scenario] [Example(0, 0)] - private void BodyOfSnakeIsFollowingTheSnakeHeadDownwards(int startRow, int startColumn) + public void BodyOfSnakeIsFollowingTheSnakeHeadDownwards(int startRow, int startColumn) { this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Down); @@ -188,7 +187,7 @@ private void BodyOfSnakeIsFollowingTheSnakeHeadDownwards(int startRow, int start [Scenario] [Example(0, 0)] - private void BodyOfSnakeIsCapableOfMovingInCircularMotions(int startRow, int startColumn) + public void BodyOfSnakeIsCapableOfMovingInCircularMotions(int startRow, int startColumn) { this.GivingASnakeWithABodyFacingInACertainDirection(startRow, startColumn, Direction.Right); diff --git a/Schnacc.Domain.UnitTests/Food/AppleTest.cs b/Schnacc.Domain.UnitTests/Food/AppleTest.cs index 3109087..d5c560b 100644 --- a/Schnacc.Domain.UnitTests/Food/AppleTest.cs +++ b/Schnacc.Domain.UnitTests/Food/AppleTest.cs @@ -11,7 +11,7 @@ public class AppleTest private readonly IFood _testee = new Apple(A.Dummy()); [Fact] - private void AppleInstanceShouldBeNamedApple() + public void AppleInstanceShouldBeNamedApple() { // Assert this._testee.Name.Should().Be("Apple"); diff --git a/Schnacc.Domain.UnitTests/Food/BananaTest.cs b/Schnacc.Domain.UnitTests/Food/BananaTest.cs index a2b8539..b537718 100644 --- a/Schnacc.Domain.UnitTests/Food/BananaTest.cs +++ b/Schnacc.Domain.UnitTests/Food/BananaTest.cs @@ -11,7 +11,7 @@ public class BananaTest private readonly IFood _testee = new Banana(A.Dummy()); [Fact] - private void BananaInstanceShouldBeNamedBanana() + public void BananaInstanceShouldBeNamedBanana() { // Assert this._testee.Name.Should().Be("Banana"); diff --git a/Schnacc.Domain.UnitTests/Food/FoodFactoryTest.cs b/Schnacc.Domain.UnitTests/Food/FoodFactoryTest.cs index 9385965..ca9c256 100644 --- a/Schnacc.Domain.UnitTests/Food/FoodFactoryTest.cs +++ b/Schnacc.Domain.UnitTests/Food/FoodFactoryTest.cs @@ -13,7 +13,7 @@ public class FoodFactoryTest private FoodFactory _testee; [Fact] - private void CreateRandomFoodShouldCreateFoodType() + public void CreateRandomFoodShouldCreateFoodType() { for (int i = 0; i < 30; i++) { @@ -28,7 +28,7 @@ private void CreateRandomFoodShouldCreateFoodType() } [Fact] - private void CreateRandomFoodShouldCreateFoodAtRandomPosition() + public void CreateRandomFoodShouldCreateFoodAtRandomPosition() { for (int i = 0; i < 30; i++) { diff --git a/Schnacc.Domain.UnitTests/Food/WatermelonTest.cs b/Schnacc.Domain.UnitTests/Food/WatermelonTest.cs index 2ecd282..2424d58 100644 --- a/Schnacc.Domain.UnitTests/Food/WatermelonTest.cs +++ b/Schnacc.Domain.UnitTests/Food/WatermelonTest.cs @@ -11,7 +11,7 @@ public class WatermelonTest private readonly IFood _testee = new Watermelon(A.Dummy()); [Fact] - private void WatermelonInstanceShouldBeNamedWatermelon() + public void WatermelonInstanceShouldBeNamedWatermelon() { // Assert this._testee.Name.Should().Be("Watermelon"); diff --git a/Schnacc.Domain.UnitTests/Playarea/PlayareaTest.cs b/Schnacc.Domain.UnitTests/Playarea/PlayareaTest.cs index f97a7c6..b4bacbd 100644 --- a/Schnacc.Domain.UnitTests/Playarea/PlayareaTest.cs +++ b/Schnacc.Domain.UnitTests/Playarea/PlayareaTest.cs @@ -16,7 +16,7 @@ public class PlayareaTest [InlineData(3, 2)] [InlineData(4, 4)] [InlineData(4, 0)] - private void PlayareaSizeIsAtLeast4RowsAnd4Columns(int numberOfRows, int numberOfColumns) + public void PlayareaSizeIsAtLeast4RowsAnd4Columns(int numberOfRows, int numberOfColumns) { // Arrange var size = new PlayareaSize(numberOfRows, numberOfColumns); @@ -30,7 +30,7 @@ private void PlayareaSizeIsAtLeast4RowsAnd4Columns(int numberOfRows, int numberO } [Fact] - private void NewlyCreatedPlaygroundShouldHaveStartGamestate() + public void NewlyCreatedPlaygroundShouldHaveStartGamestate() { // Act this._testee = new Domain.Playarea.Playarea(new PlayareaSize(10, 10), A.Dummy()); @@ -44,7 +44,7 @@ private void NewlyCreatedPlaygroundShouldHaveStartGamestate() [InlineData(Direction.Left)] [InlineData(Direction.Up)] [InlineData(Direction.Down)] - private void WhenDirectionOfSnakeSetPlaygroundShouldHaveRunningGamestate(Direction newFacingDirection) + public void WhenDirectionOfSnakeSetPlaygroundShouldHaveRunningGamestate(Direction newFacingDirection) { // Arrange this._testee = new Domain.Playarea.Playarea(new PlayareaSize(10, 10), A.Dummy()); @@ -57,13 +57,13 @@ private void WhenDirectionOfSnakeSetPlaygroundShouldHaveRunningGamestate(Directi } [Fact] - private void SnakeShouldNotMoveWhenDirectionIsNeverUpdated() + public void SnakeShouldNotMoveWhenDirectionIsNeverUpdated() { // Arrange var size = new PlayareaSize(10, 10); var foodFactory = A.Dummy(); this._testee = new Domain.Playarea.Playarea(size, foodFactory); - Position previousHeadPosition = this._testee.Snake.Head.Position; + var previousHeadPosition = this._testee.Snake.Head.Position; // Act this._testee.MoveSnakeWhenAllowed(); diff --git a/Schnacc.Domain.UnitTests/Snake/SnakeTest.cs b/Schnacc.Domain.UnitTests/Snake/SnakeTest.cs index 0c26285..6cc8f87 100644 --- a/Schnacc.Domain.UnitTests/Snake/SnakeTest.cs +++ b/Schnacc.Domain.UnitTests/Snake/SnakeTest.cs @@ -10,7 +10,7 @@ public class SnakeTest private readonly Domain.Snake.Snake _testee = new Domain.Snake.Snake(new Position(0, 0)); [Fact] - private void ForwardsFacingSnakeShouldMoveFarwards() + public void ForwardsFacingSnakeShouldMoveFarwards() { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -25,7 +25,7 @@ private void ForwardsFacingSnakeShouldMoveFarwards() } [Fact] - private void BackwardsFacingSnakeShouldMoveBackwards() + public void BackwardsFacingSnakeShouldMoveBackwards() { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -40,7 +40,7 @@ private void BackwardsFacingSnakeShouldMoveBackwards() } [Fact] - private void UpwardsFacingSnakeShouldMoveUpwards() + public void UpwardsFacingSnakeShouldMoveUpwards() { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -55,7 +55,7 @@ private void UpwardsFacingSnakeShouldMoveUpwards() } [Fact] - private void DownwardsFacingSnakeShouldMoveDownwards() + public void DownwardsFacingSnakeShouldMoveDownwards() { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -70,7 +70,7 @@ private void DownwardsFacingSnakeShouldMoveDownwards() } [Fact] - private void StillStandingSnakeShouldNotMove() + public void StillStandingSnakeShouldNotMove() { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -93,7 +93,7 @@ private void StillStandingSnakeShouldNotMove() [InlineData(Direction.Up, Direction.Left)] [InlineData(Direction.Down, Direction.Right)] [InlineData(Direction.Down, Direction.Left)] - private void SnakeShouldBeAbleToChangeDirectionBy90Degrees(Direction startDirection, Direction newDirection) + public void SnakeShouldBeAbleToChangeDirectionBy90Degrees(Direction startDirection, Direction newDirection) { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -111,7 +111,7 @@ private void SnakeShouldBeAbleToChangeDirectionBy90Degrees(Direction startDirect [InlineData(Direction.Left, Direction.Right)] [InlineData(Direction.Up, Direction.Down)] [InlineData(Direction.Down, Direction.Up)] - private void SnakeShouldNotBeAbleToChangeDirectionBy180Degrees(Direction startDirection, Direction newDirection) + public void SnakeShouldNotBeAbleToChangeDirectionBy180Degrees(Direction startDirection, Direction newDirection) { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -130,7 +130,7 @@ private void SnakeShouldNotBeAbleToChangeDirectionBy180Degrees(Direction startDi [InlineData(Direction.Up)] [InlineData(Direction.Down)] [InlineData(Direction.None)] - private void SnakeShouldBeAbleToChangeIntoEveryDirectionWhenNotMoving(Direction newDirection) + public void SnakeShouldBeAbleToChangeIntoEveryDirectionWhenNotMoving(Direction newDirection) { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -148,7 +148,7 @@ private void SnakeShouldBeAbleToChangeIntoEveryDirectionWhenNotMoving(Direction [InlineData(Direction.Left)] [InlineData(Direction.Up)] [InlineData(Direction.Down)] - private void SnakeShouldNotBeAbleToChangeIntoNoDirectionWhenAlreadyMoving(Direction newDirection) + public void SnakeShouldNotBeAbleToChangeIntoNoDirectionWhenAlreadyMoving(Direction newDirection) { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -167,7 +167,7 @@ private void SnakeShouldNotBeAbleToChangeIntoNoDirectionWhenAlreadyMoving(Direct [InlineData(Direction.Up)] [InlineData(Direction.Down)] [InlineData(Direction.None)] - private void WhenNewDirectionIsSameAsOldOneNothingChanges(Direction sameDirection) + public void WhenNewDirectionIsSameAsOldOneNothingChanges(Direction sameDirection) { // Arrange this._testee.ResetSnakeToStartPosition(); @@ -180,11 +180,11 @@ private void WhenNewDirectionIsSameAsOldOneNothingChanges(Direction sameDirectio } [Fact] - private void WhenSnakeGrowsForTheFirstTimeABodyPartShouldBeAddedAfterTheHeadOfTheSnake() + public void WhenSnakeGrowsForTheFirstTimeABodyPartShouldBeAddedAfterTheHeadOfTheSnake() { // Arrange this._testee.ResetSnakeToStartPosition(); - Position positionOfHead = this._testee.Head.Position; + var positionOfHead = this._testee.Head.Position; // Act this._testee.Grow(); @@ -196,12 +196,12 @@ private void WhenSnakeGrowsForTheFirstTimeABodyPartShouldBeAddedAfterTheHeadOfTh } [Fact] - private void WhenTheSnakeGrowsABodyPartShouldBeAddedAtTheEndOfTheSnake() + public void WhenTheSnakeGrowsABodyPartShouldBeAddedAtTheEndOfTheSnake() { // Arrange this._testee.ResetSnakeToStartPosition(); this._testee.Grow(); - Position positionOfLastBodyPart = this._testee.Body.Last().Position; + var positionOfLastBodyPart = this._testee.Body.Last().Position; // Act this._testee.Grow(); @@ -213,7 +213,7 @@ private void WhenTheSnakeGrowsABodyPartShouldBeAddedAtTheEndOfTheSnake() } [Fact] - private void WhenSnakeHasABodyItMovesWithTheHead() + public void WhenSnakeHasABodyItMovesWithTheHead() { // Arrange this._testee.ResetSnakeToStartPosition(); diff --git a/Schnacc.Domain/Food/FoodFactory.cs b/Schnacc.Domain/Food/FoodFactory.cs index c2cb73c..9c814ae 100644 --- a/Schnacc.Domain/Food/FoodFactory.cs +++ b/Schnacc.Domain/Food/FoodFactory.cs @@ -11,7 +11,7 @@ public class FoodFactory : IFoodFactory { public Food CreateRandomFoodBetweenBoundaries(Position boundaries) { - List allFoodTypes = this.GetAllFoodTypes(); + var allFoodTypes = this.GetAllFoodTypes(); int randomRow = this.GetRandomInt(0, boundaries.Row); int randomColumn = this.GetRandomInt(0, boundaries.Column); return (Food)Activator.CreateInstance(allFoodTypes.ElementAt(this.GetRandomInt(0, allFoodTypes.Count)), new Position(randomRow, randomColumn)); @@ -19,7 +19,7 @@ public Food CreateRandomFoodBetweenBoundaries(Position boundaries) private List GetAllFoodTypes() { - Type derivedType = typeof(Food); + var derivedType = typeof(Food); return Assembly.GetAssembly(typeof(Food))?.GetTypes().Where(t => t != derivedType && derivedType.IsAssignableFrom(t)).ToList(); } diff --git a/Schnacc.Domain/Playarea/Playarea.cs b/Schnacc.Domain/Playarea/Playarea.cs index ab7ed72..0656ff1 100644 --- a/Schnacc.Domain/Playarea/Playarea.cs +++ b/Schnacc.Domain/Playarea/Playarea.cs @@ -88,13 +88,13 @@ private void SetGameState() private bool NextPositionCollidesWithSnakeBody() { - Position nextHeadPosition = this.Snake.GetNextHeadPosition(); + var nextHeadPosition = this.Snake.GetNextHeadPosition(); return this.Snake.Body.Select(sb => sb.Position).Any(p => p.Equals(nextHeadPosition)); } private bool NextPositionCollidesWithWalls() { - Position nextPosition = this.Snake.GetNextHeadPosition(); + var nextPosition = this.Snake.GetNextHeadPosition(); return nextPosition.Column <= -1 || nextPosition.Row <= -1 || @@ -123,7 +123,7 @@ private PlayareaSize GetValidFieldSize(PlayareaSize size) private IFood GetRandomFoodInUniquePosition() { - List allUsedPositions = this.Snake.Body.Select(bp => bp.Position).ToList(); + var allUsedPositions = this.Snake.Body.Select(bp => bp.Position).ToList(); allUsedPositions.Add(this.Snake.Head.Position); IFood randomFood; diff --git a/Schnacc.Domain/Snake/Orientation/DownwardDirection.cs b/Schnacc.Domain/Snake/Orientation/DownwardDirection.cs index b8a1a37..6541001 100644 --- a/Schnacc.Domain/Snake/Orientation/DownwardDirection.cs +++ b/Schnacc.Domain/Snake/Orientation/DownwardDirection.cs @@ -20,7 +20,7 @@ public override void MoveHead() public override Position GetNexPosition() { - Position previousPosition = this.Snake.Head.Position; + var previousPosition = this.Snake.Head.Position; return new Position(previousPosition.Row + 1, previousPosition.Column); } } diff --git a/Schnacc.Domain/Snake/Orientation/LeftwardDirection.cs b/Schnacc.Domain/Snake/Orientation/LeftwardDirection.cs index 9f110ef..10e07bd 100644 --- a/Schnacc.Domain/Snake/Orientation/LeftwardDirection.cs +++ b/Schnacc.Domain/Snake/Orientation/LeftwardDirection.cs @@ -20,7 +20,7 @@ public override void MoveHead() public override Position GetNexPosition() { - Position previousPosition = this.Snake.Head.Position; + var previousPosition = this.Snake.Head.Position; return new Position(previousPosition.Row, previousPosition.Column - 1); } } diff --git a/Schnacc.Domain/Snake/Orientation/NoDirection.cs b/Schnacc.Domain/Snake/Orientation/NoDirection.cs index 66826c4..a59cc77 100644 --- a/Schnacc.Domain/Snake/Orientation/NoDirection.cs +++ b/Schnacc.Domain/Snake/Orientation/NoDirection.cs @@ -25,7 +25,7 @@ public override void MoveHead() public override Position GetNexPosition() { - Position previousPosition = this.Snake.Head.Position; + var previousPosition = this.Snake.Head.Position; return new Position(previousPosition.Row, previousPosition.Column); } } diff --git a/Schnacc.Domain/Snake/Orientation/RightwardDirection.cs b/Schnacc.Domain/Snake/Orientation/RightwardDirection.cs index 7d700e0..6c2ec01 100644 --- a/Schnacc.Domain/Snake/Orientation/RightwardDirection.cs +++ b/Schnacc.Domain/Snake/Orientation/RightwardDirection.cs @@ -19,7 +19,7 @@ public override void MoveHead() public override Position GetNexPosition() { - Position previousPosition = this.Snake.Head.Position; + var previousPosition = this.Snake.Head.Position; return new Position(previousPosition.Row, previousPosition.Column + 1); } } diff --git a/Schnacc.Domain/Snake/Orientation/UpwardDirection.cs b/Schnacc.Domain/Snake/Orientation/UpwardDirection.cs index d261243..9f07c8e 100644 --- a/Schnacc.Domain/Snake/Orientation/UpwardDirection.cs +++ b/Schnacc.Domain/Snake/Orientation/UpwardDirection.cs @@ -20,7 +20,7 @@ public override void MoveHead() public override Position GetNexPosition() { - Position previousPosition = this.Snake.Head.Position; + var previousPosition = this.Snake.Head.Position; return new Position(previousPosition.Row - 1, previousPosition.Column); } } diff --git a/Schnacc.UserInterface/AssemblyInfo.cs b/Schnacc.UserInterface/AssemblyInfo.cs deleted file mode 100644 index 8b5504e..0000000 --- a/Schnacc.UserInterface/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Windows; - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] diff --git a/Schnacc.UserInterface/Infrastructure/Commands/AsyncCommandBase.cs b/Schnacc.UserInterface/Infrastructure/Commands/AsyncCommandBase.cs index c2bf705..839ef14 100644 --- a/Schnacc.UserInterface/Infrastructure/Commands/AsyncCommandBase.cs +++ b/Schnacc.UserInterface/Infrastructure/Commands/AsyncCommandBase.cs @@ -4,8 +4,6 @@ namespace Schnacc.UserInterface.Infrastructure.Commands { -#pragma warning disable SA1402 // File may only contain a single class - public abstract class AsyncCommandBase : ICommand { /// Occurs when changes occur that affect whether or not the command should execute. diff --git a/Schnacc.UserInterface/Infrastructure/Commands/AsyncRelayCommand.cs b/Schnacc.UserInterface/Infrastructure/Commands/AsyncRelayCommand.cs index 4741141..231b937 100644 --- a/Schnacc.UserInterface/Infrastructure/Commands/AsyncRelayCommand.cs +++ b/Schnacc.UserInterface/Infrastructure/Commands/AsyncRelayCommand.cs @@ -4,8 +4,6 @@ namespace Schnacc.UserInterface.Infrastructure.Commands { -#pragma warning disable SA1402 // File may only contain a single class - /// Provides an implementation of the interface. /// The type of the command parameter. public class AsyncRelayCommand : AsyncCommandBase diff --git a/Schnacc.UserInterface/Infrastructure/Commands/CommandBase.cs b/Schnacc.UserInterface/Infrastructure/Commands/CommandBase.cs index bb56f2b..bdeabfa 100644 --- a/Schnacc.UserInterface/Infrastructure/Commands/CommandBase.cs +++ b/Schnacc.UserInterface/Infrastructure/Commands/CommandBase.cs @@ -12,8 +12,6 @@ namespace Schnacc.UserInterface.Infrastructure.Commands { -#pragma warning disable SA1402 // File may only contain a single class - /// Provides a base implementation of the interface. public abstract class CommandBase : ICommand { diff --git a/Schnacc.UserInterface/Infrastructure/Commands/RelayCommand.cs b/Schnacc.UserInterface/Infrastructure/Commands/RelayCommand.cs index 80fa8df..9be807f 100644 --- a/Schnacc.UserInterface/Infrastructure/Commands/RelayCommand.cs +++ b/Schnacc.UserInterface/Infrastructure/Commands/RelayCommand.cs @@ -12,8 +12,6 @@ namespace Schnacc.UserInterface.Infrastructure.Commands { -#pragma warning disable SA1402 // File may only contain a single class - /// Provides an implementation of the interface. public class RelayCommand : CommandBase { diff --git a/Schnacc.UserInterface/Infrastructure/Extensions/SuppressableObservableCollection.cs b/Schnacc.UserInterface/Infrastructure/Extensions/SuppressableObservableCollection.cs index efa12ac..1facaa3 100644 --- a/Schnacc.UserInterface/Infrastructure/Extensions/SuppressableObservableCollection.cs +++ b/Schnacc.UserInterface/Infrastructure/Extensions/SuppressableObservableCollection.cs @@ -18,7 +18,11 @@ public bool SuppressNotification set { this._suppressNotification = value; - if (this._suppressNotification || !this._notificationHasBeenSuppressed) return; + if (this._suppressNotification || !this._notificationHasBeenSuppressed) + { + return; + } + this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset)); this._notificationHasBeenSuppressed = false; } diff --git a/Schnacc.UserInterface/PlayAreaView/PlayAreaPageViewModel.cs b/Schnacc.UserInterface/PlayAreaView/PlayAreaPageViewModel.cs index 2f00583..54e39a5 100644 --- a/Schnacc.UserInterface/PlayAreaView/PlayAreaPageViewModel.cs +++ b/Schnacc.UserInterface/PlayAreaView/PlayAreaPageViewModel.cs @@ -33,10 +33,7 @@ public class PlayAreaViewModel : ViewModelBase, INavigableViewModel private DateTime _lastDirectionChange; private readonly int _difficultyLevel; private int _slowMotionTicks; - - private object writingHighScoreLock = new object(); private bool _highScoreIsWritten; - private bool UserIsAllowedToWriteHighScore => !this.NavigationService.AuthorizationApi.IsAnonymous && this.NavigationService.AuthorizationApi.EmailIsVerified; private bool SlowMotionIsActive => !this._slowMotionTicks.Equals(0); private string SnakeColor => !this.SlowMotionIsActive ? "#3d9e31" : "#6cf85b"; diff --git a/Schnacc.UserInterface/Schnacc.UserInterface.csproj b/Schnacc.UserInterface/Schnacc.UserInterface.csproj index d6b5602..2feb525 100644 --- a/Schnacc.UserInterface/Schnacc.UserInterface.csproj +++ b/Schnacc.UserInterface/Schnacc.UserInterface.csproj @@ -1,11 +1,11 @@  - WinExe netcoreapp3.1 true true favicon.ico + true