Merge pull request #141 from QuickBlox/development

Development

Author: pro100andrey

PublicCocoaPods/.swift-version

@@ -1 +1 @@
-2.3
+4

PublicCocoaPods/QMChatViewController.podspec

@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/QuickBlox/QMChatViewController-ios"
   s.license      = { :type => "BSD", :file => "LICENSE" }
   s.authors      = {"Andrey Ivanov" => "andrey.ivanov@quickblox.com", "Vitaliy Gorbachov" => "vitaliy.gorbachov@quickblox.com", "Vitaliy Gurkovsky" => "vitaliy.gurkovsky@injoit.com"}
-  s.platform     = :ios, "8.0"
+  s.platform     = :ios, "9.0"
   s.source       = { :git => "https://github.com/QuickBlox/QMChatViewController-ios.git", :tag => "#{s.version}" }
   s.source_files = "QMChatViewController/QMChatViewController.{h,m}"
 
@@ -67,9 +67,9 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/QuickBlox/" }
   s.prefix_header_contents = '#import <Quickblox/Quickblox.h>'
-  s.dependency "QuickBlox", ">= 2.10"
-  s.dependency "TTTAttributedLabel", "> 1.13"
-  s.dependency "SDWebImage", "~> 4.0.0"
+  s.dependency "QuickBlox"
+  s.dependency "TTTAttributedLabel"
+  s.dependency "SDWebImage"
   s.dependency "FFCircularProgressView"
 
 end

QMCVDevelopment.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/QuickBlox/QMChatViewController-ios"
   s.license      = { :type => "BSD", :file => "LICENSE" }
   s.authors      = {"Andrey Ivanov" => "andrey.ivanov@quickblox.com", "Vitaliy Gorbachov" => "vitaliy.gorbachov@quickblox.com", "Vitaliy Gurkovsky" => "vitaliy.gurkovsky@injoit.com"}
-  s.platform     = :ios, "8.0"
+  s.platform     = :ios, "9.0"
   s.source       = { :git => "https://github.com/QuickBlox/QMChatViewController-ios.git", :tag => "#{s.version}" }
   s.source_files = "QMChatViewController/QMChatViewController.{h,m}"
 
@@ -73,9 +73,9 @@ Pod::Spec.new do |s|
   s.resource_bundles = { "QMChatViewController" => ["QMChatViewController/**/*.xib", "QMChatViewController/**/*.png"] }
   s.resources = "QMChatViewController/Icons/Media.xcassets"
   s.requires_arc = true
-  s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/../../Framework $(PODS_ROOT)/../External" }
-  s.dependency "TTTAttributedLabel", "> 1.13"
-  s.dependency "SDWebImage", "~> 4.0.0"
+  s.dependency "TTTAttributedLabel"
+  s.dependency "SDWebImage"
   s.dependency "FFCircularProgressView"
+  s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/../../Framework $(PODS_ROOT)/../External" }
 
 end

QMChatViewController/Categories/UIImage+QM.h

@@ -29,4 +29,6 @@
 + (UIImage *)resizableImageWithColor:(UIColor *)color
                         cornerRadius:(CGFloat)cornerRadius;
 
+@property (nonatomic, strong, readonly) NSData *dataRepresentation;
+
 @end

QMChatViewController/Categories/UIImage+QM.m

@@ -63,4 +63,18 @@ + (UIImage *)resizableImageWithColor:(UIColor *)color
                                  resizingMode:UIImageResizingModeStretch];
 }
 
+- (NSData *)dataRepresentation {
+
+        int alphaInfo = CGImageGetAlphaInfo(self.CGImage);
+        BOOL hasAlpha = !(alphaInfo == kCGImageAlphaNone ||
+                          alphaInfo == kCGImageAlphaNoneSkipFirst ||
+                          alphaInfo == kCGImageAlphaNoneSkipLast);
+        
+        if (hasAlpha) {
+            return UIImagePNGRepresentation(self);
+        }
+        else {
+            return UIImageJPEGRepresentation(self, 1.0f);
+        }
+}
 @end

QMChatViewController/QMChatLocationSnapshotter/QMChatLocationSnapshotter.m

@@ -22,8 +22,7 @@ + (void)snapshotForLocationCoordinate:(CLLocationCoordinate2D)locationCoordinate
 
     UIImage *locationSnapshot = [QMImageLoader.instance.imageCache imageFromCacheForKey:key];
 
-    if (locationSnapshot != nil) {
-        
+    if (locationSnapshot) {
         completion(locationSnapshot);
         return;
     }

QMChatViewController/QMChatViewController.m

@@ -67,7 +67,7 @@ - (void)dealloc {
     [self registerForNotifications:NO];
 
     self.inputToolbar.contentView.textView.delegate = nil;
-    self.inputToolbar.contentView.textView.pasteDelegate = nil;
+    self.inputToolbar.contentView.textView.qm_placeholderTextViewPasteDelegate = nil;
     self.inputToolbar.delegate = nil;
 
     self.senderDisplayName = nil;
@@ -410,7 +410,7 @@ - (void)didPressAccessoryButton:(UIButton *)sender {
                                                           handler();
                                                       }]];
 
-    [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"SA_STR_CANCEL", nil)
+    [alertController addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil)
                                                         style:UIAlertActionStyleCancel
                                                       handler:nil]];
 
@@ -979,7 +979,7 @@ - (void)showAlertForAccess {
     UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title
                                                     message:message
                                                    delegate:self
-                                          cancelButtonTitle:NSLocalizedString(@"SA_STR_CANCEL", nil)
+                                          cancelButtonTitle:NSLocalizedString(@"Cancel", nil)
                                           otherButtonTitles:NSLocalizedString(@"Open Settings", nil),nil];
 
     [alert show];

QMChatViewController/Utils/QMImageLoader/QMImageLoader.h

@@ -46,8 +46,14 @@ typedef void(^QMWebImageCompletionWithFinishedBlock)(UIImage *_Nullable image, U
 
 @property (nonatomic, readonly, class) QMImageLoader *instance;
 
+
 + (SDWebImageManager *)sharedManager NS_UNAVAILABLE;
+
 - (UIImage *)originalImageWithURL:(NSURL *)url;
+- (BOOL)hasOriginalImageWithURL:(NSURL *)url;
+- (NSString *)pathForOriginalImageWithURL:(NSURL *)url;
+
+
 - (BOOL)hasImageOperationWithURL:(NSURL *)url;
 - (id<SDWebImageOperation>)operationWithURL:(NSURL *)url;
 - (void)cancelOperationWithURL:(NSURL *)url;