Updated isToggled sample

TouchEffect/Delegates/AnimationStartedHandler.cs

@@ -0,0 +1,8 @@
+using TouchEffect.EventArgs;
+using Xamarin.Forms;
+
+namespace TouchEffect.Delegates
+{
+    public delegate void AnimationStartedHandler(VisualElement sender, AnimationStartedEventArgs args);
+}
+

TouchEffect/EventArgs/AnimationStartedEventArgs.cs

@@ -0,0 +1,16 @@
+using TouchEffect.Enums;
+
+namespace TouchEffect.EventArgs
+{
+    public class AnimationStartedEventArgs : System.EventArgs
+    {
+        public AnimationStartedEventArgs(TouchState state, int duration)
+        {
+            State = state;
+            Duration = duration;
+        }
+
+        public TouchState State { get; }
+        public int Duration { get; }
+    }
+}

TouchEffect/ITouchEff.cs → TouchEffect/Interfaces/ITouchEff.cs

@@ -2,9 +2,9 @@
 using TouchEffect.Enums;
 using Xamarin.Forms;
 
-namespace TouchEffect
+namespace TouchEffect.Interfaces
 {
-    internal interface ITouchEff
+    public interface ITouchEff
     {
         ICommand Command { get; }
 
@@ -69,5 +69,7 @@ internal interface ITouchEff
         void RaiseStatusChanged();
 
         void RaiseCompleted();
+
+        void RaiseAnimationStarted(TouchState state, int duration);
     }
 }

TouchEffect/TouchEff.cs

@@ -7,6 +7,8 @@
 using System.ComponentModel;
 using System;
 using System.Threading.Tasks;
+using System.Threading;
+using TouchEffect.Interfaces;
 
 namespace TouchEffect
 {
@@ -20,7 +22,7 @@ public TouchEff() : base($"{nameof(TouchEffect)}.{nameof(TouchEff)}")
             StateChanged += (sender, args) => ForceUpdateState();
         }
 
-        internal TouchEff(Func<ITouchEff, TouchState, double?, Task> animationTaskGetter) : this()
+        internal TouchEff(Func<ITouchEff, TouchState, int, CancellationToken, Task> animationTaskGetter) : this()
             => _visualManager.SetCustomAnimationTask(animationTaskGetter);
 
         public event TEffectStatusChangedHandler StatusChanged;
@@ -29,6 +31,8 @@ internal TouchEff(Func<ITouchEff, TouchState, double?, Task> animationTaskGetter
 
         public event TEffectCompletedHandler Completed;
 
+        public event AnimationStartedHandler AnimationStarted;
+
         public static readonly BindableProperty CommandProperty = BindableProperty.CreateAttached(
             nameof(Command),
             typeof(ICommand),
@@ -501,7 +505,11 @@ public void RaiseStatusChanged()
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void RaiseCompleted()
             => Completed?.Invoke(Control, new TouchCompletedEventArgs(CommandParameter));
-
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void RaiseAnimationStarted(TouchState state, int duration)
+            => AnimationStarted?.Invoke(Control, new AnimationStartedEventArgs(state, duration));
+
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void ForceUpdateState(bool animated = true)
         {

TouchEffect/TouchEffect.csproj

@@ -12,6 +12,7 @@
     <Folder Include="EventArgs\" />
     <Folder Include="Enums\" />
     <Folder Include="Extensions\" />
+    <Folder Include="Interfaces\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="Controls\TouchColorView.cs" />

TouchEffect/TouchImage.cs

@@ -2,6 +2,8 @@
 using TouchEffect.Extensions;
 using Xamarin.Forms;
 using System.Threading.Tasks;
+using System.Threading;
+using TouchEffect.Interfaces;
 
 namespace TouchEffect
 {
@@ -54,6 +56,12 @@ public TouchImage()
                 bindable.GetTouchEff()?.ForceUpdateState();
             });
 
+        public static readonly BindableProperty ShouldSetImageOnAnimationEndProperty = BindableProperty.Create(
+            nameof(ShouldSetImageOnAnimationEnd),
+            typeof(bool),
+            typeof(TouchImage),
+            default(bool));
+
         public ImageSource RegularBackgroundImageSource
         {
             get => GetValue(RegularBackgroundImageSourceProperty) as ImageSource;
@@ -78,15 +86,21 @@ public Aspect PressedBackgroundImageAspect
             set => SetValue(PressedBackgroundImageAspectProperty, value);
         }
 
-        private Task GetAnimationTask(ITouchEff sender, TouchState state, double? durationMultiplier = null)
+        public bool ShouldSetImageOnAnimationEnd
+        {
+            get => (bool)GetValue(ShouldSetImageOnAnimationEndProperty);
+            set => SetValue(ShouldSetImageOnAnimationEndProperty, value);
+        }
+
+        private async Task GetAnimationTask(ITouchEff sender, TouchState state, int duration, CancellationToken token)
         {
             var regularBackgroundImageSource = RegularBackgroundImageSource;
             var pressedBackgroundImageSource = PressedBackgroundImageSource;
 
             if (regularBackgroundImageSource == null &&
                 pressedBackgroundImageSource == null)
             {
-                return Task.FromResult(false);
+                return;
             }
 
             var aspect = RegularBackgroundImageAspect;
@@ -97,15 +111,23 @@ private Task GetAnimationTask(ITouchEff sender, TouchState state, double? durati
                 source = pressedBackgroundImageSource;
             }
 
+            if(ShouldSetImageOnAnimationEnd)
+            {
+                await Task.Delay(duration, token);
+            }
+
+            if(token.IsCancellationRequested)
+            {
+                return;
+            }
+
             lock (_setImageLocker)
             {
                 BatchBegin();
                 Aspect = aspect;
                 Source = source;
                 BatchCommit();
             }
-
-            return Task.FromResult(true);
         }
     }
 }

TouchEffect/TouchView.cs

@@ -5,6 +5,7 @@
 using TouchEffect.Enums;
 using TouchEffect.Extensions;
 using System;
+using TouchEffect.Interfaces;
 
 namespace TouchEffect
 {
@@ -17,6 +18,8 @@ public class TouchView : AbsoluteLayout, ITouchEff
 
         public event TouchViewCompletedHandler Completed;
 
+        public event AnimationStartedHandler AnimationStarted;
+
         public static readonly BindableProperty CommandProperty = BindableProperty.Create(
             nameof(Command),
             typeof(ICommand),
@@ -554,5 +557,9 @@ private void ForceStateChanged()
             SetBackgroundImage(state);
             _visualManager.ChangeStateAsync(this, state, true);
         }
+
+        public void RaiseAnimationStarted(TouchState state, int duration)
+        {
+        }
     }
 }