splinesoft · Grubas7 · Dec 31, 2015 · Dec 27, 2015
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # SSDynamicText CHANGELOG
 
+## 0.5.1
+###### unreleased
+
+- **(fixed)** Fixed `titleLabel` font upgrade for `SSDynamicButton` after font change, [#27](https://github.com/splinesoft/SSDynamicText/issues/8). _([Grubas7](https://github.com/Grubas7))_
+
 ## 0.5.0
 ###### October 5, 2015
 

diff --git a/Example/SSDynamicTextTests/SSDynamicButtonTests.m b/Example/SSDynamicTextTests/SSDynamicButtonTests.m
@@ -84,8 +84,6 @@ - (void)testButtonTitleLabelFontSizeShouldBeEqualToLabelFontSizeIncreasedByPrefe
     }
 }
 
-/**
- Uncomment after fix: https://github.com/splinesoft/SSDynamicText/issues/27
 - (void)testButtonTitleLabelFontSizeShouldBeEqualToNewFontSizeIncreasedByContentSizeCategoryDelta {
     //Arrange
     CGFloat newFontSize = 7.0f;
@@ -103,9 +101,8 @@ - (void)testButtonTitleLabelFontSizeShouldBeEqualToNewFontSizeIncreasedByContent
         XCTAssertEqualWithAccuracy(button.titleLabel.font.pointSize, newFontSize + SSTestFontSizeDifferenceForSizeExtraExtraLarge, FLT_EPSILON);
     }
 }
- */
 
-- (void)testButtonTitleLabelAttributedStringFontSizesShouldBeIncreasedByContentSizeCategoryDelta {
+- (void)testButtonTitleLabelAttributedTitleFontSizesShouldBeIncreasedByContentSizeCategoryDelta {
     //Arrange
     NSAttributedString *attributedString = [SSAttributedStringValidator testAttributedString];
 
@@ -120,8 +117,6 @@ - (void)testButtonTitleLabelAttributedStringFontSizesShouldBeIncreasedByContentS
         //Assert
         XCTAssertTrue([SSAttributedStringValidator isValidTestAttributedString:button.titleLabel.attributedText
                                                                 changedByDelta:SSTestFontSizeDifferenceForSizeExtraExtraLarge]);
-
-        XCTAssertEqualObjects(button.titleLabel.attributedText.string, attributedString.string);
     }
 }
 

diff --git a/Example/SSDynamicTextTests/UIView+SSTextSizeTests.m b/Example/SSDynamicTextTests/UIView+SSTextSizeTests.m
@@ -6,11 +6,11 @@
 //  Copyright (c) 2015 Splinesoft. All rights reserved.
 //
 
-#import "UIView+SSTextSize.h"
-#import "SSDynamicLabel.h"
+#import <XCTest/XCTest.h>
 #import "SSTestsHelper.h"
 
-#import <XCTest/XCTest.h>
+#import "UIView+SSTextSize.h"
+#import "SSDynamicLabel.h"
 
 @interface UIView_SSTextSizeTests : XCTestCase
 
