add iOS 8.0 test; dynamically change the wave cycles can work

Alex1989Wang · Alex1989Wang · commit 7dd9c3d4f668 · 2018-04-06T18:08:18.000+08:00
diff --git a/Example/JWWaveView/TestExamples/ClickToRemove/JWClickToRemove.storyboard b/Example/JWWaveView/TestExamples/ClickToRemove/JWClickToRemove.storyboard
@@ -39,13 +39,22 @@
                                     <action selector="clickToRemoveWaveView:" destination="4UP-kR-Cxk" eventType="touchUpInside" id="sGm-Hv-uba"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IMd-38-N5B">
+                                <rect key="frame" x="104.5" y="494" width="111" height="30"/>
+                                <state key="normal" title="Add Wave Cycle"/>
+                                <connections>
+                                    <action selector="clickToAddWaveCycle:" destination="4UP-kR-Cxk" eventType="touchUpInside" id="v2S-U9-VeU"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="DH6-gF-Yr9" firstAttribute="centerY" secondItem="leL-7A-GzG" secondAttribute="centerY" id="7i0-Hq-uAu"/>
                             <constraint firstItem="c8C-kS-923" firstAttribute="top" secondItem="DH6-gF-Yr9" secondAttribute="bottom" constant="80" id="O8c-Mw-Wke"/>
                             <constraint firstItem="c8C-kS-923" firstAttribute="centerX" secondItem="leL-7A-GzG" secondAttribute="centerX" id="RdF-tb-3mh"/>
+                            <constraint firstItem="IMd-38-N5B" firstAttribute="centerX" secondItem="leL-7A-GzG" secondAttribute="centerX" id="lba-j1-upT"/>
                             <constraint firstItem="DH6-gF-Yr9" firstAttribute="centerX" secondItem="leL-7A-GzG" secondAttribute="centerX" id="nIO-a9-gyL"/>
+                            <constraint firstItem="IMd-38-N5B" firstAttribute="top" secondItem="c8C-kS-923" secondAttribute="bottom" constant="30" id="rhS-0I-Tjv"/>
                         </constraints>
                     </view>
                     <connections>
diff --git a/Example/JWWaveView/TestExamples/ClickToRemove/JWClickToRemoveWaveViewTestController.m b/Example/JWWaveView/TestExamples/ClickToRemove/JWClickToRemoveWaveViewTestController.m
@@ -54,6 +54,12 @@ - (IBAction)clickToRemoveWaveView:(UIButton *)sender {
     }
 }
 
+- (IBAction)clickToAddWaveCycle:(UIButton *)sender {
+    NSInteger currentCycle = self.waveView.waveCycles;
+    currentCycle++;
+    self.waveView.waveCycles = currentCycle;
+}
+
 - (void)setAnimationPaused:(BOOL)animationPaused {
     _animationPaused = animationPaused;
 }
diff --git a/JWWaveView.podspec b/JWWaveView.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'JWWaveView'
-  s.version          = '0.2.3'
+  s.version          = '0.2.4'
   s.summary          = 'Providing a water waving effect for any of your UIView instance.'
 
 # This description is used to generate tags and improve search results.
diff --git a/JWWaveView/Classes/JWWaveView.m b/JWWaveView/Classes/JWWaveView.m
@@ -12,6 +12,7 @@
 
 @interface JWWaveView ()
 @property (nonatomic, strong) CAShapeLayer *waveShapeLayer;
+@property (nonatomic, assign) BOOL shouldRestart; //if animation was started once; set this flat to YES;
 @end
 
 @implementation JWWaveView
