fixup (+1 squashed commit)

jhonatanfernando · AndreiMisiukevich · commit 5e01170a21f8 · 2020-02-07T01:03:47.000+03:00
Squashed commits: [8b0c379] fixup (+1 squashed commit) Squashed commits: [08e8609] #40 (+1 squashed commit) Squashed commits: [aa00d2d] When using it on Image component, getting exception for Android (#41) * When using it on Image component, getting exception for Android * Update PlatformTouchEff.cs * Update TouchEffectSample.sln * Update TouchEffectSample.iOS.csproj
diff --git a/TouchEffect.Droid/PlatformTouchEff.cs b/TouchEffect.Droid/PlatformTouchEff.cs
@@ -24,7 +24,7 @@ public class PlatformTouchEff : PlatformEffect
     {
         public static void Preserve() { }
 
-        
+
         private TouchEff _effect;
         private bool _isHoverSupported;
         private RippleDrawable _ripple;
@@ -49,7 +49,7 @@ protected override void OnAttached()
                 Control.Touch += OnTouch;
             }
 
-            if(_effect.NativeAnimation)
+            if (_effect.NativeAnimation)
             {
                 View.Clickable = true;
                 View.LongClickable = true;
@@ -64,8 +64,10 @@ protected override void OnAttached()
                 _ripple = CreateRipple();
                 _ripple.Radius = (int)(View.Context.Resources.DisplayMetrics.Density * _effect.NativeAnimationRadius);
                 _viewOverlay.Background = _ripple;
-
-                Container.AddView(_viewOverlay);
+                if (Container != null)
+                {
+                    Container.AddView(_viewOverlay);
+                }
                 _viewOverlay.BringToFront();
             }
         }
