Merge pull request #29 from Grubas7/master

Add nullability and generics support

Author: Grubas7

CHANGELOG.md

@@ -4,6 +4,7 @@
 ###### unreleased
 
 - **(fixed)** Fixed `titleLabel` font upgrade for `SSDynamicButton` after font change, [#27](https://github.com/splinesoft/SSDynamicText/issues/8). _([Grubas7](https://github.com/Grubas7))_
+- **(modified)** Changed `ss_defaultFontName`, and `ss_defaultBaseSize` from methods to readonly properties. _([Grubas7](https://github.com/Grubas7))_
 
 ## 0.5.0
 ###### October 5, 2015

Example/SSDynamicTextTests/SSDynamicButtonTests.m

@@ -31,15 +31,22 @@ - (void)tearDown {
 }
 
 - (NSArray<SSDynamicButton *> *)dynamicButtonsWithFontName:(NSString *)fontName fontSize:(CGFloat)fontSize {
+    UIFontDescriptor *fontDescriptor = [UIFontDescriptor fontDescriptorWithName:fontName size:fontSize];
+
+    SSDynamicButton *dynamicButton = [[SSDynamicButton alloc] init];
+    dynamicButton.defaultFontDescriptor = fontDescriptor;
+
+    SSDynamicButton *dynamicButtonWithFrame = [[SSDynamicButton alloc] initWithFrame:CGRectZero];
+    dynamicButtonWithFrame.titleLabel.font = [UIFont fontWithName:fontName size:fontSize];
+
     SSDynamicButton *dynamicButtonWithFont = [SSDynamicButton buttonWithFont:fontName baseSize:fontSize];
 
-    UIFontDescriptor *fontDescriptor = [UIFontDescriptor fontDescriptorWithName:fontName size:fontSize];
     SSDynamicButton *dynamicButtonWithFontDescriptor = [SSDynamicButton buttonWithFontDescriptor:fontDescriptor];
 
     SSDynamicsView *view = [[NSBundle mainBundle] loadNibNamed:@"SSDynamicsView" owner:nil options:nil].firstObject;
     SSDynamicButton *dynamicButtonFromXib = view.button;
 
-    return @[ dynamicButtonWithFont, dynamicButtonWithFontDescriptor, dynamicButtonFromXib ];
+    return @[ dynamicButton, dynamicButtonWithFrame, dynamicButtonWithFont, dynamicButtonWithFontDescriptor, dynamicButtonFromXib ];
 }
 
 - (void)testButtonTitleLabelFontNameShouldBeEqualToFontNameFromConstructor {
@@ -102,7 +109,7 @@ - (void)testButtonTitleLabelFontSizeShouldBeEqualToNewFontSizeIncreasedByContent
     }
 }
 
-- (void)testButtonTitleLabelAttributedTitleFontSizesShouldBeIncreasedByContentSizeCategoryDelta {
+- (void)testButtonTitleLabelAttributedTitleFontSizesShouldBeIncreasedByContentSizeCategoryDeltaAfterSetAttributedTitle {
     //Arrange
     NSAttributedString *attributedString = [SSAttributedStringValidator testAttributedString];
 
@@ -115,7 +122,28 @@ - (void)testButtonTitleLabelAttributedTitleFontSizesShouldBeIncreasedByContentSi
         [button setAttributedTitle:attributedString forState:UIControlStateNormal];
 
         //Assert
-        XCTAssertTrue([SSAttributedStringValidator isValidTestAttributedString:button.titleLabel.attributedText
+        XCTAssertTrue([SSAttributedStringValidator isValidTestAttributedString:[button attributedTitleForState:UIControlStateNormal]
+                                                                changedByDelta:SSTestFontSizeDifferenceForSizeExtraExtraLarge]);
+    }
+}
+
+- (void)testButtonTitleLabelAttributedTitleFontSizesShouldBeIncreasedByContentSizeCategoryDeltaAfterPostContentSizeChangeNotification {
+    //Arrange
+    NSAttributedString *attributedString = [SSAttributedStringValidator testAttributedString];
+
+    NSArray<SSDynamicButton *> *dynamicButtons = [self dynamicButtonsWithFontName:SSTestFontName fontSize:SSTestFontSize];
+
+    for (SSDynamicButton *button in dynamicButtons) {
+        [button setAttributedTitle:attributedString forState:UIControlStateNormal];
+    }
+
+    [SSTestsHelper startMockingPreferredContentSizeCategory:UIContentSizeCategoryExtraExtraLarge];
+    //Act
+    [SSTestsHelper postContentSizeChangeNotification];
+
+    for (SSDynamicButton *button in dynamicButtons) {
+        //Assert
+        XCTAssertTrue([SSAttributedStringValidator isValidTestAttributedString:[button attributedTitleForState:UIControlStateNormal]
                                                                 changedByDelta:SSTestFontSizeDifferenceForSizeExtraExtraLarge]);
     }
 }

Example/SSDynamicTextTests/SSDynamicLabelTests.m

@@ -30,24 +30,31 @@ - (void)tearDown {
     [super tearDown];
 }
 
-- (NSArray *)dynamicLabelsWithFontName:(NSString *)fontName fontSize:(CGFloat)fontSize {
+- (NSArray<SSDynamicLabel *> *)dynamicLabelsWithFontName:(NSString *)fontName fontSize:(CGFloat)fontSize {
+    UIFontDescriptor *fontDescriptor = [UIFontDescriptor fontDescriptorWithName:fontName size:fontSize];
+
+    SSDynamicLabel *dynamicLabel = [[SSDynamicLabel alloc] init];
+    dynamicLabel.defaultFontDescriptor = fontDescriptor;
+
+    SSDynamicLabel *dynamicLabelWithFrame = [[SSDynamicLabel alloc] initWithFrame:CGRectZero];
+    dynamicLabelWithFrame.font = [UIFont fontWithName:fontName size:fontSize];
+
     SSDynamicLabel *dynamicLabelWithFont = [SSDynamicLabel labelWithFont:fontName baseSize:fontSize];
 
-    UIFontDescriptor *fontDescriptor = [UIFontDescriptor fontDescriptorWithName:fontName size:fontSize];
     SSDynamicLabel *dynamicLabelWithFontDescriptor = [SSDynamicLabel labelWithFontDescriptor:fontDescriptor];
 
     SSDynamicsView *view = [[NSBundle mainBundle] loadNibNamed:@"SSDynamicsView" owner:nil options:nil].firstObject;
     SSDynamicLabel *dynamicLabelFromXib = view.label;
 
-    return @[ dynamicLabelWithFont, dynamicLabelWithFontDescriptor, dynamicLabelFromXib ];
+    return @[ dynamicLabel, dynamicLabelWithFrame, dynamicLabelWithFont, dynamicLabelWithFontDescriptor, dynamicLabelFromXib ];
 }
 
 - (void)testLabelFontNameShouldBeEqualToFontNameFromConstructor {
     //Arrange
     NSString *expectedFontName = SSTestFontName;
 
     //Act
-    NSArray *dynamicLabels = [self dynamicLabelsWithFontName:SSTestFontName fontSize:SSTestFontSize];
+    NSArray<SSDynamicLabel *> *dynamicLabels = [self dynamicLabelsWithFontName:SSTestFontName fontSize:SSTestFontSize];
 
     for (SSDynamicLabel *label in dynamicLabels) {
         //Assert

Example/SSDynamicTextTests/SSDynamicTextFieldTests.m

@@ -30,16 +30,23 @@ - (void)tearDown {
     [super tearDown];
 }
 
-- (NSArray *)dynamicTextFieldsWithFontName:(NSString *)fontName fontSize:(CGFloat)fontSize {
+- (NSArray<SSDynamicTextField *> *)dynamicTextFieldsWithFontName:(NSString *)fontName fontSize:(CGFloat)fontSize {
+    UIFontDescriptor *fontDescriptor = [UIFontDescriptor fontDescriptorWithName:fontName size:fontSize];
+
+    SSDynamicTextField *dynamicTextField = [[SSDynamicTextField alloc] init];
+    dynamicTextField.defaultFontDescriptor = fontDescriptor;
+
+    SSDynamicTextField *dynamicTextFieldWithFrame = [[SSDynamicTextField alloc] initWithFrame:CGRectZero];
+    dynamicTextFieldWithFrame.font = [UIFont fontWithName:fontName size:fontSize];
+
     SSDynamicTextField *dynamicTextFieldWithFont = [SSDynamicTextField textFieldWithFont:fontName baseSize:fontSize];
 
-    UIFontDescriptor *fontDescriptor = [UIFontDescriptor fontDescriptorWithName:fontName size:fontSize];
     SSDynamicTextField *dynamicTextFieldWithFontDescriptor = [SSDynamicTextField textFieldWithFontDescriptor:fontDescriptor];
 
     SSDynamicsView *view = [[NSBundle mainBundle] loadNibNamed:@"SSDynamicsView" owner:nil options:nil].firstObject;
     SSDynamicTextField *dynamicTextFieldFromXib = view.textField;
 
-    return @[ dynamicTextFieldWithFont, dynamicTextFieldWithFontDescriptor, dynamicTextFieldFromXib ];
+    return @[ dynamicTextField, dynamicTextFieldWithFrame, dynamicTextFieldWithFont, dynamicTextFieldWithFontDescriptor, dynamicTextFieldFromXib ];
 }
 
 - (void)testTextFieldFontNameShouldBeEqualToFontNameFromConstructor {
@@ -89,7 +96,7 @@ - (void)testLabelFontSizeShouldBeEqualToNewFontSizeIncreasedByContentSizeCategor
     CGFloat newFontSize = 7.0f;
     UIFont *newFont = [UIFont systemFontOfSize:newFontSize];
 
-    NSArray *dynamicTextField = [self dynamicTextFieldsWithFontName:SSTestFontName fontSize:SSTestFontSize];
+    NSArray<SSDynamicTextField *> *dynamicTextField = [self dynamicTextFieldsWithFontName:SSTestFontName fontSize:SSTestFontSize];
 
     [SSTestsHelper startMockingPreferredContentSizeCategory:UIContentSizeCategoryExtraExtraLarge];
 

Example/SSDynamicTextTests/SSDynamicTextViewTests.m

@@ -30,16 +30,24 @@ - (void)tearDown {
     [super tearDown];
 }
 
-- (NSArray *)dynamicTextViewsWithFontName:(NSString *)fontName fontSize:(CGFloat)fontSize {
-    SSDynamicTextView *dynamicTextViewWithFont = [SSDynamicTextView textViewWithFont:fontName baseSize:fontSize];
+- (NSArray<SSDynamicsView *> *)dynamicTextViewsWithFontName:(NSString *)fontName fontSize:(CGFloat)fontSize {
 
     UIFontDescriptor *fontDescriptor = [UIFontDescriptor fontDescriptorWithName:fontName size:fontSize];
+
+    SSDynamicTextView *dynamicTextView = [[SSDynamicTextView alloc] init];
+    dynamicTextView.defaultFontDescriptor = fontDescriptor;
+
+    SSDynamicTextView *dynamicTextViewWithFrame = [[SSDynamicTextView alloc] initWithFrame:CGRectZero];
+    dynamicTextViewWithFrame.font = [UIFont fontWithName:fontName size:fontSize];
+
+    SSDynamicTextView *dynamicTextViewWithFont = [SSDynamicTextView textViewWithFont:fontName baseSize:fontSize];
+
     SSDynamicTextView *dynamicTextViewWithFontDescriptor = [SSDynamicTextView textViewWithFontDescriptor:fontDescriptor];
 
     SSDynamicsView *view = [[NSBundle mainBundle] loadNibNamed:@"SSDynamicsView" owner:nil options:nil].firstObject;
     SSDynamicTextView *dynamicTextViewFromXib = view.textView;
 
-    return @[ dynamicTextViewWithFont, dynamicTextViewWithFontDescriptor, dynamicTextViewFromXib ];
+    return @[ dynamicTextView, dynamicTextViewWithFrame, dynamicTextViewWithFont, dynamicTextViewWithFontDescriptor, dynamicTextViewFromXib ];
 }
 
 - (void)testTextViewFontNameShouldBeEqualToFontNameFromConstructor {
@@ -89,7 +97,7 @@ - (void)testTextViewFontSizeShouldBeEqualToNewFontSizeIncreasedByContentSizeCate
     CGFloat newFontSize = 7.0f;
     UIFont *newFont = [UIFont systemFontOfSize:newFontSize];
 
-    NSArray *dynamicTextViews = [self dynamicTextViewsWithFontName:SSTestFontName fontSize:SSTestFontSize];
+    NSArray<SSDynamicTextView *> *dynamicTextViews = [self dynamicTextViewsWithFontName:SSTestFontName fontSize:SSTestFontSize];
 
     [SSTestsHelper startMockingPreferredContentSizeCategory:UIContentSizeCategoryExtraExtraLarge];
 

Example/SSDynamicTextTests/UIFont+SSTextSizeTests.m

@@ -21,7 +21,7 @@ @implementation UIFont_SSTextSizeTests
 - (void)testDynamicFontWithNameBaseSizeShouldReturnFontWithSizeIncreasedOfPreferredFontSizeDelta {
 
     //Arrange
-    NSArray *contentSizeCategories = @[
+    NSArray<NSString *> *contentSizeCategories = @[
         UIContentSizeCategoryExtraSmall,
         UIContentSizeCategorySmall,
         UIContentSizeCategoryMedium,

README.md

@@ -9,6 +9,10 @@ What's not so neat, though, is that `+[UIFont preferredFontForTextStyle:]` only
 
 SSDynamicText is a collection of simple `UILabel`, `UIButton`, `UITextField`, and `UITextView` subclasses inspired by [this](http://stackoverflow.com/questions/18758227/ios7-can-we-use-other-than-helvetica-neue-fonts-with-dynamic-type/19024944#19024944) SO answer.
 
+## Requirements
+
+Xcode 7.0+ with iOS 7.0+ SDK.
+
 ## Install
 
 Install with [CocoaPods](http://cocoapods.org). Add to your `Podfile`:

SSDynamicText.podspec

@@ -1,15 +1,16 @@
 Pod::Spec.new do |s|
-  s.name         = "SSDynamicText"
-  s.version      = "0.5.0"
-  s.summary      = "UILabel/TextField/TextView subclasses that support custom fonts with iOS 7's dynamic text sizes."
-  s.homepage     = "https://github.com/splinesoft/SSDynamicText"
-  s.license      = { :type => 'MIT', :file => 'LICENSE'  }
-  s.author       = { "Jonathan Hersh" => "jon@her.sh" }
-  s.source       = { :git => "https://github.com/splinesoft/SSDynamicText.git", :tag => s.version.to_s }
-  s.platform     = :ios, '7.0'
-  s.requires_arc = true
-  s.source_files = 'SSDynamicText/*.{h,m}'
-  s.frameworks   = 'UIKit'
+  s.name           = "SSDynamicText"
+  s.version        = "0.5.0"
+  s.summary        = "UILabel/UIButton/UITextField/UITextView subclasses that support custom fonts with iOS 7's dynamic text sizes."
+  s.homepage       = "https://github.com/splinesoft/SSDynamicText"
+  s.license        = { :type => 'MIT', :file => 'LICENSE'  }
+  s.author         = { "Jonathan Hersh" => "jon@her.sh" }
+  s.source         = { :git => "https://github.com/splinesoft/SSDynamicText.git", :tag => s.version.to_s }
+  s.platform       = :ios, '7.0'
+  s.requires_arc   = true
+  s.compiler_flags = "-fmodules"
+  s.source_files   = 'SSDynamicText/*.{h,m}'
+  s.frameworks     = 'UIKit'
   s.ios.deployment_target = '7.0'
   s.social_media_url = 'https://twitter.com/jhersh'
 end

SSDynamicText/NSAttributedString+SSTextSize.h

@@ -3,10 +3,10 @@
 //  SSDynamicText
 //
 //  Created by Remigiusz Herba on 28/08/15.
-//
+//  Copyright (c) 2015 Splinesoft. All rights reserved. 
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @interface NSAttributedString (SSTextSize)
 
@@ -17,6 +17,6 @@
  * A positive number will increase font size.
  * @return new NSAttributedString object with font size changed by delta.
  */
-- (NSAttributedString *)ss_attributedStringWithAdjustedFontSizeWithDelta:(NSInteger)delta;
+- (nonnull NSAttributedString *)ss_attributedStringWithAdjustedFontSizeWithDelta:(NSInteger)delta;
 
 @end

SSDynamicText/NSAttributedString+SSTextSize.m

@@ -3,7 +3,7 @@
 //  SSDynamicText
 //
 //  Created by Remigiusz Herba on 28/08/15.
-//
+//  Copyright (c) 2015 Splinesoft. All rights reserved. 
 //
 
 #import "NSAttributedString+SSTextSize.h"