Add ability set attributed string and icons into dropdown (#6)

* Add ability set attributed string into dropdown
Add ability set icon into dropdown

* Code review

* Add Snapshot tests
Add test for NSAttributedString

* Add Snapshot images for iOS 10

Author: densa

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -21,6 +21,11 @@
 		6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
 		62376C80B690B4F0A3184C73 /* Pods_TPSDropDown_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4F19BBE24005C855CBF36D78 /* Pods_TPSDropDown_Example.framework */; };
 		873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
+		990EF5BE1E150FDB00FCEC9B /* TPSNSAttributedStringTPSDropDownItemTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 990EF5BD1E150FDB00FCEC9B /* TPSNSAttributedStringTPSDropDownItemTests.m */; };
+		990EF5C01E1519FF00FCEC9B /* TPSDropDownSnapshotTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 990EF5BF1E1519FF00FCEC9B /* TPSDropDownSnapshotTests.m */; };
+		990EF5C11E151B9400FCEC9B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
+		990EF5D01E16521000FCEC9B /* TPSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5A6195388D20070C39A /* TPSViewController.m */; };
+		990EF5D11E16738600FCEC9B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5A8195388D20070C39A /* Images.xcassets */; };
 		B8198F0F1DF852FA00C8AD1B /* TPSNSStringTPSDropDownItemTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B8198ED61DF83ED900C8AD1B /* TPSNSStringTPSDropDownItemTests.m */; };
 		B8198F101DF852FA00C8AD1B /* TPSDropDownTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B8198F091DF8425700C8AD1B /* TPSDropDownTests.m */; };
 		B8198F111DF852FA00C8AD1B /* TPSRoundDropDownTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B8198F0B1DF8426600C8AD1B /* TPSRoundDropDownTests.m */; };
@@ -70,6 +75,8 @@
 		6C4421A98A3E310918D7A19F /* Pods-TPSDropDown_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TPSDropDown_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-TPSDropDown_Tests/Pods-TPSDropDown_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		6F8338D75C58CC4E77EDBF22 /* Pods_TPSDropDown_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TPSDropDown_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
+		990EF5BD1E150FDB00FCEC9B /* TPSNSAttributedStringTPSDropDownItemTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPSNSAttributedStringTPSDropDownItemTests.m; sourceTree = "<group>"; };
+		990EF5BF1E1519FF00FCEC9B /* TPSDropDownSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPSDropDownSnapshotTests.m; sourceTree = "<group>"; };
 		A5BCF57DBA8D77AB80CA46FB /* Pods-TPSDropDown_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TPSDropDown_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-TPSDropDown_Example/Pods-TPSDropDown_Example.release.xcconfig"; sourceTree = "<group>"; };
 		B8198ED61DF83ED900C8AD1B /* TPSNSStringTPSDropDownItemTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPSNSStringTPSDropDownItemTests.m; sourceTree = "<group>"; };
 		B8198F091DF8425700C8AD1B /* TPSDropDownTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TPSDropDownTests.m; sourceTree = "<group>"; };
@@ -175,9 +182,11 @@
 			children = (
 				6003F5B6195388D20070C39A /* Supporting Files */,
 				B8198ED61DF83ED900C8AD1B /* TPSNSStringTPSDropDownItemTests.m */,
+				990EF5BD1E150FDB00FCEC9B /* TPSNSAttributedStringTPSDropDownItemTests.m */,
 				B8198F091DF8425700C8AD1B /* TPSDropDownTests.m */,
 				B8198F0B1DF8426600C8AD1B /* TPSRoundDropDownTests.m */,
 				B8198F0D1DF8427300C8AD1B /* TPSSquareDropDownTests.m */,
+				990EF5BF1E1519FF00FCEC9B /* TPSDropDownSnapshotTests.m */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -311,8 +320,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				B8198F171DF85DDD00C8AD1B /* proximanova-semibold-webfont.ttf in Resources */,
+				990EF5D11E16738600FCEC9B /* Images.xcassets in Resources */,
 				B8198F181DF85DDF00C8AD1B /* theserif-regular.ttf in Resources */,
 				6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */,
+				990EF5C11E151B9400FCEC9B /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -426,10 +437,13 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				990EF5C01E1519FF00FCEC9B /* TPSDropDownSnapshotTests.m in Sources */,
 				B8198F0F1DF852FA00C8AD1B /* TPSNSStringTPSDropDownItemTests.m in Sources */,
 				B8198F101DF852FA00C8AD1B /* TPSDropDownTests.m in Sources */,
 				B8198F111DF852FA00C8AD1B /* TPSRoundDropDownTests.m in Sources */,