@@ -76,18 +78,26 @@ protected override void OnDetached()
             {
                 _effect.Control = null;
                 _effect = null;
-                Container.LayoutChange -= LayoutChange;
+
                 if (Container != null)
                 {
+                    Container.LayoutChange -= LayoutChange;
                     Container.Touch -= OnTouch;
                 }
+
                 if (Control != null)
                 {
+                    Control.LayoutChange -= LayoutChange;
                     Control.Touch -= OnTouch;
                 }
+
                 if (_viewOverlay != null)
                 {
-                    Container.RemoveView(_viewOverlay);
+                    if (Container != null)
+                    {
+                        Container.RemoveView(_viewOverlay);
+                    }
+
                     _viewOverlay.Pressed = false;
                     _viewOverlay.Foreground = null;
                     _viewOverlay.Dispose();
@@ -104,6 +114,7 @@ protected override void OnDetached()
         private void OnTouch(object sender, AView.TouchEventArgs e)
         {
             e.Handled = true;
+
             switch (e.Event.ActionMasked)
             {
                 case MotionEventActions.Down:
@@ -124,12 +135,12 @@ private void OnTouch(object sender, AView.TouchEventArgs e)
                     HandleEnd(TouchStatus.Canceled);
                     break;
                 case MotionEventActions.Move:
-                    if(_canceled)
+                    if (_canceled)
                     {
                         return;
                     }
-                    var diffX = Abs(e.Event.GetX() - _startX) / Container.Context.Resources.DisplayMetrics.Density;
-                    var diffY = Abs(e.Event.GetY() - _startY) / Container.Context.Resources.DisplayMetrics.Density;
+                    var diffX = Abs(e.Event.GetX() - _startX) / View.Context.Resources.DisplayMetrics.Density;
+                    var diffY = Abs(e.Event.GetY() - _startY) / View.Context.Resources.DisplayMetrics.Density;
                     var maxDiff = Max(diffX, diffY);
                     var disallowTouchThreshold = _effect.DisallowTouchThreshold;
                     if (disallowTouchThreshold > 0 && maxDiff > disallowTouchThreshold)
@@ -152,7 +163,7 @@ private void OnTouch(object sender, AView.TouchEventArgs e)
                     if (Element.GetTouchEff().Status != status)
                     {
                         Element.GetTouchEff().HandleTouch(status);
-                        if(status == TouchStatus.Started)
+                        if (status == TouchStatus.Started)
                             StartRipple(e.Event.GetX(), e.Event.GetY());
                         if (status == TouchStatus.Canceled)
                             EndRipple();
@@ -174,7 +185,7 @@ private void OnTouch(object sender, AView.TouchEventArgs e)
 
         private void HandleEnd(TouchStatus status)
         {
-            if(_canceled)
+            if (_canceled)
             {
                 return;
             }
diff --git a/TouchEffectSample.sln b/TouchEffectSample.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.136
+# Visual Studio Version 15
+VisualStudioVersion = 15.0.2837.136
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TouchEffectSample.Android", "TouchEffectSample.Android\TouchEffectSample.Android.csproj", "{9EED875F-F3C4-4753-9064-39DF7CD222AA}"
 EndProject
@@ -639,4 +639,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {ADEA45D4-665F-46B4-A93C-24985213924B}
 	EndGlobalSection
-EndGlobal
+EndGlobal

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class PlatformTouchEff : PlatformEffect`
`24`	`24`	`{`
`25`	`25`	`public static void Preserve() { }`
`26`	`26`
`27`		`-`
	`27`	`+`
`28`	`28`	`private TouchEff _effect;`
`29`	`29`	`private bool _isHoverSupported;`
`30`	`30`	`private RippleDrawable _ripple;`
`@@ -49,7 +49,7 @@ protected override void OnAttached()`
`49`	`49`	`Control.Touch += OnTouch;`
`50`	`50`	`}`
`51`	`51`
`52`		`- if(_effect.NativeAnimation)`
	`52`	`+ if (_effect.NativeAnimation)`
`53`	`53`	`{`
`54`	`54`	`View.Clickable = true;`
`55`	`55`	`View.LongClickable = true;`
`@@ -64,8 +64,10 @@ protected override void OnAttached()`
`64`	`64`	`_ripple = CreateRipple();`
`65`	`65`	`_ripple.Radius = (int)(View.Context.Resources.DisplayMetrics.Density * _effect.NativeAnimationRadius);`
`66`	`66`	`_viewOverlay.Background = _ripple;`
`67`		`-`
`68`		`- Container.AddView(_viewOverlay);`
	`67`	`+ if (Container != null)`
	`68`	`+ {`
	`69`	`+ Container.AddView(_viewOverlay);`
	`70`	`+ }`
`69`	`71`	`_viewOverlay.BringToFront();`
`70`	`72`	`}`
`71`	`73`	`}`
`@@ -76,18 +78,26 @@ protected override void OnDetached()`
`76`	`78`	`{`
`77`	`79`	`_effect.Control = null;`
`78`	`80`	`_effect = null;`
`79`		`- Container.LayoutChange -= LayoutChange;`
	`81`	`+`
`80`	`82`	`if (Container != null)`
`81`	`83`	`{`
	`84`	`+ Container.LayoutChange -= LayoutChange;`
`82`	`85`	`Container.Touch -= OnTouch;`
`83`	`86`	`}`
	`87`	`+`
`84`	`88`	`if (Control != null)`
`85`	`89`	`{`
	`90`	`+ Control.LayoutChange -= LayoutChange;`
`86`	`91`	`Control.Touch -= OnTouch;`
`87`	`92`	`}`
	`93`	`+`
`88`	`94`	`if (_viewOverlay != null)`
`89`	`95`	`{`
`90`		`- Container.RemoveView(_viewOverlay);`
	`96`	`+ if (Container != null)`
	`97`	`+ {`
	`98`	`+ Container.RemoveView(_viewOverlay);`
	`99`	`+ }`
	`100`	`+`
`91`	`101`	`_viewOverlay.Pressed = false;`
`92`	`102`	`_viewOverlay.Foreground = null;`
`93`	`103`	`_viewOverlay.Dispose();`
`@@ -104,6 +114,7 @@ protected override void OnDetached()`
`104`	`114`	`private void OnTouch(object sender, AView.TouchEventArgs e)`
`105`	`115`	`{`
`106`	`116`	`e.Handled = true;`
	`117`	`+`
`107`	`118`	`switch (e.Event.ActionMasked)`
`108`	`119`	`{`
`109`	`120`	`case MotionEventActions.Down:`
`@@ -124,12 +135,12 @@ private void OnTouch(object sender, AView.TouchEventArgs e)`
`124`	`135`	`HandleEnd(TouchStatus.Canceled);`
`125`	`136`	`break;`
`126`	`137`	`case MotionEventActions.Move:`
`127`		`- if(_canceled)`
	`138`	`+ if (_canceled)`
`128`	`139`	`{`
`129`	`140`	`return;`
`130`	`141`	`}`
`131`		`- var diffX = Abs(e.Event.GetX() - _startX) / Container.Context.Resources.DisplayMetrics.Density;`
`132`		`- var diffY = Abs(e.Event.GetY() - _startY) / Container.Context.Resources.DisplayMetrics.Density;`
	`142`	`+ var diffX = Abs(e.Event.GetX() - _startX) / View.Context.Resources.DisplayMetrics.Density;`
	`143`	`+ var diffY = Abs(e.Event.GetY() - _startY) / View.Context.Resources.DisplayMetrics.Density;`
`133`	`144`	`var maxDiff = Max(diffX, diffY);`
`134`	`145`	`var disallowTouchThreshold = _effect.DisallowTouchThreshold;`
`135`	`146`	`if (disallowTouchThreshold > 0 && maxDiff > disallowTouchThreshold)`
`@@ -152,7 +163,7 @@ private void OnTouch(object sender, AView.TouchEventArgs e)`
`152`	`163`	`if (Element.GetTouchEff().Status != status)`
`153`	`164`	`{`
`154`	`165`	`Element.GetTouchEff().HandleTouch(status);`
`155`		`- if(status == TouchStatus.Started)`
	`166`	`+ if (status == TouchStatus.Started)`
`156`	`167`	`StartRipple(e.Event.GetX(), e.Event.GetY());`
`157`	`168`	`if (status == TouchStatus.Canceled)`
`158`	`169`	`EndRipple();`
`@@ -174,7 +185,7 @@ private void OnTouch(object sender, AView.TouchEventArgs e)`
`174`	`185`
`175`	`186`	`private void HandleEnd(TouchStatus status)`
`176`	`187`	`{`
`177`		`- if(_canceled)`
	`188`	`+ if (_canceled)`
`178`	`189`	`{`
`179`	`190`	`return;`
`180`	`191`	`}`