Fix some Xcode 9 warnings

badoo · Jan 5, 2018 · b5e8332 · b5e8332
1 parent 6389e66
commit b5e8332
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/ChattoAdditions/Source/Chat Items/BaseMessage/BaseMessagePresenter.swift b/ChattoAdditions/Source/Chat Items/BaseMessage/BaseMessagePresenter.swift
@@ -45,7 +45,6 @@ public protocol BaseMessageInteractionHandlerProtocol {
 
 open class BaseMessagePresenter<BubbleViewT, ViewModelBuilderT, InteractionHandlerT>: BaseChatItemPresenter<BaseMessageCollectionViewCell<BubbleViewT>> where
     ViewModelBuilderT: ViewModelBuilderProtocol,
-    ViewModelBuilderT.ViewModelT: MessageViewModelProtocol,
     InteractionHandlerT: BaseMessageInteractionHandlerProtocol,
     InteractionHandlerT.ViewModelT == ViewModelBuilderT.ViewModelT,
     BubbleViewT: UIView,

diff --git a/ChattoAdditions/Source/Input/ChatInputBar.swift b/ChattoAdditions/Source/Input/ChatInputBar.swift
@@ -276,9 +276,9 @@ extension ChatInputBar: UITextViewDelegate {
     public func textView(_ textView: UITextView, shouldChangeTextIn nsRange: NSRange, replacementText text: String) -> Bool {
         let range = self.textView.text.bma_rangeFromNSRange(nsRange)
         if let maxCharactersCount = self.maxCharactersCount {
-            let currentCount = textView.text.characters.count
-            let rangeLength = textView.text.substring(with: range).characters.count
-            let nextCount = currentCount - rangeLength + text.characters.count
+            let currentCount = textView.text.count
+            let rangeLength = textView.text[range].count
+            let nextCount = currentCount - rangeLength + text.count
             return UInt(nextCount) <= maxCharactersCount
         }
         return true

diff --git a/ChattoAdditions/Source/Input/ReusableXibView.swift b/ChattoAdditions/Source/Input/ReusableXibView.swift
@@ -46,7 +46,7 @@ import UIKit
             for constraint in constraints {
                 let firstItem = constraint.firstItem === self ? loadedView : constraint.firstItem
                 let secondItem = constraint.secondItem === self ? loadedView : constraint.secondItem
-                loadedView.addConstraint(NSLayoutConstraint(item: firstItem, attribute: constraint.firstAttribute, relatedBy: constraint.relation, toItem: secondItem, attribute: constraint.secondAttribute, multiplier: constraint.multiplier, constant: constraint.constant))
+                loadedView.addConstraint(NSLayoutConstraint(item: firstItem as Any, attribute: constraint.firstAttribute, relatedBy: constraint.relation, toItem: secondItem, attribute: constraint.secondAttribute, multiplier: constraint.multiplier, constant: constraint.constant))
             }
             return loadedView
         } else {