Merge branch 'master' of https://github.com/cyril94440/TOMSMorphingLabel

into cyril94440-master
Austinate · Nov 11, 2014 · 1c38204 · 1c38204
2 parents a71f810 + 644f1ad
commit 1c38204
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/Classes/TOMSMorphingLabel.h b/Classes/TOMSMorphingLabel.h
@@ -18,5 +18,6 @@
 @property (nonatomic, assign, getter=isMorphingEnabled) BOOL morphingEnabled;
 
 - (void)setTextWithoutMorphing:(NSString *)text;
+- (void)setText:(NSString*)text withCompletionBlock:(void (^)(void))block;
 
 @end
diff --git a/Classes/TOMSMorphingLabel.m b/Classes/TOMSMorphingLabel.m
@@ -12,7 +12,9 @@
 
 #define kTOMSKernFactorAttributeName @"kTOMSKernFactorAttributeName"
 
-@interface TOMSMorphingLabel ()
+@interface TOMSMorphingLabel (){
+    void (^_block)(void);
+}
 
 @property (readonly, nonatomic, assign) NSUInteger numberOfAttributionStages;
 @property (readonly, nonatomic, strong) NSArray *attributionStages;
@@ -261,6 +263,18 @@ - (void)setText:(NSString *)text
     }
 }
 
+- (void)setText:(NSString*) text withCompletionBlock:(void (^)(void))block{
+    _block = block;
+    if (self.isMorphingEnabled) {
+        self.nextText = text ? text : @"";
+        if (self.displayLinkDuration > 0) {
+            [self beginMorphing];
+        }
+    } else {
+        super.text = text;
+    }
+}
+
 - (void)setAttributionStage:(NSInteger)attributionStage
 {
     @synchronized (self) {
@@ -399,6 +413,12 @@ - (void)endMorphing
                 if (self.nextText) {
                     [self beginMorphing];
                 }
+                else{
+                    if(_block != nil){
+                        _block();
+                        _block = nil;
+                    }
+                }
             }
         });
     });

diff --git a/TOMSMorphingLabelExample/TOMSMorphingLabelExample/ViewController.m b/TOMSMorphingLabelExample/TOMSMorphingLabelExample/ViewController.m
@@ -29,7 +29,10 @@ - (void)viewDidLoad {
     label.textAlignment = NSTextAlignmentCenter;
 
     [self.view addSubview:label];
-    [self toggleTextForLabel:label];
+    [label setText:@"Test" withCompletionBlock:^{
+        NSLog(@"First label animation completed");
+    }];
+    [self performSelector:@selector(toggleTextForLabel:) withObject:label afterDelay:2];
 }
 
 #pragma mark - toggling text