@@ -20,19 +21,14 @@ @implementation JWWaveView
 - (void)startWavingIfNeeded {
     CAReplicatorLayer *replicatorLayer = [self replicatorLayer];
     CGRect replicatorRect = replicatorLayer.bounds;
-    if (CGRectIsEmpty(replicatorRect)) {
-        return;
-    }
-    
     self.waveShapeLayer.frame = replicatorRect;
-    CGFloat instanceWidth = CGRectGetWidth(replicatorRect);
-    replicatorLayer.instanceTransform = CATransform3DMakeTranslation(instanceWidth, 0, 0);
     
     //setup shape
-    [self setupWavePath];
-    
+    [self renewWavePathWithForceRenew:NO animated:NO];
+
     //restart animtion
     [self restartWaveShapeTranslation];
+    _shouldRestart = YES;
 }
 
 - (void)pauseWavingIfNeeded {
@@ -81,19 +77,36 @@ - (CAReplicatorLayer *)replicatorLayer {
 }
 
 - (void)willMoveToSuperview:(UIView *)newSuperview {
+    [super willMoveToSuperview:newSuperview];
     if (!newSuperview) {
         [self pauseWavingIfNeeded];
     }
     else {
-        [self restartWaveShapeTranslation];
+        //has started before by calling the public api
+        if (self.shouldRestart) {
+            [self restartWaveShapeTranslation];
+        }
     }
-    [super willMoveToSuperview:newSuperview];
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    CAReplicatorLayer *replicatorLayer = [self replicatorLayer];
+    CGRect replicatorRect = replicatorLayer.bounds;
+    self.waveShapeLayer.frame = replicatorRect;
 }
 
 #pragma mark - Private
 - (void)restartWaveShapeTranslation {
+    //layer setup
     CAReplicatorLayer *replicatorLayer = [self replicatorLayer];
     CGRect replicatorRect = replicatorLayer.bounds;
+    CGFloat instanceWidth = CGRectGetWidth(replicatorRect);
+    replicatorLayer.instanceTransform = CATransform3DMakeTranslation(instanceWidth, 0, 0);
+    if (CGRectIsEmpty(replicatorRect)) {
+        return;
+    }
+    
     if (![self.waveShapeLayer animationForKey:kWaveShapeTranslationAnimationKey]) {
         //add translation animation to shape layer;
         CABasicAnimation *transAnim = [CABasicAnimation animation];
@@ -125,44 +138,49 @@ - (void)configureWaveShapes {
     CAReplicatorLayer *replicatorLayer = [self replicatorLayer];
     
     //add two shape layers
+    CGRect replicatorRect = replicatorLayer.bounds;
+    self.waveShapeLayer.frame = replicatorRect;
     [replicatorLayer addSublayer:self.waveShapeLayer];
     replicatorLayer.instanceCount = 2;
     replicatorLayer.instanceDelay = 0;
 }
 
-- (void)setupWavePath {
+- (void)renewWavePathWithForceRenew:(BOOL)forceRenew animated:(BOOL)animated {
     CGRect sinPathCanvasRect = self.waveShapeLayer.bounds;
     sinPathCanvasRect = CGRectIntegral(sinPathCanvasRect);
     if (CGRectIsEmpty(sinPathCanvasRect)) {
         return;
     }
     
-    [CATransaction begin];
-    [CATransaction setDisableActions:YES];
-    CGFloat canvasWidth = sinPathCanvasRect.size.width;
-    CGFloat canvasHeight = sinPathCanvasRect.size.height;
-    CGFloat canvasMidY = CGRectGetMidY(sinPathCanvasRect);
-    UIBezierPath *sinPath = [UIBezierPath bezierPath];
-    sinPath.lineWidth = 1.f;
-    CGFloat yPos = 0;
-    for (CGFloat xPos = 0.f; xPos <= canvasWidth; xPos += 1.f) {
-        //wave path starts at the canvasMidY and uses (canvasHeight * 0.5) as amplitude
-        CGFloat halfAmplitude = canvasHeight / 4.f;
-        yPos = canvasMidY + sin((xPos)/canvasWidth * M_PI * 2 * _waveCycles) * halfAmplitude;
-        if (fpclassify(xPos) == FP_ZERO) {
-            [sinPath moveToPoint:(CGPoint){xPos, yPos}];
-        }
-        else {
-            [sinPath addLineToPoint:(CGPoint){xPos, yPos}];
+    //use default implicit animation
+    if (!self.waveShapeLayer.path || forceRenew) {
+        [CATransaction begin];
+        [CATransaction setDisableActions:!animated];
+        CGFloat canvasWidth = sinPathCanvasRect.size.width;
+        CGFloat canvasHeight = sinPathCanvasRect.size.height;
+        CGFloat canvasMidY = CGRectGetMidY(sinPathCanvasRect);
+        UIBezierPath *sinPath = [UIBezierPath bezierPath];
+        sinPath.lineWidth = 1.f;
+        CGFloat yPos = 0;
+        for (CGFloat xPos = 0.f; xPos <= canvasWidth; xPos += 1.f) {
+            //wave path starts at the canvasMidY and uses (canvasHeight * 0.5) as amplitude
+            CGFloat halfAmplitude = canvasHeight / 4.f;
+            yPos = canvasMidY + sin((xPos)/canvasWidth * M_PI * 2 * _waveCycles) * halfAmplitude;
+            if (fpclassify(xPos) == FP_ZERO) {
+                [sinPath moveToPoint:(CGPoint){xPos, yPos}];
+            }
+            else {
+                [sinPath addLineToPoint:(CGPoint){xPos, yPos}];
+            }
         }
+        
+        //close path
+        [sinPath addLineToPoint:(CGPoint){canvasWidth, canvasHeight}];
+        [sinPath addLineToPoint:(CGPoint){0, canvasHeight}];
+        [sinPath closePath];
+        self.waveShapeLayer.path = sinPath.CGPath;
+        [CATransaction commit];
     }
-    
-    //close path
-    [sinPath addLineToPoint:(CGPoint){canvasWidth, canvasHeight}];
-    [sinPath addLineToPoint:(CGPoint){0, canvasHeight}];
-    [sinPath closePath];
-    self.waveShapeLayer.path = sinPath.CGPath;
-    [CATransaction commit];
 }
 
 #pragma mark - Accessors
@@ -173,7 +191,11 @@ - (void)setWaveColor:(UIColor *)waveColor {
 
 - (void)setWaveCycles:(NSInteger)waveCycles {
     if (_waveCycles != waveCycles) {
-        _waveCycles = MAX(1, waveCycles);
+        NSInteger adjustedCycles = MAX(1, waveCycles);
+        if (adjustedCycles != _waveCycles) {
+            _waveCycles = adjustedCycles;
+            [self renewWavePathWithForceRenew:YES animated:YES];
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,12 @@ - (IBAction)clickToRemoveWaveView:(UIButton *)sender {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
	`57`	`+- (IBAction)clickToAddWaveCycle:(UIButton *)sender {`
	`58`	`+ NSInteger currentCycle = self.waveView.waveCycles;`
	`59`	`+ currentCycle++;`
	`60`	`+ self.waveView.waveCycles = currentCycle;`
	`61`	`+}`
	`62`	`+`
`57`	`63`	`- (void)setAnimationPaused:(BOOL)animationPaused {`
`58`	`64`	`_animationPaused = animationPaused;`
`59`	`65`	`}`