fixes #7

AndreiMisiukevich · Mar 23, 2019 · 6c26708 · 6c26708
1 parent 5ad4892
commit 6c26708
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 37 deletions.
diff --git a/TouchEffect/Controls/Obsolete.cs b/TouchEffect/Controls/Obsolete.cs
diff --git a/TouchEffect/EventArgs/TouchCompletedEventArgs.cs b/TouchEffect/EventArgs/TouchCompletedEventArgs.cs
@@ -1,7 +1,6 @@
-using System;
-namespace TouchEffect.EventArgs
+namespace TouchEffect.EventArgs
 {
-	public class TouchCompletedEventArgs : System.EventArgs
+    public class TouchCompletedEventArgs : System.EventArgs
 	{
 		public TouchCompletedEventArgs(object parameter)
 		{

diff --git a/TouchEffect/EventArgs/TouchStateChangedEventArgs.cs b/TouchEffect/EventArgs/TouchStateChangedEventArgs.cs
@@ -1,8 +1,7 @@
-using System;
-using TouchEffect.Enums;
+using TouchEffect.Enums;
 namespace TouchEffect.EventArgs
 {
-	public class TouchStateChangedEventArgs : System.EventArgs
+    public class TouchStateChangedEventArgs : System.EventArgs
 	{
 		public TouchStateChangedEventArgs(TouchState state)
 		{

diff --git a/TouchEffect/Extensions/TouchViewExtenisons.cs b/TouchEffect/Extensions/TouchViewExtenisons.cs
@@ -5,6 +5,6 @@ namespace TouchEffect.Extensions
     public static class TouchViewExtenisons
     {
         public static TouchView AsTouchView(this BindableObject bindable)
-        => bindable as TouchView;
+            => bindable as TouchView;
     }
 }
diff --git a/TouchEffect/TouchEffect.csproj b/TouchEffect/TouchEffect.csproj
@@ -11,7 +11,6 @@
     <Folder Include="Delegates\" />
     <Folder Include="EventArgs\" />
     <Folder Include="Enums\" />
-    <Folder Include="Controls\" />
     <Folder Include="Extensions\" />
   </ItemGroup>
   <ItemGroup>

diff --git a/TouchEffect/TouchView.cs b/TouchEffect/TouchView.cs
@@ -36,13 +36,15 @@ public class TouchView : AbsoluteLayout
             nameof(Status),
             typeof(TouchStatus),
             typeof(TouchView),
-            TouchStatus.Completed);
+            TouchStatus.Completed,
+            BindingMode.OneWayToSource);
 
         public static readonly BindableProperty StateProperty = BindableProperty.Create(
             nameof(State),
             typeof(TouchState),
             typeof(TouchView),
-            TouchState.Regular);
+            TouchState.Regular,
+            BindingMode.OneWayToSource);
 
         public static readonly BindableProperty RegularBackgroundColorProperty = BindableProperty.Create(
             nameof(RegularBackgroundColor),
@@ -479,7 +481,7 @@ public Image BackgroundImage
 
         public void HandleTouch(TouchStatus status)
         {
-            var canExecuteCommand = !IsEnabled || Command == null || Completed == null;
+            var canExecuteCommand = IsEnabled && (Command != null || Completed != null);
 
             if (status != TouchStatus.Started || canExecuteCommand)
             {
@@ -541,7 +543,7 @@ protected async void OnStateChanged(TouchView sender, TouchStateChangedEventArgs
         }
 
         protected void ForceStateChanged()
-        => OnStateChanged(this, new TouchStateChangedEventArgs(State));
+            => OnStateChanged(this, new TouchStateChangedEventArgs(State));
 
         protected void SetBackgroundImage(TouchState state)
         {
@@ -762,12 +764,12 @@ protected async Task SetRotationY(TouchState state)
         }
 
         private Task GetAnimationTask(TouchState state)
-        => Task.WhenAll(SetBackgroundColor(state),
-            SetOpacity(state),
-            SetScale(state),
-            SetTranslation(state),
-            SetRotation(state),
-            SetRotationX(state),
-            SetRotationY(state));
+            => Task.WhenAll(SetBackgroundColor(state),
+                SetOpacity(state),
+                SetScale(state),
+                SetTranslation(state),
+                SetRotation(state),
+                SetRotationX(state),
+                SetRotationY(state));
     }
 }