diff --git a/Classes/Issues/IssuesViewController.swift b/Classes/Issues/IssuesViewController.swift index e7f0ad5b9..254f7a713 100644 --- a/Classes/Issues/IssuesViewController.swift +++ b/Classes/Issues/IssuesViewController.swift @@ -212,7 +212,7 @@ final class IssuesViewController: feed.collectionView.updateSafeInset(container: view, base: Styles.Sizes.threadInset) } - override func didLayout() { + override func didLayout() { let manageButtonSize = manageController.manageButton.bounds.size manageController.manageButton.frame = CGRect( origin: CGPoint( diff --git a/Classes/Issues/Merge/IssueMergeSummaryCell.swift b/Classes/Issues/Merge/IssueMergeSummaryCell.swift index cbe76c277..8c04fb55b 100644 --- a/Classes/Issues/Merge/IssueMergeSummaryCell.swift +++ b/Classes/Issues/Merge/IssueMergeSummaryCell.swift @@ -22,13 +22,13 @@ final class IssueMergeSummaryCell: CardCollectionViewCell, ListBindable { contentView.addSubview(imageView) contentView.addSubview(label) - imageView.clipsToBounds = true - imageView.tintColor = .white - imageView.layer.cornerRadius = Styles.Sizes.avatar.width / 2 - imageView.contentMode = .center +// imageView.clipsToBounds = true +// imageView.tintColor = .white +// imageView.layer.cornerRadius = Styles.Sizes.avatar.width / 2 +// imageView.contentMode = .center imageView.snp.makeConstraints { make in make.centerY.equalToSuperview() - make.size.equalTo(Styles.Sizes.avatar) +// make.size.equalTo(Styles.Sizes.avatar) make.left.equalTo(Styles.Sizes.cardGutter) } @@ -69,7 +69,8 @@ final class IssueMergeSummaryCell: CardCollectionViewCell, ListBindable { imageViewBackground = Styles.Colors.Gray.medium.color iconName = "merge-alert" } - imageView.backgroundColor = imageViewBackground +// imageView.backgroundColor = imageViewBackground + imageView.tintColor = imageViewBackground imageView.image = UIImage(named: iconName)?.withRenderingMode(.alwaysTemplate) accessibilityLabel = .localizedStringWithFormat("%@. (state: %@)", viewModel.title, viewModel.state.description) } diff --git a/Classes/Views/MessageView+Styles.swift b/Classes/Views/MessageView+Styles.swift index 34d333a0b..ef5c830d5 100644 --- a/Classes/Views/MessageView+Styles.swift +++ b/Classes/Views/MessageView+Styles.swift @@ -17,12 +17,12 @@ extension MessageViewController { messageView.textView.placeholderText = NSLocalizedString("Leave a comment", comment: "") messageView.textView.placeholderTextColor = Styles.Colors.Gray.light.color messageView.setButton(icon: UIImage(named: "send")?.withRenderingMode(.alwaysTemplate), for: .normal, position: .right) - messageView.rightButtonTint = Styles.Colors.Blue.medium.color + messageView.rightButtonTint = Styles.Colors.Green.medium.color messageView.font = Styles.Text.body.preferredFont messageView.textViewInset = UIEdgeInsets( - top: Styles.Sizes.gutter, + top: Styles.Sizes.rowSpacing, left: Styles.Sizes.gutter, - bottom: Styles.Sizes.gutter, + bottom: Styles.Sizes.rowSpacing/2, right: Styles.Sizes.rowSpacing ) messageView.setButton(inset: Styles.Sizes.gutter, position: .right) diff --git a/Podfile.lock b/Podfile.lock index 8c4c84b49..9f6a1fa80 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -193,7 +193,7 @@ CHECKOUT OPTIONS: :commit: 5c1c92b600f0d8094f22fff48e26ded323568194 :git: https://github.com/Instagram/IGListKit.git MessageViewController: - :commit: 2c550c06deae7a810da5722f311e84e40a25e69b + :commit: ca6935cf8fc779aedd20e46c9a8b3bb3733e0ee7 :git: https://github.com/GitHawkApp/MessageViewController.git Squawk: :commit: 399ae714ecd69ebf60ca5f4e2ff7822e21b91586 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 8c4c84b49..9f6a1fa80 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -193,7 +193,7 @@ CHECKOUT OPTIONS: :commit: 5c1c92b600f0d8094f22fff48e26ded323568194 :git: https://github.com/Instagram/IGListKit.git MessageViewController: - :commit: 2c550c06deae7a810da5722f311e84e40a25e69b + :commit: ca6935cf8fc779aedd20e46c9a8b3bb3733e0ee7 :git: https://github.com/GitHawkApp/MessageViewController.git Squawk: :commit: 399ae714ecd69ebf60ca5f4e2ff7822e21b91586 diff --git a/Pods/MessageViewController/MessageViewController/MessageView.swift b/Pods/MessageViewController/MessageViewController/MessageView.swift index 684a29676..935d001ad 100644 --- a/Pods/MessageViewController/MessageViewController/MessageView.swift +++ b/Pods/MessageViewController/MessageViewController/MessageView.swift @@ -119,6 +119,15 @@ public final class MessageView: UIView, MessageTextViewListener { get { return textView.textContainerInset } } + public var contentInset: UIEdgeInsets { + set { + textView.contentInset = newValue + setNeedsLayout() + delegate?.wantsLayout(messageView: self) + } + get { return textView.contentInset } + } + /// - Parameter accessibilityLabel: A custom `accessibilityLabel` to set on the button. /// If none is supplied, it will default to the icon's `accessibilityLabel`. public func setButton(icon: UIImage?, for state: UIControlState, position: ButtonPosition, accessibilityLabel: String? = nil) { @@ -272,10 +281,21 @@ public final class MessageView: UIView, MessageTextViewListener { let textViewHeight = self.textViewHeight let textViewMaxY = textViewY + textViewHeight + // adjust for font descender so button aligns with the text baseline + let descender, pointSize: CGFloat + if let font = textView.font { + descender = floor(font.descender) + pointSize = ceil(font.pointSize) + } else { + descender = 0 + pointSize = 0 + } + let buttonYStarter = textViewMaxY - textViewInset.bottom - (pointSize - descender)/2 + // adjust by bottom offset so content is flush w/ text view let leftButtonFrame = CGRect( x: safeBounds.minX + leftButtonInset, - y: textViewMaxY - leftButtonSize.height + leftButton.bottomHeightOffset - textViewInset.bottom, + y: buttonYStarter - leftButtonSize.height/2 + leftButton.bottomHeightOffset, width: leftButtonSize.width, height: leftButtonSize.height ) @@ -293,7 +313,7 @@ public final class MessageView: UIView, MessageTextViewListener { // adjust by bottom offset so content is flush w/ text view let rightButtonFrame = CGRect( x: textViewFrame.maxX, - y: textViewMaxY - rightButtonSize.height + rightButton.bottomHeightOffset - textViewInset.bottom, + y: buttonYStarter - rightButtonSize.height/2 + rightButton.bottomHeightOffset, width: rightButtonSize.width, height: rightButtonSize.height ) diff --git a/Resources/Assets.xcassets/send.imageset/send@2x.png b/Resources/Assets.xcassets/send.imageset/send@2x.png index faa6cccac..e2dcaabcc 100644 Binary files a/Resources/Assets.xcassets/send.imageset/send@2x.png and b/Resources/Assets.xcassets/send.imageset/send@2x.png differ diff --git a/Resources/Assets.xcassets/send.imageset/send@3x.png b/Resources/Assets.xcassets/send.imageset/send@3x.png index 6ab36ab41..4657de1a8 100644 Binary files a/Resources/Assets.xcassets/send.imageset/send@3x.png and b/Resources/Assets.xcassets/send.imageset/send@3x.png differ diff --git a/Settings.bundle/com.mono0926.LicensePlist.plist b/Settings.bundle/com.mono0926.LicensePlist.plist index 05a71efc0..9c8adfe8e 100644 --- a/Settings.bundle/com.mono0926.LicensePlist.plist +++ b/Settings.bundle/com.mono0926.LicensePlist.plist @@ -48,7 +48,7 @@ File com.mono0926.LicensePlist/ContextMenu Title - ContextMenu (0.1.0) + ContextMenu (0.2.0) Type PSChildPaneSpecifier