Merge pull request #31 from Leanplum/fix-iam-handlers

Bind display and priority handlers
Leanplum · Jul 28, 2022 · 1f35538 · 1f35538
2 parents 3adfa51 + a3fff9d
commit 1f35538
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Rondo/UI/Messages/ActionManagerModel.swift b/Rondo/UI/Messages/ActionManagerModel.swift
@@ -30,6 +30,7 @@ enum MessageDisplay: String, CaseIterable {
 }
 
 enum MessagePrioritization: String, CaseIterable {
+    case all = "All"
     case firstOnly = "First Only"
     case allReversed = "All Reversed"
 }
@@ -185,6 +186,10 @@ class ActionManagerModel {
 
     func prioritizationChoiceChanged(_ prioritization: MessagePrioritization?) {
         switch prioritization {
+        case .all:
+            ActionManager.shared.prioritizeMessages { contexts, trigger in
+                return contexts
+            }
         case .firstOnly:
             ActionManager.shared.prioritizeMessages { contexts, trigger in
                 guard let first = contexts.first else {

diff --git a/Rondo/UI/Messages/MessagesViewController+ActionManager.swift b/Rondo/UI/Messages/MessagesViewController+ActionManager.swift
@@ -66,9 +66,12 @@ extension MessagesViewController {
                 listRow.title = option.rawValue
                 listRow.tag = option.rawValue
                 listRow.selectableValue = option
-                listRow.value = nil
+                listRow.value = model.displayChoice == option ? option : nil
             }
         }
+        section.onSelectSelectableRow = { [weak self] (cell, cellRow) in
+            self?.model.displayChoice = cellRow.value
+        }
 
         form +++ section
 
@@ -114,12 +117,15 @@ extension MessagesViewController {
 
         let prioritizeOptions = MessagePrioritization.allCases
         for option in prioritizeOptions {
-            prioritySection <<< ListCheckRow<MessagePrioritization>(){ listRow in
+            prioritySection <<< ListCheckRow<MessagePrioritization>() { listRow in
                 listRow.title = option.rawValue
                 listRow.selectableValue = option
-                listRow.value = nil
+                listRow.value = model.prioritizationChoice == option ? option : nil
             }
         }
+        prioritySection.onSelectSelectableRow = { [weak self] (cell, cellRow) in
+            self?.model.prioritizationChoice = cellRow.value
+        }
 
         form +++ prioritySection
     }