From 75c9a6b8051c50d55ee528eb13a0559709193683 Mon Sep 17 00:00:00 2001
From: Pabel Nunez L <pabel@timeset.com>
Date: Thu, 25 Aug 2016 12:01:24 -0400
Subject: [PATCH 1/2] Library is more customizable now

Implemented enableContinueLabel and enableSkipButton from workshirt/WSCoachMarksView.

Added lblFontSize, enableTapAction property because in my personal case i triggered every action with a timer and i dont wanted the user to tap and wanted the font to be bigger for continue label and skip button.

EnableContinueLabel default = NO
EnableSkipButton default = NO
LblFontSize default = 16.0f
---
 .DS_Store                      | Bin 6148 -> 6148 bytes
 Coach Marks/DDCoachMarksView.h |   6 +++
 Coach Marks/DDCoachMarksView.m |  73 ++++++++++++++++++++++++++++++++-
 3 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index daa9c9285993b5972e6cda93a337ed5d093f02d7..5aedab01910cb7999c9f05fc4838115f01929636 100644
GIT binary patch
delta 70
zcmZoMXffE3&dSI*nTJJcaue$$ri~vb_p$2n<>tG%q?DE<Gca6!a!hCP1U3VpPztJ$
NEfXWd=JRZ(f&f-w7%l(+

delta 67
zcmZoMXffE3&N|tVMS5}*>m<hMlP9w2^X2BdxTKVpBr`CaPfXUBJb}#sD3pRKWXr^G
KVe@%5Q$YaxKo(8_

diff --git a/Coach Marks/DDCoachMarksView.h b/Coach Marks/DDCoachMarksView.h
index 1053544..a30ad8b 100755
--- a/Coach Marks/DDCoachMarksView.h	
+++ b/Coach Marks/DDCoachMarksView.h	
@@ -19,12 +19,18 @@
 @property (nonatomic)           CGFloat animationDuration;
 @property (nonatomic)           CGFloat cutoutRadius;
 @property (nonatomic)           CGFloat maxLblWidth;
+@property (nonatomic)           CGFloat LblFontSize;
 @property (nonatomic)           CGFloat lblSpacing;
 @property (nonatomic)           BOOL    useBubbles;
+@property (nonatomic)           BOOL enableContinueLabel;
+@property (nonatomic)           BOOL enableSkipButton;
+@property (nonatomic)           BOOL enableTapAction;
+
 
 - (id)initWithFrame:(CGRect)frame coachMarks:(NSArray *)marks;
 - (void)setMaskColor:(UIColor *)maskColor;
 - (void)start;
+- (void)stop;
 
 @end
 
diff --git a/Coach Marks/DDCoachMarksView.m b/Coach Marks/DDCoachMarksView.m
index 9330a7c..4cda4ef 100755
--- a/Coach Marks/DDCoachMarksView.m	
+++ b/Coach Marks/DDCoachMarksView.m	
@@ -15,6 +15,10 @@
 static const CGFloat    kCutoutRadius = 2.0f;
 static const CGFloat    kMaxLblWidth = 230.0f;
 static const CGFloat    kLblSpacing = 35.0f;
+static const CGFloat    kLblFontSize = 16.0f;
+static const BOOL kEnableContinueLabel = NO;
+static const BOOL kEnableSkipButton = NO;
+static const BOOL kEnableTapAction = YES;
 
 @interface DDCoachMarksView ()
 @property (nonatomic, strong) DDCircleView  *animatingCircle;
@@ -25,6 +29,8 @@ @implementation DDCoachMarksView {
     CAShapeLayer    *mask;
     NSUInteger      markIndex;
     UILabel         *lblContinue;
+    UIButton        *btnSkipCoach;
+
 }
 
 #pragma mark - Methods
@@ -65,6 +71,10 @@ - (void)setup {
     self.cutoutRadius = kCutoutRadius;
     self.maxLblWidth = kMaxLblWidth;
     self.lblSpacing = kLblSpacing;
+    self.LblFontSize = kLblFontSize;
+    self.enableContinueLabel = kEnableContinueLabel;
+    self.enableSkipButton = kEnableSkipButton;
+    self.enableTapAction = kEnableTapAction;
     self.useBubbles = YES;
 
     // Shape layer mask
@@ -147,8 +157,14 @@ - (void)userDidTap:(UITapGestureRecognizer *)recognizer {
         [self.delegate didTapAtIndex:markIndex];
     }
     
-    // Go to the next coach mark
-    [self goToCoachMarkIndexed:(markIndex+1)];
+    if (self.enableTapAction == YES) {
+        // Go to the next coach mark
+        [self goToCoachMarkIndexed:(markIndex+1)];
+    }
+    else{
+        // Nothing
+    }
+
 }
 
 #pragma mark - Navigation
@@ -166,6 +182,23 @@ - (void)start {
                          [self goToCoachMarkIndexed:0];
                      }];
 }
+- (void)stop {
+    // Fade in self
+    self.alpha = 1.0f;
+    [UIView animateWithDuration:self.animationDuration
+                     animations:^{
+                         self.alpha = 0.0f;
+                     }
+                     completion:^(BOOL finished) {
+                         // Go to the first coach mark
+                         self.hidden = YES;
+                         [self goToCoachMarkIndexed:0];
+                     }];
+}
+
+- (void)skipCoach {
+    [self goToCoachMarkIndexed:self.coachMarks.count];
+}
 
 - (void)goToCoachMarkIndexed:(NSUInteger)index {
     // Out of bounds
@@ -203,6 +236,42 @@ - (void)goToCoachMarkIndexed:(NSUInteger)index {
     
     // Animate swipe gesture
     [self showSwipeGesture];
+    
+    CGFloat lblContinueWidth = self.enableSkipButton ? (70.0/100.0) * self.bounds.size.width : self.bounds.size.width;
+    CGFloat btnSkipWidth = self.bounds.size.width - lblContinueWidth;
+    
+    // Show continue lbl if first mark
+    if (self.enableContinueLabel) {
+        if (markIndex == 0) {
+            lblContinue = [[UILabel alloc] initWithFrame:(CGRect){{0, self.bounds.size.height - 30.0f}, {lblContinueWidth, 30.0f}}];
+            lblContinue.font = [UIFont boldSystemFontOfSize:self.LblFontSize];
+            lblContinue.textAlignment = NSTextAlignmentCenter;
+            lblContinue.text = @"Tap to continue";
+            lblContinue.alpha = 0.0f;
+            lblContinue.backgroundColor = [UIColor whiteColor];
+            [self addSubview:lblContinue];
+            [UIView animateWithDuration:0.3f delay:1.0f options:0 animations:^{
+                lblContinue.alpha = 1.0f;
+            } completion:nil];
+        } else if (markIndex > 0 && lblContinue != nil) {
+            // Otherwise, remove the lbl
+            [lblContinue removeFromSuperview];
+            lblContinue = nil;
+        }
+    }
+    
+    if (self.enableSkipButton) {
+        btnSkipCoach = [[UIButton alloc] initWithFrame:(CGRect){{lblContinueWidth, self.bounds.size.height - 30.0f}, {btnSkipWidth, 30.0f}}];
+        [btnSkipCoach addTarget:self action:@selector(skipCoach) forControlEvents:UIControlEventTouchUpInside];
+        [btnSkipCoach setTitle:@"Skip" forState:UIControlStateNormal];
+        btnSkipCoach.titleLabel.font = [UIFont boldSystemFontOfSize:self.LblFontSize];
+        btnSkipCoach.alpha = 0.0f;
+        btnSkipCoach.tintColor = [UIColor whiteColor];
+        [self addSubview:btnSkipCoach];
+        [UIView animateWithDuration:0.3f delay:1.0f options:0 animations:^{
+            btnSkipCoach.alpha = 1.0f;
+        } completion:nil];
+    }
 }
 
 #pragma mark - Swipe Animation

From ff6586b124bfd39d49657c6375697236f2465278 Mon Sep 17 00:00:00 2001
From: Pabel Nunez L <pabel@timeset.com>
Date: Thu, 25 Aug 2016 12:01:24 -0400
Subject: [PATCH 2/2] Library is more customizable now

Implemented enableContinueLabel and enableSkipButton from workshirt/WSCoachMarksView.

Added lblFontSize, enableTapAction property because in my personal case i triggered every action with a timer and i dont wanted the user to tap and wanted the font to be bigger for continue label and skip button.

Added a stop method.
[self.coachMarksView stop];


EnableContinueLabel default = NO
EnableSkipButton default = NO
LblFontSize default = 16.0f
---
 .DS_Store                      | Bin 6148 -> 6148 bytes
 Coach Marks/DDCoachMarksView.h |   6 +++
 Coach Marks/DDCoachMarksView.m |  73 ++++++++++++++++++++++++++++++++-
 3 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index daa9c9285993b5972e6cda93a337ed5d093f02d7..5aedab01910cb7999c9f05fc4838115f01929636 100644
GIT binary patch
delta 70
zcmZoMXffE3&dSI*nTJJcaue$$ri~vb_p$2n<>tG%q?DE<Gca6!a!hCP1U3VpPztJ$
NEfXWd=JRZ(f&f-w7%l(+

delta 67
zcmZoMXffE3&N|tVMS5}*>m<hMlP9w2^X2BdxTKVpBr`CaPfXUBJb}#sD3pRKWXr^G
KVe@%5Q$YaxKo(8_

diff --git a/Coach Marks/DDCoachMarksView.h b/Coach Marks/DDCoachMarksView.h
index 1053544..a30ad8b 100755
--- a/Coach Marks/DDCoachMarksView.h	
+++ b/Coach Marks/DDCoachMarksView.h	
@@ -19,12 +19,18 @@
 @property (nonatomic)           CGFloat animationDuration;
 @property (nonatomic)           CGFloat cutoutRadius;
 @property (nonatomic)           CGFloat maxLblWidth;
+@property (nonatomic)           CGFloat LblFontSize;
 @property (nonatomic)           CGFloat lblSpacing;
 @property (nonatomic)           BOOL    useBubbles;
+@property (nonatomic)           BOOL enableContinueLabel;
+@property (nonatomic)           BOOL enableSkipButton;
+@property (nonatomic)           BOOL enableTapAction;
+
 
 - (id)initWithFrame:(CGRect)frame coachMarks:(NSArray *)marks;
 - (void)setMaskColor:(UIColor *)maskColor;
 - (void)start;
+- (void)stop;
 
 @end
 
diff --git a/Coach Marks/DDCoachMarksView.m b/Coach Marks/DDCoachMarksView.m
index 9330a7c..4cda4ef 100755
--- a/Coach Marks/DDCoachMarksView.m	
+++ b/Coach Marks/DDCoachMarksView.m	
@@ -15,6 +15,10 @@
 static const CGFloat    kCutoutRadius = 2.0f;
 static const CGFloat    kMaxLblWidth = 230.0f;
 static const CGFloat    kLblSpacing = 35.0f;
+static const CGFloat    kLblFontSize = 16.0f;
+static const BOOL kEnableContinueLabel = NO;
+static const BOOL kEnableSkipButton = NO;
+static const BOOL kEnableTapAction = YES;
 
 @interface DDCoachMarksView ()
 @property (nonatomic, strong) DDCircleView  *animatingCircle;
@@ -25,6 +29,8 @@ @implementation DDCoachMarksView {
     CAShapeLayer    *mask;
     NSUInteger      markIndex;
     UILabel         *lblContinue;
+    UIButton        *btnSkipCoach;
+
 }
 
 #pragma mark - Methods
@@ -65,6 +71,10 @@ - (void)setup {
     self.cutoutRadius = kCutoutRadius;
     self.maxLblWidth = kMaxLblWidth;
     self.lblSpacing = kLblSpacing;
+    self.LblFontSize = kLblFontSize;
+    self.enableContinueLabel = kEnableContinueLabel;
+    self.enableSkipButton = kEnableSkipButton;
+    self.enableTapAction = kEnableTapAction;
     self.useBubbles = YES;
 
     // Shape layer mask
@@ -147,8 +157,14 @@ - (void)userDidTap:(UITapGestureRecognizer *)recognizer {
         [self.delegate didTapAtIndex:markIndex];
     }
     
-    // Go to the next coach mark
-    [self goToCoachMarkIndexed:(markIndex+1)];
+    if (self.enableTapAction == YES) {
+        // Go to the next coach mark
+        [self goToCoachMarkIndexed:(markIndex+1)];
+    }
+    else{
+        // Nothing
+    }
+
 }
 
 #pragma mark - Navigation
@@ -166,6 +182,23 @@ - (void)start {
                          [self goToCoachMarkIndexed:0];
                      }];
 }
