Fix imports, create podspec, subtle UI updates

.travis.yml

@@ -10,7 +10,7 @@ install:
   - bundle exec pod install
 script:
   - "./build.sh"
-osx_image: xcode7
+osx_image: xcode8.3
 env:
   global:
   - REPO_SLUG="2359media/STXDynamicTableView"

STXDynamicTableView/Cells/STXCaptionCell.h

@@ -7,6 +7,7 @@
 //
 
 @import UIKit;
+#import "STXUserItem.h"
 
 @class STXCaptionCell;
 

STXDynamicTableView/Cells/STXCaptionCell.m

@@ -8,6 +8,8 @@
 
 #import "STXCaptionCell.h"
 #import "STXAttributedLabel.h"
+#import <PureLayout/PureLayout.h>
+#import <UALogger/UALogger.h>
 
 static CGFloat STXCaptionViewLeadingEdgeInset = 10.f;
 static CGFloat STXCaptionViewTrailingEdgeInset = 10.f;

STXDynamicTableView/Cells/STXCommentCell.h

@@ -7,6 +7,7 @@
 //
 
 @import UIKit;
+#import "STXCommentItem.h"
 
 typedef NS_ENUM(int16_t, STXCommentCellStyle) {
     STXCommentCellStyleSingleComment,

STXDynamicTableView/Cells/STXCommentCell.m

@@ -8,6 +8,9 @@
 
 #import "STXCommentCell.h"
 #import "STXAttributedLabel.h"
+#import "STXUserItem.h"
+#import <PureLayout/PureLayout.h>
+#import <UALogger/UALogger.h>
 
 static CGFloat STXCommentViewLeadingEdgeInset = 10.f;
 static CGFloat STXCommentViewTrailingEdgeInset = 10.f;

STXDynamicTableView/Cells/STXFeedPhotoCell.h

@@ -7,6 +7,8 @@
 //
 
 @import UIKit;
+#import "STXUserItem.h"
+#import "STXPostItem.h"
 
 @protocol STXFeedPhotoCellDelegate <NSObject>
 

STXDynamicTableView/Cells/STXFeedPhotoCell.m

@@ -9,6 +9,8 @@
 #import "STXFeedPhotoCell.h"
 
 #import "UIImageView+Masking.h"
+#import <MHPrettyDate/MHPrettyDate.h>
+#import <AFNetworking/UIImageView+AFNetworking.h>
 
 @interface STXFeedPhotoCell ()
 

STXDynamicTableView/Cells/STXFeedPhotoCell.xib

@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -15,11 +19,11 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SjJ-hL-MAV" userLabel="Container">
-                        <rect key="frame" x="6" y="6" width="588" height="337.5"/>
+                        <rect key="frame" x="6" y="6" width="588" height="338"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kqs-ch-WXe" userLabel="Feed Photo Image View">
                                 <rect key="frame" x="0.0" y="36" width="588" height="300"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="300" id="d8r-Uw-tpQ"/>
                                 </constraints>
@@ -32,19 +36,19 @@
                                 </constraints>
                             </imageView>
                             <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hvo-1V-Ibr" userLabel="Profile Name Label">
-                                <rect key="frame" x="52" y="9" width="530" height="20.5"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <rect key="frame" x="52" y="9" width="530" height="21"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="17"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8o4-fH-CVs" userLabel="Date Label">
-                                <rect key="frame" x="543" y="10" width="42" height="20.5"/>
+                                <rect key="frame" x="543" y="10" width="42" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="kqs-ch-WXe" firstAttribute="leading" secondItem="SjJ-hL-MAV" secondAttribute="leading" id="0GL-bk-6mq"/>
                             <constraint firstItem="2TE-OO-Yt5" firstAttribute="leading" secondItem="SjJ-hL-MAV" secondAttribute="leading" id="67s-Dy-Z05"/>
@@ -74,4 +78,9 @@
             </connections>
         </tableViewCell>
     </objects>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
+    </simulatedMetricsContainer>
 </document>

STXDynamicTableView/Cells/STXLikesCell.m

@@ -7,6 +7,9 @@
 //
 
 #import "STXLikesCell.h"
+#import <TTTAttributedLabel/TTTAttributedLabel.h>
+#import <PureLayout/PureLayout.h>
+#import <UALogger/UALogger.h>
 
 static CGFloat STXLikesViewLeadingEdgeInset = 10.f;
 static CGFloat STXLikesViewTrailingEdgeInset = 10.f;
@@ -87,7 +90,7 @@ - (void)setLikes:(NSDictionary *)likes
 - (void)setLikesLabel:(TTTAttributedLabel *)likesLabel count:(NSInteger)count
 {
     NSString *countString = [@(count) stringValue];
-    NSString *title = [NSString stringWithFormat:NSLocalizedString(@"%@ loves", nil), countString];
+    NSString *title = [NSString stringWithFormat:NSLocalizedString(@"%@ likes", nil), countString];
     likesLabel.text = title;
 }
 
@@ -109,9 +112,9 @@ - (void)setLikersLabel:(TTTAttributedLabel *)likersLabel likers:(NSArray *)liker
 
     if ([likersString length] > 0) {
         if ([likerNames count] == 1) {
-            [likersString appendString:NSLocalizedString(@" loves this", nil)];
+            [likersString appendString:NSLocalizedString(@" likes this", nil)];
         } else {
-            [likersString appendString:NSLocalizedString(@" love this", nil)];
+            [likersString appendString:NSLocalizedString(@" like this", nil)];
         }
     }
 

STXDynamicTableView/Cells/STXUserActionCell.h

@@ -7,6 +7,7 @@
 //
 
 @import UIKit;
+#import "STXPostItem.h"
 
 @class STXUserActionCell;
 

STXDynamicTableView/Cells/STXUserActionCell.m

@@ -8,8 +8,6 @@
 
 #import "STXUserActionCell.h"
 
-#import "UIButton+STXButton.h"
-
 @interface STXUserActionCell ()
 
 @property (weak, nonatomic) IBOutlet UIButton *likeButton;
@@ -49,28 +47,17 @@ - (void)setSelected:(BOOL)selected animated:(BOOL)animated
 - (void)setPostItem:(id<STXPostItem>)postItem
 {
     _postItem = postItem;
-
-    NSString *likeButtonTitle = postItem.liked ? NSLocalizedString(@"Loved", nil) : NSLocalizedString(@"Love", nil);
-    [self.likeButton setTitle:likeButtonTitle forState:UIControlStateNormal];
-
-    if (postItem.liked) {
-        [self.likeButton stx_setSelectedAppearance];
-    } else {
-        [self.likeButton stx_setNormalAppearance];
-    }
+
+    [self.likeButton setImage:[UIImage imageNamed:(postItem.liked ? @"ic_favorite" : @"ic_favorite_border") inBundle:[NSBundle bundleForClass:[STXUserActionCell class]] compatibleWithTraitCollection:nil]
+                     forState:UIControlStateNormal];
 }
 
 #pragma mark - Action
 
 - (void)setButton:(UIButton *)button toLoved:(BOOL)loved
 {
-    if (loved) {
-        [button setTitle:NSLocalizedString(@"Loved", nil) forState:UIControlStateNormal];
-        [button stx_setSelectedAppearance];
-    } else {
-        [button setTitle:NSLocalizedString(@"Love", nil) forState:UIControlStateNormal];
-        [button stx_setNormalAppearance];
-    }
+    [self.likeButton setImage:[UIImage imageNamed:(loved ? @"ic_favorite" : @"ic_favorite_border") inBundle:[NSBundle bundleForClass:[STXUserActionCell class]] compatibleWithTraitCollection:nil]
+                     forState:UIControlStateNormal];
 }
 
 - (IBAction)like:(id)sender
@@ -81,9 +68,6 @@ - (IBAction)like:(id)sender
         return;
     }
 
