From 7931e2b9e4dabadec2f961e407c41d7717d00407 Mon Sep 17 00:00:00 2001 From: Breland Date: Wed, 23 Jan 2013 08:10:57 -0500 Subject: [PATCH] Bug fixes Updated to get the event for TouchUpOutside, meaning if they slide outside of the view, or if they slide past, we still get the event. Also, updated the "alpha" part of label when sliding, math was incorrect, and I wanted it to wait longer to fully fade out. --- Classes/SlideToCancelViewController.m | 16 +++- .../contents.xcworkspacedata | 7 ++ .../UserInterfaceState.xcuserstate | Bin 0 -> 9510 bytes .../xcschemes/SlideToCancel.xcscheme | 86 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 22 +++++ 5 files changed, 128 insertions(+), 3 deletions(-) create mode 100644 SlideToCancel.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 SlideToCancel.xcodeproj/project.xcworkspace/xcuserdata/breland.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 SlideToCancel.xcodeproj/xcuserdata/breland.xcuserdatad/xcschemes/SlideToCancel.xcscheme create mode 100644 SlideToCancel.xcodeproj/xcuserdata/breland.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/Classes/SlideToCancelViewController.m b/Classes/SlideToCancelViewController.m index 220e2a5..690a597 100755 --- a/Classes/SlideToCancelViewController.m +++ b/Classes/SlideToCancelViewController.m @@ -93,6 +93,13 @@ - (void)loadView { [slider addTarget:self action:@selector(sliderChanged:) forControlEvents:UIControlEventValueChanged]; + + //Adding a target for when you release outisde of the "view" + //This way, if they slide past the end or off the axis, we'll still get the expected result + //And it'll slide back! + [slider addTarget:self + action:@selector(sliderUp:) + forControlEvents:UIControlEventTouchUpOutside]; // Create the label with the actual size required by the text // If you change the text, font, or font size by using the "label" property, @@ -177,9 +184,12 @@ - (void) sliderChanged: (UISlider *) sender { // Fade the text as the slider moves to the right. This code makes the // text totally dissapear when the slider is 35% of the way to the right. - label.alpha = MAX(0.0, 1.0 - (slider.value * 3.5)); - - // Stop the animation if the slider moved off the zero point + + //This is incorrect, and I wanted it to stay visible slightly longer + //label.alpha = MAX(0.0, 1.0 - (slider.value * 3.5)); + label.alpha= MAX(0.0, 1.0 - (slider.value / 0.65)); + + // Stop the animation if the slider moved off the zero point if (slider.value != 0) { [self stopTimer]; [label.layer setNeedsDisplay]; diff --git a/SlideToCancel.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SlideToCancel.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..7831b4f --- /dev/null +++ b/SlideToCancel.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/SlideToCancel.xcodeproj/project.xcworkspace/xcuserdata/breland.xcuserdatad/UserInterfaceState.xcuserstate b/SlideToCancel.xcodeproj/project.xcworkspace/xcuserdata/breland.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..1da0ca436fd6be2bfd0622028cb2843d479e80ee GIT binary patch literal 9510 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 VbvQX9LR(JZhshH^Bmd*q{tMPy`JVs) literal 0 HcmV?d00001 diff --git a/SlideToCancel.xcodeproj/xcuserdata/breland.xcuserdatad/xcschemes/SlideToCancel.xcscheme b/SlideToCancel.xcodeproj/xcuserdata/breland.xcuserdatad/xcschemes/SlideToCancel.xcscheme new file mode 100644 index 0000000..fc5350c --- /dev/null +++ b/SlideToCancel.xcodeproj/xcuserdata/breland.xcuserdatad/xcschemes/SlideToCancel.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SlideToCancel.xcodeproj/xcuserdata/breland.xcuserdatad/xcschemes/xcschememanagement.plist b/SlideToCancel.xcodeproj/xcuserdata/breland.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..d4d11a5 --- /dev/null +++ b/SlideToCancel.xcodeproj/xcuserdata/breland.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + SlideToCancel.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 1D6058900D05DD3D006BFB54 + + primary + + + + +