Merge branch 'master' into development

* master: up version 0.6.2 Public speck update fixed public pod spec
QuickBlox · Mar 26, 2018 · 0c3f65f · 0c3f65f
2 parents c1791b6 + ab5638a
commit 0c3f65f
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 47 deletions.
diff --git a/PublicCocoaPods/QMChatViewController.podspec b/PublicCocoaPods/QMChatViewController.podspec
@@ -10,11 +10,11 @@
 
 Pod::Spec.new do |s|
 
-  s.name         = "QMChatViewController"
-  s.version      = "0.6.1"
-  s.summary      = "An elegant ready-to-go chat view controller for iOS chat applications that use Quickblox communication backend."
+    s.name = "QMChatViewController"
+    s.version = "0.6.2"
+    s.summary = "An elegant ready-to-go chat view controller for iOS chat applications that use Quickblox communication backend."
 
-  s.description  = <<-DESC
+    s.description = <<-DESC
 					* Ready-to-go chat view controller with a set of cells.
 					* Automatic cell size calculation.
 					* UI customisation for chat cells.
@@ -25,51 +25,63 @@ Pod::Spec.new do |s|
 					* Auto Layout inside.
                    DESC
 
-  s.homepage     = "https://github.com/QuickBlox/QMChatViewController-ios"
-  s.license      = { :type => "BSD", :file => "LICENSE" }
-  s.authors      = {"Andrey Ivanov" => "[email protected]", "Vitaliy Gorbachov" => "[email protected]", "Vitaliy Gurkovsky" => "[email protected]"}
-  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}"
+    s.homepage = "https://github.com/QuickBlox/QMChatViewController-ios"
+    s.license = { :type => "BSD", :file => "LICENSE" }
+    s.authors = {
+        "Andrey Ivanov" => "[email protected]",
+        "Vitaliy Gorbachov" => "[email protected]",
+        "Vitaliy Gurkovsky" => "[email protected]"
+    }
+    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}"
 
-  s.subspec 'Categories' do |ss|
-     ss.source_files = 'QMChatViewController/Categories/*.{h,m}'
-  end
+    s.subspec 'Categories' do |ss|
+        ss.source_files = 'QMChatViewController/Categories/*.{h,m}'
+    end
 
-  s.subspec 'Utils' do |ss|
-    ss.dependency 'QMChatViewController/Categories'
-    ss.source_files = 'QMChatViewController/Utils/**/*.{h,m}'
-  end
+    s.subspec 'Utils' do |ss|
+        ss.dependency 'QMChatViewController/Categories'
+        ss.source_files = 'QMChatViewController/Utils/**/*.{h,m}'
+    end
 
-  s.subspec 'QMChatLocationSnapshotter' do |ss|
-    ss.dependency 'QMChatViewController/Utils'
-    ss.source_files = 'QMChatViewController/QMChatLocationSnapshotter/*.{h,m}'
-  end
+    s.subspec 'QMChatLocationSnapshotter' do |ss|
+        ss.dependency 'QMChatViewController/Utils'
+        ss.source_files = 'QMChatViewController/QMChatLocationSnapshotter/*.{h,m}'
+    end
 
-  s.subspec 'QMChatDataSource' do |ss|
-    ss.dependency 'QMChatViewController/Utils'
-    ss.source_files = 'QMChatViewController/QMChatDataSource/**/*.{h,m}'
-  end
+    s.subspec 'QMChatDataSource' do |ss|
+        ss.dependency 'QMChatViewController/Utils'
+        ss.source_files = 'QMChatViewController/QMChatDataSource/**/*.{h,m}'
+    end
 
-  s.subspec 'Protocols' do |ss|
-    ss.source_files = 'QMChatViewController/Protocols/*.{h}'
-  end
+    s.subspec 'Protocols' do |ss|
+        ss.source_files = 'QMChatViewController/Protocols/*.{h}'
+    end
 
-  s.subspec 'Views' do |ss|
-    ss.dependency 'QMChatViewController/Categories'
-    ss.dependency 'QMChatViewController/Protocols'
-    ss.dependency 'QMChatViewController/Utils'
-    ss.source_files = 'QMChatViewController/Views/**/*.{h,m}'
-  end
+    s.subspec 'Views' do |ss|
+        ss.dependency 'QMChatViewController/Categories'
+        ss.dependency 'QMChatViewController/Protocols'
+        ss.dependency 'QMChatViewController/Utils'
+        ss.source_files = 'QMChatViewController/Views/**/*.{h,m}'
+    end
 
-  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)/QuickBlox/" }
-  s.prefix_header_contents = '#import <Quickblox/Quickblox.h>'
-  s.dependency "QuickBlox"
-  s.dependency "TTTAttributedLabel"
-  s.dependency "SDWebImage"
-  s.dependency "FFCircularProgressView"
+    s.resource_bundles = {
+        'QMChatViewController' => [
+        'QMChatViewController/**/*.xcassets',
+        'QMChatViewController/**/*.xib'
+        ]
+    }
+    s.resource = 'QMChatViewController/**/*.xcassets'
+    s.requires_arc = true
+    s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/QuickBlox/" }
+    s.prefix_header_contents = '#import <Quickblox/Quickblox.h>'
+    s.dependency "QuickBlox"
+    s.dependency "TTTAttributedLabel"
+    s.dependency "SDWebImage"
+    s.dependency "FFCircularProgressView"
 
 end
diff --git a/QMChatViewController.podspec b/QMChatViewController.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
     s.name = "QMChatViewController"
-    s.version = "0.6.1"
+    s.version = "0.6.2"
     s.summary = "An elegant ready-to-go chat view controller for iOS chat applications that use Quickblox communication backend."
 
     s.description = <<-DESC

diff --git a/QMChatViewController/Views/QMChatContainerView.h b/QMChatViewController/Views/QMChatContainerView.h
@@ -19,11 +19,8 @@
 @property (assign, nonatomic) IBInspectable BOOL arrow;
 @property (assign, nonatomic) IBInspectable BOOL leftArrow;
 @property (assign, nonatomic) IBInspectable CGSize arrowSize;
-
 @property (assign, nonatomic) BOOL highlighted;
-
 @property (readonly, strong, nonatomic) UIImage *backgroundImage;
-
 @property (readonly, strong, nonatomic) UIBezierPath *maskPath;