Update MessageViewController (#2104)

This commit is contained in:
Ryan Nystrom
2018-08-12 20:08:53 -04:00
committed by GitHub
parent e2b967b4d2
commit 11f1ece511
4 changed files with 10 additions and 10 deletions

View File

@@ -193,7 +193,7 @@ CHECKOUT OPTIONS:
:commit: 5c1c92b600f0d8094f22fff48e26ded323568194
:git: https://github.com/Instagram/IGListKit.git
MessageViewController:
:commit: ca6935cf8fc779aedd20e46c9a8b3bb3733e0ee7
:commit: 97e198895e309bda0b4ea30a5ac50a16fe6ef8ac
:git: https://github.com/GitHawkApp/MessageViewController.git
Squawk:
:commit: 88d671bbe86e3c18d54e094fac97df12a3054d53
@@ -244,4 +244,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: abbecf20cfdc6b5d77e2ea4902ef4861ffd9a762
COCOAPODS: 1.5.2
COCOAPODS: 1.5.3

4
Pods/Manifest.lock generated
View File

@@ -193,7 +193,7 @@ CHECKOUT OPTIONS:
:commit: 5c1c92b600f0d8094f22fff48e26ded323568194
:git: https://github.com/Instagram/IGListKit.git
MessageViewController:
:commit: ca6935cf8fc779aedd20e46c9a8b3bb3733e0ee7
:commit: 97e198895e309bda0b4ea30a5ac50a16fe6ef8ac
:git: https://github.com/GitHawkApp/MessageViewController.git
Squawk:
:commit: 88d671bbe86e3c18d54e094fac97df12a3054d53
@@ -244,4 +244,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: abbecf20cfdc6b5d77e2ea4902ef4861ffd9a762
COCOAPODS: 1.5.2
COCOAPODS: 1.5.3

View File

@@ -182,15 +182,15 @@ open class MessageViewController: UIViewController, MessageAutocompleteControlle
let scrollViewHeight = scrollView.bounds.height
let contentHeight = scrollView.contentSize.height
let topInset = scrollView.util_adjustedContentInset.top
let inset = scrollView.util_adjustedContentInset
let bottomSafeInset = self.view.util_safeAreaInsets.bottom
let newOffset = max(
min(
contentHeight - scrollViewHeight,
contentHeight - scrollViewHeight + inset.bottom,
contentOffset.y + self.keyboardHeight - previousKeyboardHeight - bottomSafeInset
),
-topInset
-inset.top
)
scrollView.contentOffset = CGPoint(x: contentOffset.x, y: newOffset)
}

View File

@@ -32,7 +32,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/AutoInsetter</string>
<key>Title</key>
<string>AutoInsetter (1.2.5)</string>
<string>AutoInsetter (1.2.3)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
@@ -208,7 +208,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/Pageboy</string>
<key>Title</key>
<string>Pageboy (2.5.4)</string>
<string>Pageboy (2.5.1)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
@@ -264,7 +264,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/Tabman</string>
<key>Title</key>
<string>Tabman (1.9.2)</string>
<string>Tabman (1.8.2)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>