Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/Issues/IssuesViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
13 changes: 7 additions & 6 deletions Classes/Issues/Merge/IssueMergeSummaryCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions Classes/Views/MessageView+Styles.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 22 additions & 2 deletions Pods/MessageViewController/MessageViewController/MessageView.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Resources/Assets.xcassets/send.imageset/send@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Assets.xcassets/send.imageset/send@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Settings.bundle/com.mono0926.LicensePlist.plist
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<key>File</key>
<string>com.mono0926.LicensePlist/ContextMenu</string>
<key>Title</key>
<string>ContextMenu (0.1.0)</string>
<string>ContextMenu (0.2.0)</string>
<key>Type</key>
<string>PSChildPaneSpecifier</string>
</dict>
Expand Down