+- (void)stop {
+    // Fade in self
+    self.alpha = 1.0f;
+    [UIView animateWithDuration:self.animationDuration
+                     animations:^{
+                         self.alpha = 0.0f;
+                     }
+                     completion:^(BOOL finished) {
+                         // Go to the first coach mark
+                         self.hidden = YES;
+                         [self goToCoachMarkIndexed:0];
+                     }];
+}
+
+- (void)skipCoach {
+    [self goToCoachMarkIndexed:self.coachMarks.count];
+}
 
 - (void)goToCoachMarkIndexed:(NSUInteger)index {
     // Out of bounds
@@ -203,6 +236,42 @@ - (void)goToCoachMarkIndexed:(NSUInteger)index {
     
     // Animate swipe gesture
     [self showSwipeGesture];
+    
+    CGFloat lblContinueWidth = self.enableSkipButton ? (70.0/100.0) * self.bounds.size.width : self.bounds.size.width;
+    CGFloat btnSkipWidth = self.bounds.size.width - lblContinueWidth;
+    
+    // Show continue lbl if first mark
+    if (self.enableContinueLabel) {
+        if (markIndex == 0) {
+            lblContinue = [[UILabel alloc] initWithFrame:(CGRect){{0, self.bounds.size.height - 30.0f}, {lblContinueWidth, 30.0f}}];
+            lblContinue.font = [UIFont boldSystemFontOfSize:self.LblFontSize];
+            lblContinue.textAlignment = NSTextAlignmentCenter;
+            lblContinue.text = @"Tap to continue";
+            lblContinue.alpha = 0.0f;
+            lblContinue.backgroundColor = [UIColor whiteColor];
+            [self addSubview:lblContinue];
+            [UIView animateWithDuration:0.3f delay:1.0f options:0 animations:^{
+                lblContinue.alpha = 1.0f;
+            } completion:nil];
+        } else if (markIndex > 0 && lblContinue != nil) {
+            // Otherwise, remove the lbl
+            [lblContinue removeFromSuperview];
+            lblContinue = nil;
+        }
+    }
+    
+    if (self.enableSkipButton) {
+        btnSkipCoach = [[UIButton alloc] initWithFrame:(CGRect){{lblContinueWidth, self.bounds.size.height - 30.0f}, {btnSkipWidth, 30.0f}}];
+        [btnSkipCoach addTarget:self action:@selector(skipCoach) forControlEvents:UIControlEventTouchUpInside];
+        [btnSkipCoach setTitle:@"Skip" forState:UIControlStateNormal];
+        btnSkipCoach.titleLabel.font = [UIFont boldSystemFontOfSize:self.LblFontSize];
+        btnSkipCoach.alpha = 0.0f;
+        btnSkipCoach.tintColor = [UIColor whiteColor];
+        [self addSubview:btnSkipCoach];
+        [UIView animateWithDuration:0.3f delay:1.0f options:0 animations:^{
+            btnSkipCoach.alpha = 1.0f;
+        } completion:nil];
+    }
 }
 
 #pragma mark - Swipe Animation