Support to Clicked event button (#16)

* support to Clicked event button

* Modify the ITouchAndPressEffectConsumer interface

Co-authored-by: AndresAldana <agaldanaw@unal.edu.co>
Co-authored-by: Agustin Bonilla <agustin.bonilla@horus.com.uy>

Author: 3 people

example/ExampleMaterialDesignControls/ExampleMaterialDesignControls.csproj

@@ -15,9 +15,6 @@
     <PackageReference Include="Xamarin.Forms.Skeleton" Version="2.0.0" />
     <PackageReference Include="Xamarin.FFImageLoading.Svg.Forms" Version="2.4.11.982" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\MaterialDesignControls\MaterialDesignControls.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Pages\" />
     <Folder Include="ViewModels\" />
@@ -52,4 +49,7 @@
     <EmbeddedResource Include="Resources/Fonts/*" />
     <EmbeddedResource Include="Resources/Svg/*" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\MaterialDesignControls\MaterialDesignControls.csproj" />
+  </ItemGroup>
 </Project>

example/ExampleMaterialDesignControls/MainPage.xaml.cs

@@ -16,8 +16,7 @@ public MainPage()
             InitializeComponent();
             this.Children.Add(new ProductDetailsPage());
             this.Children.Add(new AddCardPage());
-            this.Children.Add(new MaterialDatePickerPage());
-            this.Children.Add(new NavigationPage(new MaterialControlsPage()) { Title="Controls", IconImageSource="" });
+            this.Children.Add(new NavigationPage(new MaterialControlsPage()) { Title = "Controls", IconImageSource = "Product.png" });
 
             //masterPage.ListView.ItemSelected += OnItemSelected;
         }

example/ExampleMaterialDesignControls/Pages/MaterialButtonPage (copy).xaml

@@ -13,7 +13,7 @@
             <StackLayout Padding="16" Spacing="16">
                 <material:MaterialButton Text="Save" ToUpper="True" Icon="save.png" Command="{Binding TapCommand}" CommandParameter="Saved" IsBusy="{Binding IsBusy}" CornerRadius="14" />
 
-                <material:MaterialOutlineButton Text="Cancel" Command="{Binding TapCommand}" CommandParameter="Canceled" IsBusy="{Binding IsBusy}" CornerRadius="14" IconSize="34" ActivityIndicatorSize="34">
+                <material:MaterialOutlineButton Text="Cancel" Command="{Binding TapCommand}" CommandParameter="Canceled" CornerRadius="14" IconSize="34" ActivityIndicatorSize="34">
                     <material:MaterialButton.CustomIcon>
                         <ffimageloadingsvg:SvgCachedImage Source="resource://ExampleMaterialDesignControls.Resources.Svg.ic_help_b.svg"/> 
                     </material:MaterialButton.CustomIcon>
@@ -32,6 +32,10 @@
                 <material:MaterialButton Animation="None" Text="None" ToUpper="True" CornerRadius="14" />
                 <material:MaterialButton Animation="Fade" AnimationParameter="0.6" Text="Fade" ToUpper="True" CornerRadius="14" />
                 <material:MaterialButton Animation="Scale" AnimationParameter="0.98" Text="Scale" ToUpper="True" CornerRadius="14" />
+
+                <Label Text="Clicked event" HorizontalTextAlignment="Center" Margin="0,40,0,0" />
+                <material:MaterialButton Animation="Fade" AnimationParameter="0.6" Text="Clicked" ToUpper="True" CornerRadius="14" Clicked="Button_Clicked" />
+
             </StackLayout>
         </ScrollView>
     </ContentPage.Content>

example/ExampleMaterialDesignControls/Pages/MaterialButtonPage (copy).xaml.cs

@@ -15,5 +15,10 @@ public MaterialButtonPage()
 
             this.BindingContext = new MaterialButtonViewModel { DisplayAlert = this.DisplayAlert };
         }
+
+        private void Button_Clicked(object sender, EventArgs e)
+        {
+            DisplayAlert("Clicked Event", "Executing the click event in the code behind", "Ok");
+        }
     }
 }

example/ExampleMaterialDesignControls/Pages/MaterialButtonPage.xaml

@@ -17,11 +17,7 @@ public static void Animate(View view, EventType gestureType)
                     break;
                 case EventType.Cancelled:
                 case EventType.Released:
-                    if (touchAndPressEffectConsumer.IsEnabled && touchAndPressEffectConsumer.Command != null && touchAndPressEffectConsumer.Command.CanExecute(touchAndPressEffectConsumer.CommandParameter))
-                    {
-                        touchAndPressEffectConsumer.Command.Execute(touchAndPressEffectConsumer.CommandParameter);
-                    }
-
+                    touchAndPressEffectConsumer.ExecuteAction();
                     RestoreAnimation(view, touchAndPressEffectConsumer);
                     break;
                 case EventType.Ignored:
@@ -34,7 +30,7 @@ public static void Animate(View view, EventType gestureType)
 
         private static void SetAnimation(View view, ITouchAndPressEffectConsumer touchAndPressEffectConsumer)
         {
-            if (touchAndPressEffectConsumer.Animation != AnimationTypes.None && view.IsEnabled && (touchAndPressEffectConsumer.Command == null || touchAndPressEffectConsumer.Command.CanExecute(touchAndPressEffectConsumer.CommandParameter)))
+            if (touchAndPressEffectConsumer.Animation != AnimationTypes.None && touchAndPressEffectConsumer.IsEnabled)
             {
                 Task.Run(async () =>
                 {
@@ -68,5 +64,4 @@ private static void RestoreAnimation(View view, ITouchAndPressEffectConsumer tou
             }
         }
     }
-}
-
+}

example/ExampleMaterialDesignControls/Pages/MaterialButtonPage.xaml.cs

@@ -258,6 +258,8 @@ public double ActivityIndicatorSize
             set { SetValue(ActivityIndicatorSizeProperty, value); }
         }
 
+        public event EventHandler Clicked;
+
         #endregion Properties
 
         #region Methods
@@ -468,6 +470,15 @@ public void ConsumeEvent(EventType gestureType)
             TouchAndPressAnimation.Animate(this, gestureType);
         }
 
+        public void ExecuteAction()
+        {
+            if (IsEnabled && Command != null && Command.CanExecute(CommandParameter))
+                Command.Execute(CommandParameter);
+
+            if (IsEnabled && Clicked != null)
+                Clicked.Invoke(this, null);
+        }
+
         #endregion Methods
     }
-}
+}

src/MaterialDesignControls/Animations/TouchAndPressAnimation.cs

@@ -1,18 +1,14 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Xamarin.Forms;
+using Xamarin.Forms;
 
 namespace Plugin.MaterialDesignControls
 {
     public interface ITouchAndPressEffectConsumer
     {
         void ConsumeEvent(EventType gestureType);
-        ICommand Command { get; set; }
-        object CommandParameter { get; set; }
         bool IsEnabled { get; set; }
         AnimationTypes Animation { get; set; }
         double? AnimationParameter { get; set; }
+        void ExecuteAction();
     }
 
     public enum EventType
@@ -31,4 +27,4 @@ public TouchAndPressEffect() : base($"{EffectIdPrefix}.{nameof(TouchAndPressEffe
         {
         }
     }
-}
+}