MessageViewController update (#1741)

* update action label when value changes, make actions diffable

* Update IGListKit swift branch after rebase

* Update MessageViewController pod

* fix build, update w/ latest fixes

Author: rnystrom

Classes/Issues/Managing/IssueManagingActionModel.swift

@@ -11,11 +11,13 @@ import IGListKit
 
 final class IssueManagingActionModel: ListDiffable {
 
+    let key: String
     let label: String
     let imageName: String
     let color: UIColor
 
-    init(label: String, imageName: String, color: UIColor) {
+    init(key: String, label: String, imageName: String, color: UIColor) {
+        self.key = key
         self.label = label
         self.imageName = imageName
         self.color = color
@@ -24,12 +26,15 @@ final class IssueManagingActionModel: ListDiffable {
     // MARK: ListDiffable
 
     func diffIdentifier() -> NSObjectProtocol {
-        return label as NSObjectProtocol
+        return key as NSObjectProtocol
     }
 
     func isEqual(toDiffableObject object: ListDiffable?) -> Bool {
-        // keep it simple
-        return true
+        if self === object { return true }
+        guard let object = object as? IssueManagingActionModel else { return false }
+        return object.label == label
+        && object.imageName == imageName
+        // skip color, for some reason its a pricy comparison
     }
 
 }

Classes/Issues/Managing/IssueManagingSectionController.swift

@@ -18,41 +18,49 @@ ContextMenuDelegate {
 
     private enum Action {
         static let labels = IssueManagingActionModel(
+            key: "tag",
             label: NSLocalizedString("Labels", comment: ""),
             imageName: "tag",
             color: "3f88f7".color
         )
         static let milestone = IssueManagingActionModel(
+            key: "milestone",
             label: NSLocalizedString("Milestone", comment: ""),
             imageName: "milestone",
             color: "6847ba".color
         )
         static let assignees = IssueManagingActionModel(
+            key: "person",
             label: NSLocalizedString("Assignees", comment: ""),
             imageName: "person",
             color: "e77230".color
         )
         static let reviewers = IssueManagingActionModel(
+            key: "reviewer",
             label: NSLocalizedString("Reviewers", comment: ""),
             imageName: "reviewer",
             color: "50a451".color
         )
         static let lock = IssueManagingActionModel(
+            key: "lock", // share key so lock/unlock just updates cell
             label: NSLocalizedString("Lock", comment: ""),
             imageName: "lock",
             color: Styles.Colors.Gray.dark.color
         )
         static let unlock = IssueManagingActionModel(
+            key: "lock", // share key so lock/unlock just updates cell
             label: NSLocalizedString("Unlock", comment: ""),
             imageName: "key",
             color: Styles.Colors.Gray.dark.color
         )
         static let reopen = IssueManagingActionModel(
+            key: "open", // share key so open/close just updates cell
             label: Constants.Strings.reopen,
             imageName: "sync",
             color: Styles.Colors.Green.medium.color
         )
         static let close = IssueManagingActionModel(
+            key: "open", // share key so open/close just updates cell
             label: Constants.Strings.close,
             imageName: "x",
             color: Styles.Colors.Red.medium.color

Classes/Systems/Autocomplete/UserAutocomplete.swift

@@ -65,7 +65,6 @@ final class UserAutocomplete: AutocompleteType {
 
     var highlightAttributes: [NSAttributedStringKey : Any]? {
         return [
-            .font: Styles.Text.body.preferredFont,
             .foregroundColor: Styles.Colors.Blue.medium.color,
             .backgroundColor: Styles.Colors.Blue.medium.color.withAlphaComponent(0.1),
         ]

Classes/Views/MessageView+Styles.swift

@@ -16,16 +16,18 @@ extension MessageViewController {
         borderColor = Styles.Colors.Gray.border.color
         messageView.textView.placeholderText = NSLocalizedString("Leave a comment", comment: "")
         messageView.textView.placeholderTextColor = Styles.Colors.Gray.light.color
-        messageView.set(buttonIcon: UIImage(named: "send")?.withRenderingMode(.alwaysTemplate), for: .normal)
-        messageView.buttonTint = Styles.Colors.Blue.medium.color
+        messageView.setButton(icon: UIImage(named: "send")?.withRenderingMode(.alwaysTemplate), for: .normal, position: .right)
+        messageView.rightButtonTint = Styles.Colors.Blue.medium.color
         messageView.font = Styles.Text.body.preferredFont
-        messageView.inset = UIEdgeInsets(
+        messageView.textViewInset = UIEdgeInsets(
             top: Styles.Sizes.gutter,
             left: Styles.Sizes.gutter,
-            bottom: Styles.Sizes.rowSpacing / 2,
-            right: Styles.Sizes.gutter
+            bottom: 0,
+            right: Styles.Sizes.rowSpacing
         )
-        messageView.addButton(target: target, action: action)
+        messageView.setButton(inset: Styles.Sizes.gutter, position: .right)
+        messageView.bottomInset = Styles.Sizes.rowSpacing / 2
+        messageView.addButton(target: target, action: action, position: .right)
     }
 
 }

Podfile.lock

@@ -46,13 +46,13 @@ PODS:
     - GoogleToolboxForMac/Defines (= 2.1.3)
   - Highlightr (1.1.0)
   - HTMLString (4.0.1)
-  - IGListKit/Default (3.1.1):
+  - IGListKit/Default (3.3.0):
     - IGListKit/Diffing
-  - IGListKit/Diffing (3.1.1)
-  - IGListKit/Swift (3.1.1):
+  - IGListKit/Diffing (3.3.0)
+  - IGListKit/Swift (3.3.0):
     - IGListKit/Default
   - leveldb-library (1.20)
-  - MessageViewController (0.2.0)
+  - MessageViewController (0.2.1)
   - nanopb (0.3.8):
     - nanopb/decode (= 0.3.8)
     - nanopb/encode (= 0.3.8)
@@ -149,10 +149,10 @@ CHECKOUT OPTIONS:
     :commit: 4f7e90477619b8dc4b9e641efd10952c22150c5c
     :git: https://github.com/GitHawkApp/Highlightr.git
   IGListKit:
-    :commit: 9e7974d472b61837b69bcc38da150e72d42ca75e
+    :commit: 894737d8eaa4eb3d357156d0e7e99bcb1099b61a
     :git: https://github.com/Instagram/IGListKit.git
   MessageViewController:
-    :commit: e985c533f3dcefcd98dc836c65e141afca2fe23c
+    :commit: 4fb166245f72e5d47b6c0f3e67351e9a9802ec63
     :git: https://github.com/GitHawkApp/MessageViewController.git
   StyledText:
     :commit: c9c58444decbbe2fac29b8af5741c8ea3a48887e
@@ -180,9 +180,9 @@ SPEC CHECKSUMS:
   GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
   Highlightr: 70c4df19e4aa55aa1b4387fb98182abce1dec9da
   HTMLString: 8d9a8a8aaf63dd52c5b8cd9a38e14da52f753210
-  IGListKit: 2f46c3390be7e0fd70b401abb34b3737d4730c19
+  IGListKit: 7edb98afdb8401245d8bea0b733ebd4ac5e67caf
   leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5
-  MessageViewController: a9119bb49a4f6eeeb69ec3c4ab5f1dd7a2ddec02
+  MessageViewController: 63ef2719d82c91d949ad52e101f049028a5a0611
   nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
   NYTPhotoViewer: e80e8767f3780d2df37c6f72cbab15d6c7232911
   Pageboy: 50db8fffaa6d4d004249b7b6b19e33464dd7505b