Fixed build

Author: AndreiMisiukevich

TouchEffect.Droid/PlatformTouchEff.cs

@@ -17,6 +17,7 @@
 using Android.Content;
 using AndroidOS = Android.OS;
 using System.ComponentModel;
+using Java.Interop;
 
 [assembly: ResolutionGroupName(nameof(TouchEffect))]
 [assembly: ExportEffect(typeof(PlatformTouchEff), nameof(TouchEff))]
@@ -28,6 +29,7 @@ public class PlatformTouchEff : PlatformEffect
         public static void Preserve() { }
 
         private AccessibilityManager _accessibilityManager;
+        private AccessibilityListener _accessibilityListener;
         private TouchEff _effect;
         private bool _isHoverSupported;
         private RippleDrawable _ripple;
@@ -63,8 +65,9 @@ protected override void OnAttached()
             _accessibilityManager = View.Context.GetSystemService(Context.AccessibilityService) as AccessibilityManager;
             if (_accessibilityManager != null)
             {
-                _accessibilityManager.AccessibilityStateChange += OnAccessibilityStateChange; ;
-                _accessibilityManager.TouchExplorationStateChange += OnTouchExplorationStateChange; ;
+                _accessibilityListener = new AccessibilityListener(this);
+                _accessibilityManager.AddAccessibilityStateChangeListener(_accessibilityListener);
+                _accessibilityManager.AddTouchExplorationStateChangeListener(_accessibilityListener);
             }
 
             if (_effect.NativeAnimation && Group != null && AndroidOS.Build.VERSION.SdkInt >= AndroidOS.BuildVersionCodes.Lollipop)
@@ -93,8 +96,10 @@ protected override void OnDetached()
             {
                 if (_accessibilityManager != null)
                 {
-                    _accessibilityManager.AccessibilityStateChange -= OnAccessibilityStateChange;
-                    _accessibilityManager.TouchExplorationStateChange -= OnTouchExplorationStateChange;
+                    _accessibilityManager.RemoveAccessibilityStateChangeListener(_accessibilityListener);
+                    _accessibilityManager.RemoveTouchExplorationStateChangeListener(_accessibilityListener);
+                    _accessibilityListener.Dispose();
+                    _accessibilityManager = null;
                     _accessibilityManager = null;
                 }
 
@@ -138,12 +143,6 @@ protected override void OnElementPropertyChanged(PropertyChangedEventArgs args)
             }
         }
 
-        private void OnTouchExplorationStateChange(object sender, AccessibilityManager.TouchExplorationStateChangeEventArgs e)
-            => UpdateClickHandler();
-
-        private void OnAccessibilityStateChange(object sender, AccessibilityManager.AccessibilityStateChangeEventArgs e)
-            => UpdateClickHandler();
-
         private void UpdateClickHandler()
         {
             View.Click -= OnClick;
@@ -336,5 +335,21 @@ private void LayoutChange(object sender, AView.LayoutChangeEventArgs e)
             _viewOverlay.Right = group.Width;
             _viewOverlay.Bottom = group.Height;
         }
+
+        private sealed class AccessibilityListener : Java.Lang.Object,
+                                             AccessibilityManager.IAccessibilityStateChangeListener,
+                                             AccessibilityManager.ITouchExplorationStateChangeListener
+        {
+            private readonly PlatformTouchEff _platformTouchEff;
+
+            internal AccessibilityListener(PlatformTouchEff platformTouchEff)
+                => _platformTouchEff = platformTouchEff;
+
+            public void OnAccessibilityStateChanged(bool enabled)
+                => _platformTouchEff.UpdateClickHandler();
+
+            public void OnTouchExplorationStateChanged(bool enabled)
+                => _platformTouchEff.UpdateClickHandler();
+        }
     }
 }

TouchEffect.Droid/TouchEffect.Droid.csproj

@@ -45,7 +45,6 @@
     <Reference Include="Xamarin.Android.Arch.Core.Common">
       <HintPath>..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Java.Interop" />
     <Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
       <HintPath>..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
     </Reference>