clean up / modernize

Author: jessesquires

JSQMessages.xcodeproj/xcshareddata/xcschemes/JSQMessages.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

JSQMessagesDemo/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -71,6 +71,12 @@
       "idiom" : "ipad",
       "filename" : "[email protected]",
       "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "icon167.png",
+      "scale" : "2x"
     }
   ],
   "info" : {

JSQMessagesDemo/Images.xcassets/AppIcon.appiconset/icon167.png

@@ -82,7 +82,6 @@ - (void)testMediaMessageInit
 
 - (void)testMediaMessageInvalidInit
 {
-    XCTAssertThrows([[JSQMessage alloc] init], @"Invalid init should throw");
     XCTAssertThrows([[JSQMessage alloc] initWithSenderId:nil senderDisplayName:nil date:nil media:nil], @"Invalid init should throw");
 }
 

JSQMessagesTests/ModelTests/JSQMessageMediaTests.m

@@ -60,7 +60,6 @@ - (void)testTextMessageInit
 
 - (void)testTextMessageInvalidInit
 {
-    XCTAssertThrows([[JSQMessage alloc] init], @"Invalid init should throw");
     XCTAssertThrows([[JSQMessage alloc] initWithSenderId:nil senderDisplayName:nil date:nil text:nil], @"Invalid init should throw");
 }
 

JSQMessagesTests/ModelTests/JSQMessageTextTests.m

@@ -32,7 +32,6 @@ - (void)tearDown
 
 - (void)testInitInvalid
 {
-    XCTAssertThrows([[JSQMessagesAvatarImage alloc] init], @"Invalid init should throw");
     XCTAssertThrows([JSQMessagesAvatarImage avatarImageWithPlaceholder:nil], @"Invalid init should throw");
     XCTAssertThrows([[JSQMessagesAvatarImage alloc] initWithAvatarImage:nil highlightedImage:nil placeholderImage:nil], @"Invalid init should throw");
 }

JSQMessagesTests/ModelTests/JSQMessagesAvatarImageTests.m

@@ -34,7 +34,6 @@ - (void)tearDown
 
 - (void)testInitInvalid
 {
-    XCTAssertThrows([[JSQMessagesBubbleImage alloc] init], @"Invalid init should throw");
     XCTAssertThrows([[JSQMessagesBubbleImage alloc] initWithMessageBubbleImage:nil highlightedImage:nil], @"Invalid init should throw");
 }
 

JSQMessagesTests/ModelTests/JSQMessagesBubbleImageTests.m

@@ -41,23 +41,6 @@ @interface JSQMessagesKeyboardController () <UIGestureRecognizerDelegate>
 
 @property (weak, nonatomic) UIView *keyboardView;
 
-- (void)jsq_registerForNotifications;
-- (void)jsq_unregisterForNotifications;
-
-- (void)jsq_didReceiveKeyboardDidShowNotification:(NSNotification *)notification;
-- (void)jsq_didReceiveKeyboardWillChangeFrameNotification:(NSNotification *)notification;
-- (void)jsq_didReceiveKeyboardDidChangeFrameNotification:(NSNotification *)notification;
-- (void)jsq_didReceiveKeyboardDidHideNotification:(NSNotification *)notification;
-- (void)jsq_handleKeyboardNotification:(NSNotification *)notification completion:(JSQAnimationCompletionBlock)completion;
-
-- (void)jsq_setKeyboardViewHidden:(BOOL)hidden;
-- (void)jsq_notifyKeyboardFrameNotificationForFrame:(CGRect)frame;
-- (void)jsq_resetKeyboardAndTextView;
-
-- (void)jsq_removeKeyboardFrameObserver;
-
-- (void)jsq_handlePanGestureRecognizer:(UIPanGestureRecognizer *)pan;
-
 @end
 
 
@@ -91,11 +74,8 @@ - (void)dealloc
 {
     [self jsq_removeKeyboardFrameObserver];
     [self jsq_unregisterForNotifications];
-    _textView = nil;
-    _contextView = nil;
     _panGestureRecognizer = nil;
     _delegate = nil;
-    _keyboardView = nil;
 }
 
 #pragma mark - Setters

JSQMessagesViewController/Controllers/JSQMessagesKeyboardController.m

@@ -65,36 +65,6 @@ @interface JSQMessagesViewController () <JSQMessagesInputToolbarDelegate,
 
 @property (assign, nonatomic) BOOL textViewWasFirstResponderDuringInteractivePop;
 
-- (void)jsq_configureMessagesViewController;
-
-- (NSString *)jsq_currentlyComposedMessageText;
-
-- (void)jsq_handleDidChangeStatusBarFrameNotification:(NSNotification *)notification;
-- (void)jsq_didReceiveMenuWillShowNotification:(NSNotification *)notification;
-- (void)jsq_didReceiveMenuWillHideNotification:(NSNotification *)notification;
-
-- (void)jsq_updateKeyboardTriggerPoint;
-- (void)jsq_setToolbarBottomLayoutGuideConstant:(CGFloat)constant;
-
-- (void)jsq_handleInteractivePopGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer;
-
-- (BOOL)jsq_inputToolbarHasReachedMaximumHeight;
-- (void)jsq_adjustInputToolbarForComposerTextViewContentSizeChange:(CGFloat)dy;
-- (void)jsq_adjustInputToolbarHeightConstraintByDelta:(CGFloat)dy;
-- (void)jsq_scrollComposerTextViewToBottomAnimated:(BOOL)animated;
-
-- (void)jsq_updateCollectionViewInsets;
-- (void)jsq_setCollectionViewInsetsTopValue:(CGFloat)top bottomValue:(CGFloat)bottom;
-
-- (BOOL)jsq_isMenuVisible;
-
-- (void)jsq_addObservers;
-- (void)jsq_removeObservers;
-
-- (void)jsq_registerForNotifications:(BOOL)registerForNotifications;
-
-- (void)jsq_addActionToInteractivePopGestureRecognizer:(BOOL)addAction;
-
 @end
 
 
@@ -167,19 +137,9 @@ - (void)dealloc
 
     _collectionView.dataSource = nil;
     _collectionView.delegate = nil;
-    _collectionView = nil;
 
     _inputToolbar.contentView.textView.delegate = nil;
     _inputToolbar.delegate = nil;
-    _inputToolbar = nil;
-
-    _toolbarHeightConstraint = nil;
-    _toolbarBottomLayoutGuide = nil;
-
-    _senderId = nil;
-    _senderDisplayName = nil;
-    _outgoingCellIdentifier = nil;
-    _incomingCellIdentifier = nil;
 
     [_keyboardController endListeningForKeyboard];
     _keyboardController = nil;

JSQMessagesViewController/Controllers/JSQMessagesViewController.m

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="JSQMessagesViewController">
@@ -21,21 +21,18 @@
             <subviews>
                 <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="l9u-2b-4LK" customClass="JSQMessagesCollectionView">
                     <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                    <animations/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <collectionViewLayout key="collectionViewLayout" id="dZl-7C-LHR" customClass="JSQMessagesCollectionViewFlowLayout"/>
                     <cells/>
                 </collectionView>
                 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BoD-Az-3DM" customClass="JSQMessagesInputToolbar">
                     <rect key="frame" x="0.0" y="524" width="320" height="44"/>
-                    <animations/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="HIk-02-qcW"/>
                     </constraints>
                     <items/>
                 </toolbar>
             </subviews>
-            <animations/>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="BoD-Az-3DM" secondAttribute="trailing" id="7xc-Ha-asg"/>

JSQMessagesViewController/Controllers/JSQMessagesViewController.xib

@@ -21,22 +21,6 @@
 #import "UIColor+JSQMessages.h"
 
 
-@interface JSQMessagesAvatarImageFactory ()
-
-+ (UIImage *)jsq_circularImage:(UIImage *)image
-                  withDiameter:(NSUInteger)diameter
-              highlightedColor:(UIColor *)highlightedColor;
-
-+ (UIImage *)jsq_imageWitInitials:(NSString *)initials
-                  backgroundColor:(UIColor *)backgroundColor
-                        textColor:(UIColor *)textColor
-                             font:(UIFont *)font
-                         diameter:(NSUInteger)diameter;
-
-@end
-
-
-
 @implementation JSQMessagesAvatarImageFactory
 
 #pragma mark - Public

JSQMessagesViewController/Factories/JSQMessagesAvatarImageFactory.m

@@ -27,14 +27,6 @@ @interface JSQMessagesBubbleImageFactory ()
 @property (strong, nonatomic, readonly) UIImage *bubbleImage;
 @property (assign, nonatomic, readonly) UIEdgeInsets capInsets;
 
-- (UIEdgeInsets)jsq_centerPointEdgeInsetsForImageSize:(CGSize)bubbleImageSize;
-
-- (JSQMessagesBubbleImage *)jsq_messagesBubbleImageWithColor:(UIColor *)color flippedForIncoming:(BOOL)flippedForIncoming;
-
-- (UIImage *)jsq_horizontallyFlippedImageFromImage:(UIImage *)image;
-
-- (UIImage *)jsq_stretchableImageFromImage:(UIImage *)image withCapInsets:(UIEdgeInsets)capInsets;
-
 @end
 
 
@@ -66,11 +58,6 @@ - (instancetype)init
     return [self initWithBubbleImage:[UIImage jsq_bubbleCompactImage] capInsets:UIEdgeInsetsZero];
 }
 