+				990EF5D01E16521000FCEC9B /* TPSViewController.m in Sources */,
 				B8198F121DF852FA00C8AD1B /* TPSSquareDropDownTests.m in Sources */,
+				990EF5BE1E150FDB00FCEC9B /* TPSNSAttributedStringTPSDropDownItemTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Example/Pods/Target Support Files/TPSDropDown/TPSDropDown-umbrella.h

@@ -38,6 +38,16 @@
                ReferencedContainer = "container:TPSDropDown.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "990EF5C51E1556A200FCEC9B"
+               BuildableName = "TPSDropDown_ExampleUITests.xctest"
+               BlueprintName = "TPSDropDown_ExampleUITests"
+               ReferencedContainer = "container:TPSDropDown.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
@@ -77,6 +87,11 @@
             value = "disable"
             isEnabled = "YES">
          </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "FB_REFERENCE_IMAGE_DIR"
+            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
+            isEnabled = "YES">
+         </EnvironmentVariable>
       </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>

Example/TPSDropDown.xcodeproj/project.pbxproj

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "1.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/TPSDropDown.xcodeproj/xcshareddata/xcschemes/TPSDropDown-Example.xcscheme

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/TPSDropDown/Images.xcassets/1.imageset/1.png

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "3.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/TPSDropDown/Images.xcassets/1.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "4.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/TPSDropDown/Images.xcassets/2.imageset/2.png

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/TPSDropDown/Images.xcassets/2.imageset/Contents.json

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11761" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Vth-xD-XMU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Vth-xD-XMU">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -13,7 +12,7 @@
         <!--View Controller-->
         <scene sceneID="wQg-tq-qST">
             <objects>
-                <viewController id="whP-gf-Uak" customClass="TPSViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="TPSViewController" id="whP-gf-Uak" customClass="TPSViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="uEw-UM-LJ8"/>
                         <viewControllerLayoutGuide type="bottom" id="Mvr-aV-6Um"/>
@@ -59,17 +58,39 @@
                                     <constraint firstItem="So2-eU-acY" firstAttribute="leading" secondItem="m0b-no-Hj2" secondAttribute="trailing" constant="8" id="wXL-f8-Ll3"/>
                                 </constraints>
                             </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U82-vx-SRE">
+                                <rect key="frame" x="16" y="140" width="343" height="60"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MH8-ED-FVN" customClass="TPSDropDown">
+                                        <rect key="frame" x="8" y="8" width="327" height="44"/>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstItem="MH8-ED-FVN" firstAttribute="top" secondItem="U82-vx-SRE" secondAttribute="top" constant="8" id="Ffw-CT-mwF"/>
+                                    <constraint firstAttribute="trailing" secondItem="MH8-ED-FVN" secondAttribute="trailing" constant="8" id="Yr3-3H-Nfa"/>
+                                    <constraint firstAttribute="height" constant="60" id="evh-b6-Ass"/>
+                                    <constraint firstAttribute="bottom" secondItem="MH8-ED-FVN" secondAttribute="bottom" constant="8" id="gCS-Ll-rLg"/>
+                                    <constraint firstItem="MH8-ED-FVN" firstAttribute="leading" secondItem="U82-vx-SRE" secondAttribute="leading" constant="8" id="gyK-WL-sWw"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
+                            <constraint firstItem="U82-vx-SRE" firstAttribute="leading" secondItem="TpU-gO-2f1" secondAttribute="leading" constant="16" id="4oi-mr-MtV"/>
                             <constraint firstItem="xy1-PW-lKR" firstAttribute="top" secondItem="uEw-UM-LJ8" secondAttribute="bottom" constant="20" id="5Af-7V-lhp"/>
+                            <constraint firstAttribute="trailing" secondItem="U82-vx-SRE" secondAttribute="trailing" constant="16" id="6jE-qp-8eZ"/>
                             <constraint firstItem="xy1-PW-lKR" firstAttribute="leading" secondItem="TpU-gO-2f1" secondAttribute="leadingMargin" id="ZiI-fS-htW"/>
+                            <constraint firstItem="U82-vx-SRE" firstAttribute="top" secondItem="xy1-PW-lKR" secondAttribute="bottom" constant="8" id="eJ5-QC-vWe"/>
                             <constraint firstAttribute="trailingMargin" secondItem="xy1-PW-lKR" secondAttribute="trailing" id="yuE-g4-chL"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="oWX-41-S0W"/>
                     <connections>
                         <outlet property="dropDown" destination="m0b-no-Hj2" id="a5Y-5p-t0C"/>
+                        <outlet property="payDropDown" destination="MH8-ED-FVN" id="K9L-b7-Uk2"/>
                         <outlet property="roundDropDown" destination="pTZ-Gf-Q54" id="wbR-LX-lvT"/>
                         <outlet property="squareDropDown" destination="So2-eU-acY" id="ZZ3-SW-VLK"/>
                     </connections>
@@ -83,7 +104,7 @@
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="Vth-xD-XMU" sceneMemberID="viewController">
                     <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="A2c-r2-vFJ">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="A2c-r2-vFJ">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>

Example/TPSDropDown/Images.xcassets/3.imageset/3.png

@@ -7,7 +7,10 @@
 //
 
 @import UIKit;
+@import TPSDropDown;
 
 @interface TPSViewController : UIViewController
-
+- (void)openDropDown;
+- (void)openPaymentDropDown;
+- (void)closeAllDropDowns;
 @end

Example/TPSDropDown/Images.xcassets/3.imageset/Contents.json

@@ -12,12 +12,32 @@
 #import <TPSDropDown/TPSRoundDropDown.h>
 #import <TPSDropDown/TPSSquareDropDown.h>
 
-@interface TPSViewController ()
+@interface TPSDropDownPayItem : NSObject <TPSDropDownItem>
+@property (nonatomic, copy) NSString *title;
+@property (nonatomic, copy) NSString *iconName;
+@end
+
+@implementation TPSDropDownPayItem
 
+- (instancetype)initWithTitle:(NSString*)title iconName:(NSString*)iconName {
+    if (self = [super init]) {
+        self.title = title;
+        self.iconName = iconName;
+    }
+    return self;
+}
+
+- (NSAttributedString *)attributedTitle {
+    return nil;
+}
+
+@end
+
+@interface TPSViewController ()
 @property (weak, nonatomic) IBOutlet TPSDropDown *dropDown;
 @property (weak, nonatomic) IBOutlet TPSSquareDropDown *squareDropDown;
 @property (weak, nonatomic) IBOutlet TPSRoundDropDown *roundDropDown;
-
+@property (weak, nonatomic) IBOutlet TPSDropDown *payDropDown;
 @end
 
 @implementation TPSViewController
@@ -29,12 +49,38 @@ - (void)viewDidLoad {
 
     self.dropDown.items = @[@"One", @"Two", @"Three"];
     self.dropDown.selectedItemIndex = 0;
-    
+
     self.squareDropDown.items = @[@"One", @"Two", @"Three"];
     self.squareDropDown.selectedItemIndex = 0;
 
     self.roundDropDown.items = @[@"One", @"Two", @"Three"];
     self.roundDropDown.selectedItemIndex = 0;
+    
+    TPSDropDownPayItem *visaItem = [[TPSDropDownPayItem alloc] initWithTitle:@"Visa" iconName:@"1"];
+    TPSDropDownPayItem *masterItem = [[TPSDropDownPayItem alloc] initWithTitle:@"Master Card" iconName:@"2"];
+    TPSDropDownPayItem *maestroItem = [[TPSDropDownPayItem alloc] initWithTitle:@"PayPal" iconName:@"3"];
+    TPSDropDownPayItem *payPalItem = [[TPSDropDownPayItem alloc] initWithTitle:@"Maestro" iconName:@"4"];
+
+    self.payDropDown.items = @[visaItem, masterItem, payPalItem, maestroItem];
+    self.payDropDown.selectedItemIndex = 0;
+}
+
+#pragma mark - Open / Close 
+
+- (void)openDropDown {
+    [self.dropDown openDropDown:NO];
+}
+
+- (void)openPaymentDropDown {
+    [self.payDropDown openDropDown:NO];
+}
+
+// Close dropdowns for Snapshot tests
+- (void)closeAllDropDowns {
+    [self.dropDown closeDropDown:NO];
+    [self.squareDropDown closeDropDown:NO];
+    [self.roundDropDown closeDropDown:NO];
+    [self.payDropDown closeDropDown:NO];
 }
 
 @end