Move several menu-specific actions from Root.Action to Menu.Action

Author: mattrubin

Authenticator/Source/Menu.swift

@@ -23,7 +23,7 @@
 //  SOFTWARE.
 //
 
-struct Menu {
+struct Menu: Component {
     let infoList: InfoList
     private(set) var child: Child
 
@@ -71,6 +71,25 @@ struct Menu {
 
     // MARK: -
 
+    enum Action {
+        case dismissInfo
+        case dismissDisplayOptions
+    }
+
+    typealias Effect = Never
+
+    mutating func update(with action: Action) throws -> Effect? {
+        switch action {
+        case .dismissInfo:
+            try dismissInfo()
+            return nil
+
+        case .dismissDisplayOptions:
+            try dismissDisplayOptions()
+            return nil
+        }
+    }
+
     enum Error: Swift.Error {
         case badChildState
     }
@@ -82,7 +101,7 @@ struct Menu {
         child = .info(info)
     }
 
-    mutating func dismissInfo() throws {
+    private mutating func dismissInfo() throws {
         guard case .info = child else {
             throw Error.badChildState
         }
@@ -96,7 +115,7 @@ struct Menu {
         child = .displayOptions(DisplayOptions())
     }
 
-    mutating func dismissDisplayOptions() throws {
+    private mutating func dismissDisplayOptions() throws {
         guard case .displayOptions = child else {
             throw Error.badChildState
         }

Authenticator/Source/Root.swift

@@ -88,12 +88,11 @@ extension Root {
         case tokenEntryFormAction(TokenEntryForm.Action)
         case tokenEditFormAction(TokenEditForm.Action)
         case tokenScannerAction(TokenScanner.Action)
+        case menuAction(Menu.Action)
 
         case infoListEffect(InfoList.Effect)
         case infoEffect(Info.Effect)
         case displayOptionsEffect(DisplayOptions.Effect)
-        case dismissInfo
-        case dismissDisplayOptions
 
         case addTokenFromURL(Token)
     }
@@ -161,6 +160,12 @@ extension Root {
                     handleTokenScannerEffect(effect)
                 }
 
+            case .menuAction(let action):
+                let effect = try modal.withMenu { menu in try menu.update(with: action) }
+                return effect.flatMap { effect in
+                    handleMenuEffect(effect)
+                }
+
             case .infoListEffect(let effect):
                 return try handleInfoListEffect(effect)
 
@@ -170,18 +175,6 @@ extension Root {
             case .displayOptionsEffect(let effect):
                 return handleDisplayOptionsEffect(effect)
 
-            case .dismissInfo:
-                try modal.withMenu { menu in
-                    try menu.dismissInfo()
-                }
-                return nil
-
-            case .dismissDisplayOptions:
-                try modal.withMenu { menu in
-                    try menu.dismissDisplayOptions()
-                }
-                return nil
-
             case .addTokenFromURL(let token):
                 return .addToken(token,
                                  success: Event.addTokenFromURLSucceeded,
@@ -381,6 +374,11 @@ extension Root {
             return .setDigitGroupSize(digitGroupSize)
         }
     }
+
+    private mutating func handleMenuEffect(_ effect: Menu.Effect) -> Effect? {
+        switch effect {
+        }
+    }
 }
 
 private extension Root.Modal {

Authenticator/Source/RootViewController.swift

@@ -216,11 +216,11 @@ extension RootViewController: UINavigationControllerDelegate {
             case .info:
                 // If the current modal state is the menu with an Info child, and the just-shown view controller is
                 // an InfoList, then the user has popped the Info view controller.
-                dispatchAction(.dismissInfo)
+                dispatchAction(.menuAction(.dismissInfo))
             case .displayOptions:
                 // If the current modal state is the menu with a DisplayOptions child, and the just-shown view
                 // controller is an InfoList, then the user has popped the DisplayOptions view controller.
-                dispatchAction(.dismissDisplayOptions)
+                dispatchAction(.menuAction(.dismissDisplayOptions))
             default:
                 break
             }