Fixed build

AndreiMisiukevich · Oct 28, 2020 · 194aca4 · 194aca4
1 parent e5b73db
commit 194aca4
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/TouchEffect.Droid/PlatformTouchEff.cs b/TouchEffect.Droid/PlatformTouchEff.cs
@@ -58,14 +58,14 @@ protected override void OnAttached()
  _effect.Control = Element as VisualElement;
 
  View.Touch += OnTouch;
+ UpdateClickHandler();
 
  _accessibilityManager = View.Context.GetSystemService(Context.AccessibilityService) as AccessibilityManager;
  if (_accessibilityManager != null)
  {
- _accessibilityManager.AccessibilityStateChange += OnAccessibilityChanged;
- _accessibilityManager.TouchExplorationStateChange += OnAccessibilityChanged;
+ _accessibilityManager.AccessibilityStateChange += OnAccessibilityStateChange; ;
+ _accessibilityManager.TouchExplorationStateChange += OnTouchExplorationStateChange; ;
  }
- OnAccessibilityChanged(_accessibilityManager, System.EventArgs.Empty);
 
  if (_effect.NativeAnimation && Group != null && AndroidOS.Build.VERSION.SdkInt >= AndroidOS.BuildVersionCodes.Lollipop)
  {
@@ -93,8 +93,8 @@ protected override void OnDetached()
  {
  if (_accessibilityManager != null)
  {
- _accessibilityManager.AccessibilityStateChange -= OnAccessibilityChanged;
- _accessibilityManager.TouchExplorationStateChange -= OnAccessibilityChanged;
+ _accessibilityManager.AccessibilityStateChange -= OnAccessibilityStateChange;
+ _accessibilityManager.TouchExplorationStateChange -= OnTouchExplorationStateChange;
  _accessibilityManager = null;
  }
 
@@ -134,11 +134,17 @@ protected override void OnElementPropertyChanged(PropertyChangedEventArgs args)
  if (args.PropertyName == TouchEff.IsAvailableProperty.PropertyName ||
  args.PropertyName == VisualElement.IsEnabledProperty.PropertyName)
  {
- OnAccessibilityChanged(_accessibilityManager, System.EventArgs.Empty);
+ UpdateClickHandler();
  }
  }
 
- private void OnAccessibilityChanged(object sender, System.EventArgs e)
+ private void OnTouchExplorationStateChange(object sender, AccessibilityManager.TouchExplorationStateChangeEventArgs e)
+ => UpdateClickHandler();
+
+ private void OnAccessibilityStateChange(object sender, AccessibilityManager.AccessibilityStateChangeEventArgs e)
+ => UpdateClickHandler();
+
+ private void UpdateClickHandler()
  {
  View.Click -= OnClick;
  if (IsAccessibilityMode || (_effect.IsAvailable && _effect.Control.IsEnabled))