Add support for DisableSwipeDetection, SwipeUpActionEnabled and SwipeUpCommand (#10)

Author: PenguinPero

src/Calendar.Plugin.Sample/SampleApp/MainPage.xaml

@@ -37,7 +37,9 @@
         </controls:Calendar.EventTemplate>
     </controls:Calendar>
 
-    <!--<ContentPage.Resources>
+    <!-- Styling
+    
+    <ContentPage.Resources>
         <ResourceDictionary>
             <Style x:Key="daysLabelStyle" TargetType="Label">
                 <Setter Property="FontAttributes" Value="Italic" />
@@ -51,7 +53,15 @@
         </ResourceDictionary>
     </ContentPage.Resources>-->
 
-    <!--
+
+    <!-- Swipe handling
+    
+        DisableSwipeDetection="False"
+        SwipeUpActionEnabled="False"
+        SwipeUpCommand="{Binding SwipeUpCommand}"-->
+    
+    <!-- Customizations
+    
         DaysLabelStyle="{StaticResource daysLabelStyle}"
         DaysTitleLabelStyle="{StaticResource daysTitleLabelStyle}"
         MonthLabelColor="Red"

src/Calendar.Plugin/Android/SwipeAwareContainerRenderer.cs

@@ -13,7 +13,7 @@ public class SwipeAwareContainerRenderer : ViewRenderer, GestureDetector.IOnGest
     {
         private const int SwipeDistanceThreshold = 50;
         private const int SwipeVelocityThreshold = 20;
-        private readonly GestureDetector _gestureDetector; 
+        private readonly GestureDetector _gestureDetector;
 
         public SwipeAwareContainerRenderer(Context context) : base(context)
         {
@@ -22,7 +22,9 @@ public SwipeAwareContainerRenderer(Context context) : base(context)
 
         public override bool OnInterceptTouchEvent(MotionEvent ev)
         {
-            _gestureDetector.OnTouchEvent(ev);
+            if (Element is SwipeAwareContainer element && !element.SwipeDetectionDisabled)
+                _gestureDetector.OnTouchEvent(ev);
+
             return base.OnInterceptTouchEvent(ev);
         }
 

src/Calendar.Plugin/CalendarPlugin.csproj

@@ -26,7 +26,7 @@
     <LangVersion>latest</LangVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 
-    <!--<GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>-->
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DefineConstants>$(DefineConstants);</DefineConstants>
     <RepositoryType>git</RepositoryType>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

src/Calendar.Plugin/Shared/Controls/Calendar.xaml

@@ -26,9 +26,10 @@
             <controls:SwipeAwareContainer
                 VerticalOptions="FillAndExpand"
                 HorizontalOptions="FillAndExpand"
-                SwipedLeft="NextMonthClicked"
-                SwipedRight="PrevMonthClicked"
-                SwipedUp="OnShowHideTapped">
+                SwipeDetectionDisabled="{Binding DisableSwipeDetection, Source={x:Reference calendar}}"
+                SwipedLeft="OnSwipedLeft"
+                SwipedRight="OnSwipedRight"
+                SwipedUp="OnSwipedUp">
                 <controls:MonthDaysView
                     x:Name="monthDaysView"
                     Month="{Binding Month, Source={x:Reference calendar}}"

src/Calendar.Plugin/Shared/Controls/Calendar.xaml.cs

@@ -312,6 +312,43 @@ public Style DaysTitleLabelStyle
             set => SetValue(DaysTitleLabelStyleProperty, value);
         }
 
+        /// <summary> Bindable propety for DisableSwipeDetection </summary>
+        public static readonly BindableProperty DisableSwipeDetectionProperty =
+          BindableProperty.Create(nameof(DisableSwipeDetection), typeof(bool), typeof(Calendar), false);
+
+        /// <summary>
+        /// <para> Disables the swipe detection (needs testing on iOS) </para>
+        /// Could be useful if your superview has its own swipe-detection logic. 
+        /// Also see if <seealso cref="SwipeUpCommand"/>, <seealso cref="SwipeUpActionEnabled"/> is useful to you.
+        /// </summary>
+        public bool DisableSwipeDetection
+        {
+            get => (bool)GetValue(DisableSwipeDetectionProperty);
+            set => SetValue(DisableSwipeDetectionProperty, value);
+        }
+
+        /// <summary> Bindable property for SwipeUpCommand </summary>
+        public static readonly BindableProperty SwipeUpCommandProperty =
+          BindableProperty.Create(nameof(SwipeUpCommand), typeof(ICommand), typeof(Calendar), null);
+
+        /// <summary> Activated when user swipes-up over days view </summary>
+        public ICommand SwipeUpCommand
+        {
+            get => (ICommand)GetValue(SwipeUpCommandProperty);
+            set => SetValue(SwipeUpCommandProperty, value);
+        }
+
+        /// <summary> Bindable property for SwipeUpActionEnabled </summary>
+        public static readonly BindableProperty SwipeUpActionEnabledProperty =
+          BindableProperty.Create(nameof(SwipeUpActionEnabled), typeof(bool), typeof(Calendar), true);
+
+        /// <summary> Enable/disable default swipe-up action for showing/hiding calendar </summary>
+        public bool SwipeUpActionEnabled
+        {
+            get => (bool)GetValue(SwipeUpActionEnabledProperty);
+            set => SetValue(SwipeUpActionEnabledProperty, value);
+        }
+
         #endregion
 
         private const uint CalendarSectionAnimationRate = 16;
@@ -322,6 +359,9 @@ public Style DaysTitleLabelStyle
         private bool _calendarSectionAnimating;
         private double _calendarSectionHeight;
 
+        /// <summary>
+        /// Calendar plugin for Xamarin.Forms
+        /// </summary>
         public Calendar()
         {
             PrevMonthCommand = new Command(PrevMonth);
@@ -457,20 +497,19 @@ private void OnCalendarContainerSizeChanged(object sender, EventArgs e)
                 UpdateCalendarSectionHeight();
         }
 
-        private void PrevMonthClicked(object sender, EventArgs e)
+        private void OnSwipedRight(object sender, EventArgs e)
             => PrevMonth();
 
-        private void NextMonthClicked(object sender, EventArgs e)
+        private void OnSwipedLeft(object sender, EventArgs e)
             => NextMonth();
 
-        private void PrevYearClicked(object sender, EventArgs e)
-            => PrevYear();
-
-        private void NextYearClicked(object sender, EventArgs e)
-            => NextYear();
+        private void OnSwipedUp(object sender, EventArgs e)
+        {
+            SwipeUpCommand?.Execute(null);
 
-        private void OnShowHideTapped(object sender, EventArgs e)
-            => ToggleCalendarSectionVisibility();
+            if (SwipeUpActionEnabled)
+                ToggleCalendarSectionVisibility();
+        }
 
         #endregion
 

src/Calendar.Plugin/Shared/Controls/SwipeAwareContainer.cs

@@ -3,8 +3,17 @@
 
 namespace Xamarin.Plugin.Calendar.Controls
 {
-    public class SwipeAwareContainer: ContentView
+    public class SwipeAwareContainer : ContentView
     {
+        public static readonly BindableProperty SwipeDetectionDisabledProperty =
+          BindableProperty.Create(nameof(SwipeDetectionDisabled), typeof(bool), typeof(SwipeAwareContainer), false);
+
+        public bool SwipeDetectionDisabled
+        {
+            get => (bool)GetValue(SwipeDetectionDisabledProperty);
+            set => SetValue(SwipeDetectionDisabledProperty, value);
+        }
+
         public SwipeAwareContainer() : base()
         { }
 

src/Calendar.Plugin/iOS/SwipeAwareContainerRenderer.cs

@@ -1,4 +1,7 @@
-using UIKit;
+using System;
+using System.ComponentModel;
+using System.Linq;
+using UIKit;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.iOS;
 using Xamarin.Plugin.Calendar.Controls;
@@ -22,30 +25,77 @@ public SwipeAwareContainerRenderer()
             _downGestureRecognizer = new UISwipeGestureRecognizer(() => (Element as SwipeAwareContainer)?.OnSwipeDown()) { Direction = UISwipeGestureRecognizerDirection.Down};
         }
 
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.OnElementPropertyChanged(sender, e);
+
+            if (!(Element is SwipeAwareContainer element))
+                return;
+
+            switch (e.PropertyName)
+            {
+                case nameof(SwipeAwareContainer.SwipeDetectionDisabled):
+                    if (element.SwipeDetectionDisabled)
+                        RemoveGestureRecognizers();
+                    else
+                        AddGestureRecognizers();
+                    break;
+            }
+        }
+
         protected override void OnElementChanged(ElementChangedEventArgs<ContentView> e)
         {
             base.OnElementChanged(e);
 
-            var control = NativeView;
-
-            if (control == null)
+            if (NativeView == null)
                 return;
 
             if (e.NewElement != null)
+                AddGestureRecognizers();
+
+            if (e.OldElement != null)
+                RemoveGestureRecognizers();
+        }
+
+        private void AddGestureRecognizers()
+        {
+            try
             {
-                control.AddGestureRecognizer(_rightGestureRecognizer);
-                control.AddGestureRecognizer(_leftGestureRecognizer);
-                control.AddGestureRecognizer(_upGestureRecognizer);
-                control.AddGestureRecognizer(_downGestureRecognizer);
+                if (!NativeView.GestureRecognizers.Contains(_rightGestureRecognizer))
+                    NativeView.AddGestureRecognizer(_rightGestureRecognizer);
+
+                if (!NativeView.GestureRecognizers.Contains(_leftGestureRecognizer))
+                    NativeView.AddGestureRecognizer(_leftGestureRecognizer);
+
+                if (!NativeView.GestureRecognizers.Contains(_upGestureRecognizer))
+                    NativeView.AddGestureRecognizer(_upGestureRecognizer);
+
+                if (!NativeView.GestureRecognizers.Contains(_downGestureRecognizer))
+                    NativeView.AddGestureRecognizer(_downGestureRecognizer);
             }
+            catch (Exception)
+            { }
+        }
 
-            if (e.OldElement != null)
+        private void RemoveGestureRecognizers()
+        {
+            try
             {
-                control.RemoveGestureRecognizer(_rightGestureRecognizer);
-                control.RemoveGestureRecognizer(_leftGestureRecognizer);
-                control.RemoveGestureRecognizer(_upGestureRecognizer);
-                control.RemoveGestureRecognizer(_downGestureRecognizer);
+                if (NativeView.GestureRecognizers.Contains(_rightGestureRecognizer))
+                    NativeView.RemoveGestureRecognizer(_rightGestureRecognizer);
+
+                if (NativeView.GestureRecognizers.Contains(_leftGestureRecognizer))
+                    NativeView.RemoveGestureRecognizer(_leftGestureRecognizer);
+
+                if (NativeView.GestureRecognizers.Contains(_upGestureRecognizer))
+                    NativeView.RemoveGestureRecognizer(_upGestureRecognizer);
+
+                if (NativeView.GestureRecognizers.Contains(_downGestureRecognizer))
+                    NativeView.RemoveGestureRecognizer(_downGestureRecognizer);
             }
+            catch (Exception)
+            { }
         }
+
     }
 }