Merge pull request #115 from QuickBlox/revert-113-feature/linkPreview_tabbar

Revert "media attachments"

Author: pro100andrey

PublicCocoaPods/.swift-version

@@ -36,10 +36,6 @@ Pod::Spec.new do |s|
     ss.source_files = 'QMChatViewController/QMChatLocationSnapshotter/*.{h,m}'
   end
 
-  s.subspec 'QMMediaPresenter' do |ss|
-    ss.source_files = 'QMChatViewController/QMMediaPresenter/**/*.{h,m}'
-  end
-
   s.subspec 'Categories' do |ss|
 	   ss.dependency 'QMChatViewController/QMChatLocationSnapshotter'
      ss.source_files = 'QMChatViewController/Categories/*.{h,m}'
@@ -76,7 +72,6 @@ Pod::Spec.new do |s|
   s.prefix_header_contents = '#import <Quickblox/Quickblox.h>'
   s.dependency "QuickBlox", ">= 2.0"
   s.dependency "TTTAttributedLabel", "> 1.13"
-  s.dependency "SDWebImage", "~> 3.8.2"
-  s.dependency "SexyTooltip"
+  s.dependency "SDWebImage", "~> 3.6"
 
 end

PublicCocoaPods/QMChatViewController.podspec

@@ -34,10 +34,6 @@ Pod::Spec.new do |s|
     ss.source_files = 'QMChatViewController/QMChatLocationSnapshotter/*.{h,m}'
   end
 
-  s.subspec 'QMMediaPresenter' do |ss|
-  ss.source_files = 'QMChatViewController/QMMediaPresenter/**/*.{h,m}'
-  end
-
   s.subspec 'Categories' do |ss|
 	   ss.dependency 'QMCVDevelopment/QMChatLocationSnapshotter'
      ss.source_files = 'QMChatViewController/Categories/*.{h,m}'
@@ -48,12 +44,6 @@ Pod::Spec.new do |s|
      ss.source_files = 'QMChatViewController/Utils/**/*.{h,m}'
   end
 
-  s.subspec 'ViewModels' do |ss|
-
-    ss.dependency 'QMCVDevelopment/Categories'
-    ss.source_files = 'QMChatViewController/ViewModels/**/*.{h,m}'
-  end
-
   s.subspec 'Sections' do |ss|
 	   ss.dependency 'QMCVDevelopment/QMChatDataSource'
      ss.source_files = 'QMChatViewController/QMChatSection/*.{h,m}'
@@ -78,9 +68,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/../../Framework $(PODS_ROOT)/../External" }
   s.dependency "TTTAttributedLabel", "> 1.13"
-  s.dependency "SDWebImage", "~> 3.8.2"
-  s.dependency "FFCircularProgressView"
-  s.dependency "SexyTooltip"
+  s.dependency "SDWebImage", "~> 3.6"
 
 
 end

QMCVDevelopment.podspec

@@ -10,7 +10,7 @@
 
 @interface UIColor (QM)
 
-//MARK: - Message bubble colors
+#pragma mark - Message bubble colors
 
 /**
  *  @return A color object containing HSB values similar to the iOS 7 messages app green bubble color.

QMChatViewController/Categories/UIColor+QM.h

@@ -68,69 +68,29 @@ - (UIImage *)imageByScaleAndCrop:(CGSize)targetSize {
 }
 
 - (UIImage *)imageByCircularScaleAndCrop:(CGSize)targetSize {
-    //bitmap context properties
-    float scaleFactor = [[UIScreen mainScreen] scale];
 
-    CGColorSpaceRef colorSpace =
-    CGColorSpaceCreateDeviceRGB();
-    CGContextRef context =
-    CGBitmapContextCreate(NULL,
-                          targetSize.width * scaleFactor,
-                          targetSize.height * scaleFactor,
-                          8,
-                          targetSize.width * scaleFactor * 4,
-                          colorSpace,
-                          kCGImageAlphaPremultipliedFirst);
-    
-    CGContextScaleCTM(context,
-                      scaleFactor,
-                      scaleFactor);
-    
-    CGContextBeginPath(context);
-    
-    CGContextAddArc(context,
-                    targetSize.width / 2,
-                    targetSize.height / 2,
-                    targetSize.width / 2,
-                    0,
-                    2 * M_PI,
-                    0);
-    
-    CGContextClosePath(context);
-    
-    CGFloat widthFactor = targetSize.width / self.size.width;
-    CGFloat heightFactor = targetSize.height  / self.size.height;
-    
-    if (widthFactor > heightFactor) {
-        scaleFactor = widthFactor;
-    }
-    else {
-        
-        scaleFactor = heightFactor;
-    }
-    
-    float w = self.size.width * scaleFactor;
-    float h = self.size.height * scaleFactor;
+    //Create the bitmap graphics context
+    UIGraphicsBeginImageContextWithOptions(targetSize, NO, 0.0);
 
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    // Create and CLIP to a CIRCULAR Path
+    // (This could be replaced with any closed path if you want a different shaped clip)
+    CGContextBeginPath (context);
+    CGContextAddArc(context, targetSize.width / 2, targetSize.height / 2, targetSize.width / 2, 0, 2 * M_PI, 0);
+    CGContextClosePath (context);
     CGContextClip(context);
-    //draw image into bitmap context
-    CGContextDrawImage(context,
-                       CGRectMake(0,0, w, h),
-                       self.CGImage);
-    
-    CGImageRef renderedImage =
-    CGBitmapContextCreateImage(context);
+    //Set the SCALE factor for the graphics context
+    //All future draw calls will be scaled by this factor
+    CGContextScaleCTM (context, targetSize.width / self.size.width, targetSize.height / self.size.height);
+    // Draw the IMAGE
+    CGRect myRect = CGRectMake(0, 0, self.size.width, self.size.height);
+    [self drawInRect:myRect];
 
-    //tidy up
-    CGColorSpaceRelease(colorSpace);
-    CGContextRelease(context);
+    UIImage *circularImage = UIGraphicsGetImageFromCurrentImageContext();
 
-    UIImage *image =
-    [UIImage imageWithCGImage:renderedImage
-                        scale:0
-                  orientation:self.imageOrientation];
+    UIGraphicsEndImageContext();
 
-    return image;
+    return circularImage;
 }
 
 @end

QMChatViewController/Categories/UIImage+Cropper.m

@@ -38,7 +38,7 @@ - (void)setSnapshotWithLocationCoordinate:(CLLocationCoordinate2D)locationCoordi
     self.image = nil;
     [self qm_cancelPreviousSnapshotCreation];
 
-    NSString *key = [NSString stringWithFormat:@"%lf/%lf", locationCoordinate.latitude, locationCoordinate.longitude];
+    NSString *key = [NSString stringWithFormat:@"%lf/%lf",locationCoordinate.latitude, locationCoordinate.longitude];
 
     self.qm_snapshotKey = key;
 
@@ -48,8 +48,10 @@ - (void)setSnapshotWithLocationCoordinate:(CLLocationCoordinate2D)locationCoordi
                                                          key:key
                                                   completion:^(UIImage *snapshot) {
 
-                                                      if ([weakSelf.qm_snapshotKey isEqualToString:key]) {
-                                                          weakSelf.image = snapshot;
+                                                      __typeof(weakSelf)strongSelf = weakSelf;
+                                                      if ([strongSelf.qm_snapshotKey isEqualToString:key]) {
+                                                          
+                                                          strongSelf.image = snapshot;
                                                       }
                                                   }];
 }