-- (void)dealloc
-{
-    _bubbleImage = nil;
-}
-
 #pragma mark - Public
 
 - (JSQMessagesBubbleImage *)outgoingMessagesBubbleImageWithColor:(UIColor *)color

JSQMessagesViewController/Factories/JSQMessagesBubbleImageFactory.m

@@ -21,13 +21,6 @@
 #import "JSQMessagesBubbleImageFactory.h"
 
 
-@interface JSQMessagesMediaViewBubbleImageMasker ()
-
-- (void)jsq_maskView:(UIView *)view withImage:(UIImage *)image;
-
-@end
-
-
 @implementation JSQMessagesMediaViewBubbleImageMasker
 
 #pragma mark - Initialization

JSQMessagesViewController/Factories/JSQMessagesMediaViewBubbleImageMasker.m

@@ -66,13 +66,6 @@ - (instancetype)init
     return self;
 }
 
-- (void)dealloc
-{
-    _dateFormatter = nil;
-    _dateTextAttributes = nil;
-    _timeTextAttributes = nil;
-}
-
 #pragma mark - Formatter
 
 - (NSString *)timestampForDate:(NSDate *)date

JSQMessagesViewController/Factories/JSQMessagesTimestampFormatter.m

@@ -46,21 +46,6 @@ @interface JSQMessagesCollectionViewFlowLayout ()
 
 @property (assign, nonatomic) CGFloat latestDelta;
 