-    // Prevent rapid interaction
-    [sender setUserInteractionEnabled:NO];
-
     if (![self.postItem liked]) {
         [self setButton:sender toLoved:YES];
 

STXDynamicTableView/Cells/STXUserActionCell.xib

@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -15,35 +19,44 @@
                 <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S4R-5B-KND">
-                        <rect key="frame" x="10" y="9" width="190.5" height="30"/>
-                        <state key="normal" title="Love">
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S4R-5B-KND">
+                        <rect key="frame" x="94" y="12" width="24" height="24"/>
+                        <state key="normal" image="ic_favorite_border">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </state>
+                        <connections>
+                            <action selector="like:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="rIj-xT-O93"/>
+                        </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IWo-cB-LDF" userLabel="Button Divider">
-                        <rect key="frame" x="200" y="8" width="1" height="28"/>
-                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                        <rect key="frame" x="200.5" y="8" width="1" height="28"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="1" id="5Ry-u4-r2a"/>
                             <constraint firstAttribute="height" constant="28" id="wJf-kH-xA5"/>
                         </constraints>
                     </view>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xcU-Ci-npS">
-                        <rect key="frame" x="200.5" y="9" width="191" height="30"/>
-                        <state key="normal" title="Comment">
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xcU-Ci-npS">
+                        <rect key="frame" x="285" y="12" width="24" height="24"/>
+                        <state key="normal" image="ic_comment">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </state>
+                        <connections>
+                            <action selector="comment:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="kTC-WX-avq"/>
+                        </connections>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Enb-uG-skx">
-                        <rect key="frame" x="391" y="9" width="190.5" height="30"/>
-                        <state key="normal" title="Share">
-                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Enb-uG-skx">
+                        <rect key="frame" x="475" y="12" width="24" height="24"/>
+                        <state key="normal" image="ic_share">
+                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </state>
+                        <connections>
+                            <action selector="share:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="BMx-Yn-2Rm"/>
+                        </connections>
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vWy-01-QxB" userLabel="Button Divider">
-                        <rect key="frame" x="390" y="8" width="1" height="28"/>
-                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                        <rect key="frame" x="390.5" y="8" width="1" height="28"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="28" id="bSV-vc-pLa"/>
                             <constraint firstAttribute="width" constant="1" id="hjc-sV-nyx"/>
@@ -78,4 +91,14 @@
             <point key="canvasLocation" x="418" y="239"/>
         </tableViewCell>
     </objects>
+    <resources>
+        <image name="ic_comment" width="24" height="24"/>
+        <image name="ic_favorite_border" width="24" height="24"/>
+        <image name="ic_share" width="24" height="24"/>
+    </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
+    </simulatedMetricsContainer>
 </document>

STXDynamicTableView/Images.xcassets/ic_comment.imageset/Contents.json

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

STXDynamicTableView/Images.xcassets/ic_favorite.imageset/Contents.json

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

STXDynamicTableView/Images.xcassets/ic_favorite_border.imageset/Contents.json

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