rebase

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at rnystrom@whoisryannystrom.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

Classes/Bookmark/BookmarkNavigationController.swift

@@ -50,6 +50,7 @@ final class BookmarkNavigationController {
         item.target = self
         item.action = selector
         item.isEnabled = true
+        item.width = 0
     }
 
     //for timeframe between viewDidLoad() and bookmark info is loaded 

Classes/Bookmark/BookmarkSectionController.swift

@@ -32,7 +32,7 @@ final class BookmarkSectionController: ListGenericSectionController<BookmarkView
 
         return CGSize(
             width: width,
-            height: max(object.text.viewSize(in: width).height, Styles.Sizes.tableCellHeightLarge)
+            height: max(object.text.viewSize(in: width).height, Styles.Sizes.tableCellHeight + Styles.Sizes.rowSpacing * 2)
         )
     }
 

Classes/Bookmark/BookmarkViewController.swift

@@ -99,6 +99,11 @@ TabNavRootViewControllerType {
             collectionView.collectionViewLayout.invalidateForOrientationChange()
         }
     }
+
+    override func viewWillDisappear(_ animated: Bool) {
+      searchBar.resignFirstResponder()
+    }
+
 
     private func update(animated: Bool) {
         adapter.performUpdates(animated: animated)
@@ -148,14 +153,15 @@ TabNavRootViewControllerType {
     }
 
     func didDelete(bookmarkSectionController: BookmarkSectionController, viewModel: BookmarkViewModel) {
+        searchBar.resignFirstResponder()
         bookmarkStore.remove(viewModel.bookmark)
         update(animated: true)
     }
 
     // MARK: ListAdapterDataSource
 
     func objects(for listAdapter: ListAdapter) -> [ListDiffable] {
-        let contentSizeCategory = UIApplication.shared.preferredContentSizeCategory
+        let contentSizeCategory = UIContentSizeCategory.preferred
         let width = view.bounds.width
         var bookmarks: [ListDiffable]
         switch state {

Classes/Issues/Assignees/IssueAssigneeSummaryCell.swift

@@ -34,8 +34,8 @@ final class IssueAssigneeSummaryCell: UICollectionViewCell, UICollectionViewData
         label.textColor = Styles.Colors.Gray.light.color
         contentView.addSubview(label)
         label.snp.makeConstraints { make in
-            make.centerY.equalTo(contentView)
-            make.left.equalTo(contentView)
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview()
         }
 
         collectionView.backgroundColor = .clear
@@ -44,7 +44,7 @@ final class IssueAssigneeSummaryCell: UICollectionViewCell, UICollectionViewData
         contentView.addSubview(collectionView)
         collectionView.snp.makeConstraints { make in
             make.left.equalTo(label.snp.right).offset(Styles.Sizes.columnSpacing)
-            make.top.bottom.right.equalTo(contentView)
+            make.top.bottom.right.equalToSuperview()
         }
     }
 

Classes/Issues/Assignees/IssueAssigneeUserCell.swift

@@ -28,8 +28,8 @@ final class IssueAssigneeUserCell: UICollectionViewCell, ListBindable {
 
         contentView.addSubview(imageView)
         imageView.snp.makeConstraints { make in
-            make.centerY.equalTo(contentView)
-            make.left.equalTo(contentView)
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview()
             make.size.equalTo(Styles.Sizes.icon)
         }
 
@@ -38,7 +38,7 @@ final class IssueAssigneeUserCell: UICollectionViewCell, ListBindable {
         label.backgroundColor = .clear
         contentView.addSubview(label)
         label.snp.makeConstraints { make in
-            make.centerY.equalTo(contentView)
+            make.centerY.equalToSuperview()
             make.left.equalTo(imageView.snp.right).offset(Styles.Sizes.columnSpacing)
         }
     }

Classes/Issues/Branches/IssueBranchesSectionController.swift

@@ -16,7 +16,6 @@ final class IssueTargetBranchSectionController: ListSectionController {
     override func didUpdate(to object: Any) {
         guard let object = object as? IssueTargetBranchModel else { return }
         self.object = object
-        inset = UIEdgeInsets.zero
     }
 
     override func sizeForItem(at index: Int) -> CGSize {

Classes/Issues/Branches/IssueTargetBranchModel.swift

@@ -32,9 +32,7 @@ final class IssueTargetBranchModel: ListDiffable {
 
         self.targetBranchText = StyledTextRenderer(
             string: builder.build(),
-            contentSizeCategory: .small,
-            inset: .zero,
-            backgroundColor: Styles.Colors.background
+            contentSizeCategory: .small
         ).warm(width: width)
     }
 

Classes/Issues/Comments/CodeBlock/IssueCommentCodeBlockCell.swift

@@ -20,9 +20,9 @@ final class IssueCommentCodeBlockCell: IssueCommentBaseCell, ListBindable {
     )
     static let textViewInset = UIEdgeInsets(
         top: Styles.Sizes.rowSpacing,
-        left: Styles.Sizes.commentGutter,
+        left: Styles.Sizes.columnSpacing,
         bottom: Styles.Sizes.rowSpacing,
-        right: Styles.Sizes.commentGutter
+        right: Styles.Sizes.columnSpacing
     )
 
     let textView = StyledTextView()

Classes/Issues/Comments/Details/IssueCommentDetailCell.swift

@@ -13,7 +13,6 @@ import SDWebImage
 import DateAgo
 
 protocol IssueCommentDetailCellDelegate: class {
-    func didTapMore(cell: IssueCommentDetailCell, sender: UIView)
     func didTapProfile(cell: IssueCommentDetailCell)
 }
 
@@ -25,7 +24,7 @@ final class IssueCommentDetailCell: IssueCommentBaseCell, ListBindable {
     private let loginLabel = UILabel()
     private let dateLabel = ShowMoreDetailsLabel()
     private let editedLabel = ShowMoreDetailsLabel()
-    private let moreButton = UIButton()
+    private let badgeView = IssueDetailBadgeView()
     private var login = ""
 
     override init(frame: CGRect) {
@@ -42,7 +41,7 @@ final class IssueCommentDetailCell: IssueCommentBaseCell, ListBindable {
         contentView.addSubview(imageView)
         imageView.snp.makeConstraints { make in
             make.size.equalTo(Styles.Sizes.avatar)
-            make.left.equalTo(Styles.Sizes.commentGutter)
+            make.left.equalToSuperview()
             make.top.equalTo(Styles.Sizes.rowSpacing)
         }
 
@@ -55,57 +54,39 @@ final class IssueCommentDetailCell: IssueCommentBaseCell, ListBindable {
         )
         contentView.addSubview(loginLabel)
         loginLabel.snp.makeConstraints { make in
-            make.bottom.equalTo(imageView.snp.centerY)
+            make.centerY.equalTo(imageView)
             make.left.equalTo(imageView.snp.right).offset(Styles.Sizes.columnSpacing)
         }
 
         dateLabel.font = Styles.Text.secondary.preferredFont
         dateLabel.textColor = Styles.Colors.Gray.light.color
         contentView.addSubview(dateLabel)
         dateLabel.snp.makeConstraints { make in
-            make.left.equalTo(loginLabel)
-            make.top.equalTo(loginLabel.snp.bottom)
-        }
-
-        moreButton.setImage(UIImage(named: "bullets")?.withRenderingMode(.alwaysTemplate), for: .normal)
-        moreButton.contentVerticalAlignment = .center
-        moreButton.contentHorizontalAlignment = .right
-        moreButton.imageView?.contentMode = .center
-        moreButton.tintColor = Styles.Colors.Gray.light.color
-        moreButton.addTarget(self, action: #selector(IssueCommentDetailCell.onMore(sender:)), for: .touchUpInside)
-        moreButton.accessibilityLabel = Constants.Strings.moreOptions
-        contentView.addSubview(moreButton)
-        moreButton.snp.makeConstraints { make in
-            make.size.equalTo(Styles.Sizes.buttonMin)
-            make.centerY.equalTo(imageView)
-            make.right.equalTo(-Styles.Sizes.commentGutter)
+            make.centerY.equalTo(loginLabel)
+            make.right.equalToSuperview()
         }
 
         editedLabel.font = Styles.Text.secondary.preferredFont
         editedLabel.textColor = Styles.Colors.Gray.light.color
         contentView.addSubview(editedLabel)
         editedLabel.snp.makeConstraints { make in
-            make.left.equalTo(dateLabel.snp.right).offset(Styles.Sizes.inlineSpacing)
+            make.left.equalTo(loginLabel.snp.right).offset(Styles.Sizes.columnSpacing/2)
+            make.centerY.equalTo(loginLabel)
+        }
+
+        contentView.addSubview(badgeView)
+        badgeView.snp.makeConstraints { make in
             make.centerY.equalTo(dateLabel)
+            make.right.equalTo(-40)
         }
     }
 
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-    // MARK: Public API
-
-    func setBorderVisible(_ visible: Bool) {
-        border = visible ? .head : .neck
-    }
-
     // MARK: Private API
 
-    @objc func onMore(sender: UIButton) {
-        delegate?.didTapMore(cell: self, sender: sender)
-    }
-
     @objc func onTapAvatar() {
         delegate?.didTapProfile(cell: self)
     }
@@ -119,21 +100,16 @@ final class IssueCommentDetailCell: IssueCommentBaseCell, ListBindable {
     func bindViewModel(_ viewModel: Any) {
         guard let viewModel = viewModel as? IssueCommentDetailsViewModel else { return }
 
-        backgroundColor = viewModel.didAuthor
-            ? Styles.Colors.Blue.light.color
-            : .white
-
         imageView.sd_setImage(with: viewModel.avatarURL)
-        dateLabel.setText(date: viewModel.date)
+        dateLabel.setText(date: viewModel.date, format: .short)
         loginLabel.text = viewModel.login
+        badgeView.isHidden = !viewModel.sentWithGitHawk
 
         if let editedLogin = viewModel.editedBy, let editedDate = viewModel.editedAt {
             editedLabel.isHidden = false
 
-            let editedByNonOwner = NSLocalizedString("Edited by %@", comment: "")
-            let editedByOwner = NSLocalizedString("Edited", comment: "")
-            let format = viewModel.login != editedLogin ? editedByNonOwner : editedByOwner
-            editedLabel.text = "\(Constants.Strings.bullet) \(String(format: format, editedLogin))"
+            let edited = NSLocalizedString("edited", comment: "")
+            editedLabel.text = "\(Constants.Strings.bullet) \(edited)"
 
             let detailFormat = NSLocalizedString("%@ edited this issue %@", comment: "")
             editedLabel.detailText = String(format: detailFormat, arguments: [editedLogin, editedDate.agoString(.long)])

Classes/Issues/Comments/Details/IssueCommentDetailsViewModel.swift

@@ -17,21 +17,24 @@ final class IssueCommentDetailsViewModel: ListDiffable {
     let didAuthor: Bool
     let editedBy: String?
     let editedAt: Date?
+    let sentWithGitHawk: Bool
 
     init(
         date: Date,
         login: String,
         avatarURL: URL,
         didAuthor: Bool,
         editedBy: String?,
-        editedAt: Date?
+        editedAt: Date?,
+        sentWithGitHawk: Bool
         ) {
         self.date = date
         self.login = login
         self.avatarURL = avatarURL
         self.didAuthor = didAuthor
         self.editedBy = editedBy
         self.editedAt = editedAt
+        self.sentWithGitHawk = sentWithGitHawk
     }
 
     func diffIdentifier() -> NSObjectProtocol {