-- (void)jsq_configureFlowLayout;
-
-- (void)jsq_didReceiveApplicationMemoryWarningNotification:(NSNotification *)notification;
-- (void)jsq_didReceiveDeviceOrientationDidChangeNotification:(NSNotification *)notification;
-
-- (void)jsq_resetLayout;
-- (void)jsq_resetDynamicAnimator;
-
-- (void)jsq_configureMessageCellLayoutAttributes:(JSQMessagesCollectionViewLayoutAttributes *)layoutAttributes;
-
-- (UIAttachmentBehavior *)jsq_springBehaviorWithLayoutAttributesItem:(UICollectionViewLayoutAttributes *)item;
-- (void)jsq_addNewlyVisibleBehaviorsFromVisibleItems:(NSArray *)visibleItems;
-- (void)jsq_removeNoLongerVisibleBehaviorsFromVisibleItemsIndexPaths:(NSSet *)visibleItemsIndexPaths;
-- (void)jsq_adjustSpringBehavior:(UIAttachmentBehavior *)springBehavior forTouchLocation:(CGPoint)touchLocation;
-
 @end
 
 
@@ -137,15 +122,6 @@ + (Class)invalidationContextClass
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    
-    _messageBubbleFont = nil;
-    _bubbleSizeCalculator = nil;
-    
-    [_dynamicAnimator removeAllBehaviors];
-    _dynamicAnimator = nil;
-    
-    [_visibleIndexPaths removeAllObjects];
-    _visibleIndexPaths = nil;
 }
 
 #pragma mark - Setters

JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.m

@@ -18,25 +18,8 @@
 
 #import "JSQMessagesCollectionViewLayoutAttributes.h"
 
-
-@interface JSQMessagesCollectionViewLayoutAttributes ()
-
-- (CGSize)jsq_correctedAvatarSizeFromSize:(CGSize)size;
-
-- (CGFloat)jsq_correctedLabelHeightForHeight:(CGFloat)height;
-
-@end
-
-
 @implementation JSQMessagesCollectionViewLayoutAttributes
 
-#pragma mark - Lifecycle
-
-- (void)dealloc
-{
-    _messageBubbleFont = nil;
-}
-
 #pragma mark - Setters
 
 - (void)setMessageBubbleFont:(UIFont *)messageBubbleFont

JSQMessagesViewController/Layout/JSQMessagesCollectionViewLayoutAttributes.m

@@ -28,10 +28,6 @@ @interface JSQLocationMediaItem ()
 
 @property (strong, nonatomic) UIImageView *cachedMapImageView;
 
-- (void)createMapViewSnapshotForLocation:(CLLocation *)location
-                        coordinateRegion:(MKCoordinateRegion)region
-                   withCompletionHandler:(JSQLocationMediaItemCompletionBlock)completion;
-
 @end
 
 
@@ -48,13 +44,6 @@ - (instancetype)initWithLocation:(CLLocation *)location
     return self;
 }
 
-- (void)dealloc
-{
-    _location = nil;
-    _cachedMapSnapshotImage = nil;
-    _cachedMapImageView = nil;
-}
-
 - (void)clearCachedMediaViews
 {
     [super clearCachedMediaViews];

JSQMessagesViewController/Model/JSQLocationMediaItem.m

@@ -55,7 +55,6 @@ - (instancetype)initWithMaskAsOutgoing:(BOOL)maskAsOutgoing
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    _cachedPlaceholderView = nil;
 }
 
 - (void)setAppliesMediaViewMaskAsOutgoing:(BOOL)appliesMediaViewMaskAsOutgoing

JSQMessagesViewController/Model/JSQMediaItem.m

@@ -131,4 +131,9 @@
                             date:(NSDate *)date
                            media:(id<JSQMessageMediaData>)media;
 
+/**
+ Not a valid initializer.
+ */
+- (id)init NS_UNAVAILABLE;
+
 @end