@@ -51,7 +51,7 @@ - (void)testDefaultBaseSizeShouldBeEqualTo16IfInfoBundleNotSet {
     CGFloat baseSize = [self.label ss_defaultBaseSize];
 
     //Assert
-    XCTAssertEqualWithAccuracy(16, baseSize, FLT_EPSILON, @"Default base size should be 16");
+    XCTAssertEqualWithAccuracy(baseSize, 16, FLT_EPSILON, @"Default base size should be 16");
 
     //Clean Up
     [SSTestsHelper stopMockingBundleDictionary];
@@ -68,12 +68,12 @@ - (void)testDefaultFontNameShouldBeEqualToInfoBundleIfSet {
     //Assert
     XCTAssertEqualObjects(fontName, expectedfontName, @"Default base name should be %@", expectedfontName);
 
-    // Clean Up
+    //Clean Up
     [SSTestsHelper stopMockingBundleDictionary];
 }
 
 - (void)testDefaultFontNameShouldBeEqualToSystemFontIfInfoBundleNotSet {
-    // Arrange
+    //Arrange
     NSString *expectedFontName = [UIFont systemFontOfSize:SSTestFontSize].fontName;
     [SSTestsHelper startMockingBundleDictionary:nil];
 
@@ -83,8 +83,34 @@ - (void)testDefaultFontNameShouldBeEqualToSystemFontIfInfoBundleNotSet {
     //Assert
     XCTAssertEqualObjects(fontName, expectedFontName, @"Default base name should be %@", expectedFontName);
 
-    // Clean Up
+    //Clean Up
     [SSTestsHelper stopMockingBundleDictionary];
 }
 
+- (void)testSetupDefaultFontDescriptiorBasedOnFontShouldBeEqualToInitialFontDescriptor {
+    //Arrange
+    UIFontDescriptor *fontDescriptor = [UIFontDescriptor fontDescriptorWithName:SSTestFontName size:SSTestFontSize];
+    SSDynamicLabel *label = [SSDynamicLabel labelWithFontDescriptor:fontDescriptor];
+
+    //Act
+    [label setupDefaultFontDescriptorBasedOnFont:[UIFont fontWithDescriptor:fontDescriptor size:SSTestFontSize]];
+
+    //Assert
+    XCTAssertEqualObjects(label.defaultFontDescriptor, fontDescriptor,
+                          @"Default font descriptor should have font %@ with size %f" , fontDescriptor.postscriptName, fontDescriptor.pointSize);
+}
+
+- (void)testSetupDefaultFontDescriptiorBasedOnNilFontShouldSetFontDescriptorWithDefaultValues {
+    //Arrange
+    UIView *testView = [[UIView alloc] init];
+    UIFontDescriptor *fontDescriptor = [UIFontDescriptor fontDescriptorWithName:[testView ss_defaultFontName] size:[testView ss_defaultBaseSize]];
+
+    //Act
+    [testView setupDefaultFontDescriptorBasedOnFont:nil];
+
+    //Assert
+    XCTAssertEqualObjects(testView.defaultFontDescriptor, fontDescriptor,
+                          @"Default font descriptor should have font %@ with size 16" , [UIFont systemFontOfSize:16.0].fontName);
+}
+
 @end
diff --git a/SSDynamicText/SSDynamicButton.h b/SSDynamicText/SSDynamicButton.h
@@ -3,7 +3,7 @@
 //  SSDynamicText
 //
 //  Created by Adam Grzegorowski on 18/07/15.
-//
+//  Copyright (c) 2015 Splinesoft. All rights reserved. 
 //
 
 #import <UIKit/UIKit.h>

diff --git a/SSDynamicText/SSDynamicButton.m b/SSDynamicText/SSDynamicButton.m
@@ -3,7 +3,7 @@
 //  SSDynamicText
 //
 //  Created by Adam Grzegorowski on 18/07/15.
-//
+//  Copyright (c) 2015 Splinesoft. All rights reserved. 
 //
 
 #import "SSDynamicButton.h"
@@ -15,8 +15,6 @@ @interface SSDynamicButton ()
 
 @property (nonatomic, strong) NSMutableDictionary *baseAttributedTitlesDictionary;
 
-- (void)setup;
-
 @end
 
 @implementation SSDynamicButton
@@ -39,7 +37,7 @@ - (void)setAttributedTitle:(NSAttributedString *)title forState:(UIControlState)
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame])) {
+    if (self = [super initWithFrame:frame]) {
         [self setup];
     }
 
@@ -50,20 +48,7 @@ - (void)awakeFromNib {
     [super awakeFromNib];
 
     NSAssert(self.buttonType == UIButtonTypeCustom, @"Change SSDynamicButton.buttonType to UIButtonTypeCustom in your nib");
-    NSString *fontName;
-    CGFloat baseSize = 0;
-
-    if (self.titleLabel.font) {
-        fontName = self.titleLabel.font.fontName;
-        baseSize = self.titleLabel.font.pointSize;
-    }
-
-    fontName = (fontName ?: [self ss_defaultFontName]);
-    baseSize = (baseSize ?: [self ss_defaultBaseSize]);
-
-    self.defaultFontDescriptor = (self.titleLabel.font.fontDescriptor ?:
-                                  [UIFontDescriptor fontDescriptorWithName:fontName
-                                                                      size:baseSize]);
+    [self setupDefaultFontDescriptorBasedOnFont:self.titleLabel.font];
 
     [self setup];
 }
@@ -82,14 +67,18 @@ + (instancetype)buttonWithFontDescriptor:(UIFontDescriptor *)descriptor {
 
 - (void)dealloc {
     [self ss_stopObservingTextSizeChanges];
+    [self removeTitleLabelFontObserver];
 }
 
 - (void)changeFontWithDelta:(NSInteger)newDelta {
     CGFloat preferredSize = [self.defaultFontDescriptor.fontAttributes[UIFontDescriptorSizeAttribute] floatValue];
     preferredSize += newDelta;
 
+    [self removeTitleLabelFontObserver];
     self.titleLabel.font = [UIFont fontWithDescriptor:self.defaultFontDescriptor
                                                  size:preferredSize];
+
+    [self addTitleLabelFontObserver];
 }
 
 - (void)changeAttributedTitle:(NSAttributedString *)attributedTitle forState:(UIControlState)state withFontSizeDelta:(NSInteger)newDelta {
@@ -98,13 +87,15 @@ - (void)changeAttributedTitle:(NSAttributedString *)attributedTitle forState:(UI
 
 - (void)changeAttributedStringWithDelta:(NSInteger)newDelta {
     [self.baseAttributedTitlesDictionary enumerateKeysAndObjectsUsingBlock:^(NSNumber *key, NSAttributedString *obj, BOOL *stop) {
-        [self changeAttributedTitle:obj forState:key.integerValue withFontSizeDelta:newDelta];
+        [self changeAttributedTitle:obj forState:key.unsignedIntegerValue withFontSizeDelta:newDelta];
     }];
 }
 
 - (void)setup {
     __weak typeof(self) weakSelf = self;
 
+    [self addTitleLabelFontObserver];
+
     SSTextSizeChangedBlock changeHandler = ^(NSInteger newDelta) {
 
         [weakSelf changeFontWithDelta:newDelta];
@@ -114,4 +105,27 @@ - (void)setup {
     [self ss_startObservingTextSizeChangesWithBlock:changeHandler];
 }
 
+#pragma mark - Font observing
+
+- (void)addTitleLabelFontObserver {
+    [self.titleLabel addObserver:self forKeyPath:NSStringFromSelector(@selector(font)) options:NSKeyValueObservingOptionNew context:NULL];
+}
+
+- (void)removeTitleLabelFontObserver {
+    [self.titleLabel removeObserver:self forKeyPath:NSStringFromSelector(@selector(font))];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context {
+    if ([keyPath isEqualToString:NSStringFromSelector(@selector(font))]) {
+
+        NSInteger newDelta = [UIApplication sharedApplication].preferredFontSizeDelta;
+        [self setupDefaultFontDescriptorBasedOnFont:self.titleLabel.font];
+
+        [self changeFontWithDelta:newDelta];
+        [self changeAttributedStringWithDelta:newDelta];
+    } else {
+        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+    }
+}
+
 @end
diff --git a/SSDynamicText/SSDynamicLabel.m b/SSDynamicText/SSDynamicLabel.m
@@ -32,11 +32,11 @@ - (void)setDefaultFontDescriptor:(UIFontDescriptor *)defaultFontDescriptor {
 
 - (void)setFont:(UIFont *)font {
     [super setFont:font];
-    [self setupBaseFontBasedOnCurrentFont];
+    [self setupDefaultFontDescriptorBasedOnFont:self.font];
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame])) {
+    if (self = [super initWithFrame:frame]) {
         [self startObservingTextSizeChanges];
     }
 
@@ -46,7 +46,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
 - (void)awakeFromNib {
     [super awakeFromNib];
 
-    [self setupBaseFontBasedOnCurrentFont];
+    [self setupDefaultFontDescriptorBasedOnFont:self.font];
     [self startObservingTextSizeChanges];
 }
 
@@ -83,23 +83,6 @@ - (SSDynamicTextSizeChanger *)createTextChanger {
     return changer;
 }
 
-- (void)setupBaseFontBasedOnCurrentFont {
-    NSString *fontName;
-    CGFloat baseSize = 0;
-
-    if (self.font) {
-        fontName = self.font.fontName;
-        baseSize = self.font.pointSize;
-    }
-
-    fontName = (fontName ?: [self ss_defaultFontName]);
-    baseSize = (baseSize ?: [self ss_defaultBaseSize]);
-
-    self.defaultFontDescriptor = (self.font.fontDescriptor ?:
-                                  [UIFontDescriptor fontDescriptorWithName:fontName
-                                                                      size:baseSize]);
-}
-
 - (void)startObservingTextSizeChanges {
     [self ss_startObservingTextSizeChangesWithBlock:self.textSizeChanger.changeHandler];
 }

diff --git a/SSDynamicText/SSDynamicTextField.m b/SSDynamicText/SSDynamicTextField.m
@@ -32,11 +32,11 @@ - (void)setDefaultFontDescriptor:(UIFontDescriptor *)defaultFontDescriptor {
 
 - (void)setFont:(UIFont *)font {
     [super setFont:font];
-    [self setupBaseFontBasedOnCurrentFont];
+    [self setupDefaultFontDescriptorBasedOnFont:self.font];
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame])) {
+    if (self = [super initWithFrame:frame]) {
         [self startObservingTextSizeChanges];
     }
 
@@ -46,7 +46,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
 - (void)awakeFromNib {
     [super awakeFromNib];
 
-    [self setupBaseFontBasedOnCurrentFont];
+    [self setupDefaultFontDescriptorBasedOnFont:self.font];
     [self startObservingTextSizeChanges];
 }
 
@@ -83,23 +83,6 @@ - (SSDynamicTextSizeChanger *)createTextChanger {
     return changer;
 }
 
-- (void)setupBaseFontBasedOnCurrentFont {
-    NSString *fontName;
-    CGFloat baseSize = 0;
-
-    if (self.font) {
-        fontName = self.font.fontName;
-        baseSize = self.font.pointSize;
-    }
-
-    fontName = (fontName ?: [self ss_defaultFontName]);
-    baseSize = (baseSize ?: [self ss_defaultBaseSize]);
-
-    self.defaultFontDescriptor = (self.font.fontDescriptor ?:
-                                  [UIFontDescriptor fontDescriptorWithName:fontName
-                                                                      size:baseSize]);
-}
-
 - (void)startObservingTextSizeChanges {
     [self ss_startObservingTextSizeChangesWithBlock:self.textSizeChanger.changeHandler];
 }

diff --git a/SSDynamicText/SSDynamicTextView.m b/SSDynamicText/SSDynamicTextView.m
@@ -32,11 +32,11 @@ - (void)setDefaultFontDescriptor:(UIFontDescriptor *)defaultFontDescriptor {
 
 - (void)setFont:(UIFont *)font {
     [super setFont:font];
-    [self setupBaseFontBasedOnCurrentFont];
+    [self setupDefaultFontDescriptorBasedOnFont:self.font];
 }
 
 - (instancetype)initWithFrame:(CGRect)frame {
-    if ((self = [super initWithFrame:frame])) {
+    if (self = [super initWithFrame:frame]) {
         [self startObservingTextSizeChanges];
     }
 
@@ -46,7 +46,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
 - (void)awakeFromNib {
     [super awakeFromNib];
 
-    [self setupBaseFontBasedOnCurrentFont];
+    [self setupDefaultFontDescriptorBasedOnFont:self.font];
     [self startObservingTextSizeChanges];
 }
 
@@ -83,23 +83,6 @@ - (SSDynamicTextSizeChanger *)createTextChanger {
     return changer;
 }
 
-- (void)setupBaseFontBasedOnCurrentFont {
-    NSString *fontName;
-    CGFloat baseSize = 0;
-
-    if (self.font) {
-        fontName = self.font.fontName;
-        baseSize = self.font.pointSize;
-    }
-
-    fontName = (fontName ?: [self ss_defaultFontName]);
-    baseSize = (baseSize ?: [self ss_defaultBaseSize]);
-
-    self.defaultFontDescriptor = (self.font.fontDescriptor ?:
-                                  [UIFontDescriptor fontDescriptorWithName:fontName
-                                                                      size:baseSize]);
-}
-
 - (void)startObservingTextSizeChanges {
     [self ss_startObservingTextSizeChangesWithBlock:self.textSizeChanger.changeHandler];
 }