Voice Chat Improvements

submodules/PeerInfoUI/Sources/PeerReportController.swift

@@ -33,7 +33,7 @@ public enum PeerReportOption {
     case other
 }
 
-public func presentPeerReportOptions(context: AccountContext, parent: ViewController, contextController: ContextController?, subject: PeerReportSubject, options: [PeerReportOption] = [.spam, .violence, .pornography, .childAbuse, .copyright, .other], completion: @escaping (ReportReason?, Bool) -> Void) {
+public func presentPeerReportOptions(context: AccountContext, parent: ViewController, contextController: ContextController?, backAction: ((ContextController) -> Void)? = nil, subject: PeerReportSubject, options: [PeerReportOption] = [.spam, .violence, .pornography, .childAbuse, .copyright, .other], passthrough: Bool = false, completion: @escaping (ReportReason?, Bool) -> Void) {
     if let contextController = contextController {
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
         var items: [ContextMenuItem] = []
@@ -86,25 +86,29 @@ public func presentPeerReportOptions(context: AccountContext, parent: ViewContro
                 }
                 
                 let action: (String) -> Void = { message in
-                    switch subject {
-                        case let .peer(peerId):
-                            let _ = (reportPeer(account: context.account, peerId: peerId, reason: reportReason, message: "")
-                            |> deliverOnMainQueue).start(completed: {
-                                displaySuccess()
-                                completion(reportReason, true)
-                            })
-                        case let .messages(messageIds):
-                            let _ = (reportPeerMessages(account: context.account, messageIds: messageIds, reason: reportReason, message: "")
-                            |> deliverOnMainQueue).start(completed: {
-                                displaySuccess()
-                                completion(reportReason, true)
-                            })
-                        case let .profilePhoto(peerId, photoId):
-                            let _ = (reportPeerPhoto(account: context.account, peerId: peerId, reason: reportReason, message: "")
-                            |> deliverOnMainQueue).start(completed: {
-                                displaySuccess()
-                                completion(reportReason, true)
-                            })
+                    if passthrough {
+                        completion(reportReason, true)
+                    } else {
+                        switch subject {
+                            case let .peer(peerId):
+                                let _ = (reportPeer(account: context.account, peerId: peerId, reason: reportReason, message: "")
+                                |> deliverOnMainQueue).start(completed: {
+                                    displaySuccess()
+                                    completion(nil, false)
+                                })
+                            case let .messages(messageIds):
+                                let _ = (reportPeerMessages(account: context.account, messageIds: messageIds, reason: reportReason, message: "")
+                                |> deliverOnMainQueue).start(completed: {
+                                    displaySuccess()
+                                    completion(nil, false)
+                                })
+                            case let .profilePhoto(peerId, photoId):
+                                let _ = (reportPeerPhoto(account: context.account, peerId: peerId, reason: reportReason, message: "")
+                                |> deliverOnMainQueue).start(completed: {
+                                    displaySuccess()
+                                    completion(nil, false)
+                                })
+                        }
                     }
                 }
                 
@@ -133,11 +137,19 @@ public func presentPeerReportOptions(context: AccountContext, parent: ViewContro
                 f(.dismissWithoutContent)
             })))
         }
+        if let backAction = backAction {
+            items.append(.separator)
+            items.append(.action(ContextMenuActionItem(text: presentationData.strings.Common_Back, icon: { theme in
+                return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Back"), color: theme.actionSheet.primaryTextColor)
+            }, action: { (c, _) in
+                backAction(c)
+            })))
+        }
         contextController.setItems(.single(items))
     } else {
         contextController?.dismiss()
         parent.view.endEditing(true)
-        parent.present(peerReportOptionsController(context: context, subject: subject, passthrough: false, present: { [weak parent] c, a in
+        parent.present(peerReportOptionsController(context: context, subject: subject, passthrough: passthrough, present: { [weak parent] c, a in
             parent?.present(c, in: .window(.root), with: a)
         }, push: { [weak parent] c in
             parent?.push(c)
@@ -200,37 +212,29 @@ public func peerReportOptionsController(context: AccountContext, subject: PeerRe
                 }
                 
                 let action: (String) -> Void = { message in
-                    switch subject {
-                        case let .peer(peerId):
-                            if passthrough {
-                                completion(reportReason, true)
-                            } else {
+                    if passthrough {
+                        completion(reportReason, true)
+                    } else {
+                        switch subject {
+                            case let .peer(peerId):
                                 let _ = (reportPeer(account: context.account, peerId: peerId, reason: reportReason, message: message)
                                 |> deliverOnMainQueue).start(completed: {
                                     displaySuccess()
                                     completion(nil, false)
                                 })
-                            }
-                        case let .messages(messageIds):
-                            if passthrough {
-                                completion(reportReason, true)
-                            } else {
+                            case let .messages(messageIds):
                                 let _ = (reportPeerMessages(account: context.account, messageIds: messageIds, reason: reportReason, message: message)
                                 |> deliverOnMainQueue).start(completed: {
                                     displaySuccess()
                                     completion(nil, false)
                                 })
-                            }
-                        case let .profilePhoto(peerId, photoId):
-                            if passthrough {
-                                completion(reportReason, true)
-                            } else {
+                            case let .profilePhoto(peerId, photoId):
                                 let _ = (reportPeerPhoto(account: context.account, peerId: peerId, reason: reportReason, message: message)
                                 |> deliverOnMainQueue).start(completed: {
                                     displaySuccess()
                                     completion(nil, false)
                                 })
-                            }
+                        }
                     }
                 }
                 
@@ -259,8 +263,6 @@ public func peerReportOptionsController(context: AccountContext, subject: PeerRe
                 } else {
                     action("")
                 }
-            } else {
-                push(peerReportController(context: context, subject: subject, completion: completion))
             }
             
             controller?.dismissAnimated()
@@ -278,180 +280,3 @@ public func peerReportOptionsController(context: AccountContext, subject: PeerRe
     ])
     return controller
 }
-
-private final class PeerReportControllerArguments {
-    let updateText: (String) -> Void
-    
-    init(updateText: @escaping (String) -> Void) {
-        self.updateText = updateText
-    }
-}
-
-private enum PeerReportControllerSection: Int32 {
-    case text
-}
-
-private enum PeerReportControllerEntryTag: ItemListItemTag {
-    case text
-    
-    func isEqual(to other: ItemListItemTag) -> Bool {
-        if let other = other as? PeerReportControllerEntryTag {
-            switch self {
-                case .text:
-                    if case .text = other {
-                        return true
-                    } else {
-                        return false
-                    }
-            }
-        } else {
-            return false
-        }
-    }
-}
-
-private enum PeerReportControllerEntry: ItemListNodeEntry {
-    case text(PresentationTheme, String, String)
-    
-    var section: ItemListSectionId {
-        switch self {
-            case .text:
-                return PeerReportControllerSection.text.rawValue
-        }
-    }
-    
-    var stableId: Int32 {
-        switch self {
-            case .text:
-                return 0
-        }
-    }
-    
-    static func ==(lhs: PeerReportControllerEntry, rhs: PeerReportControllerEntry) -> Bool {
-        switch lhs {
-            case let .text(lhsTheme, lhsText, lhsValue):
-                if case let .text(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
-                    return true
-                } else {
-                    return false
-                }
-        }
-    }
-    
-    static func <(lhs: PeerReportControllerEntry, rhs: PeerReportControllerEntry) -> Bool {
-        return lhs.stableId < rhs.stableId
-    }
-    
-    func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
-        let arguments = arguments as! PeerReportControllerArguments
-        switch self {
-            case let .text(theme, title, value):
-                return ItemListMultilineInputItem(presentationData: presentationData, text: value, placeholder: title, maxLength: nil, sectionId: self.section, style: .blocks, textUpdated: { text in
-                    arguments.updateText(text)
-                }, tag: PeerReportControllerEntryTag.text)
-        }
-    }
-}
-
-private struct PeerReportControllerState: Equatable {
-    var isReporting: Bool = false
-    var text: String = ""
-}
-
-private func peerReportControllerEntries(presentationData: PresentationData, state: PeerReportControllerState) -> [PeerReportControllerEntry] {
-    var entries: [PeerReportControllerEntry] = []
-    
-    entries.append(.text(presentationData.theme, presentationData.strings.ReportPeer_ReasonOther_Placeholder, state.text))
-    
-    return entries
-}
-
-private func peerReportController(context: AccountContext, subject: PeerReportSubject, completion: @escaping (ReportReason?, Bool) -> Void) -> ViewController {
-    var dismissImpl: (() -> Void)?
-    var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments?) -> Void)?
-    
-    let statePromise = ValuePromise(PeerReportControllerState(), ignoreRepeated: true)
-    let stateValue = Atomic(value: PeerReportControllerState())
-    let updateState: ((PeerReportControllerState) -> PeerReportControllerState) -> Void = { f in
-        statePromise.set(stateValue.modify { f($0) })
-    }
-    
-    let arguments = PeerReportControllerArguments(updateText: { text in
-        updateState { state in
-            var state = state
-            state.text = text
-            return state
-        }
-    })
-    
-    let reportDisposable = MetaDisposable()
-    
-    let signal = combineLatest(context.sharedContext.presentationData, statePromise.get())
-    |> map { presentationData, state -> (ItemListControllerState, (ItemListNodeState, Any)) in
-        let rightButton: ItemListNavigationButton
-        if state.isReporting {
-            rightButton = ItemListNavigationButton(content: .none, style: .activity, enabled: true, action: {})
-        } else {
-            rightButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Done), style: .bold, enabled: !state.text.isEmpty, action: {
-                var text: String = ""
-                updateState { state in
-                    var state = state
-                    if !state.isReporting && !state.text.isEmpty {
-                        text = state.text
-                        state.isReporting = true
-                    }
-                    return state
-                }
-                
-                if !text.isEmpty {
-                    let reportReason: ReportReason = .custom
-                    let completed: () -> Void = {
-                        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                        presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.ReportPeer_AlertSuccess, actions: [TextAlertAction.init(type: TextAlertActionType.defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
-                        completion(reportReason, true)
-                        dismissImpl?()
-                    }
-                    switch subject {
-                        case let .peer(peerId):
-                            reportDisposable.set((reportPeer(account: context.account, peerId: peerId, reason: reportReason, message: text)
-                            |> deliverOnMainQueue).start(completed: {
-                                completed()
-                            }))
-                        case let .messages(messageIds):
-                            reportDisposable.set((reportPeerMessages(account: context.account, messageIds: messageIds, reason: reportReason, message: text)
-                            |> deliverOnMainQueue).start(completed: {
-                                completed()
-                            }))
-                        case let .profilePhoto(peerId, photoId):
-                            reportDisposable.set((reportPeerPhoto(account: context.account, peerId: peerId, reason: reportReason, message: text)
-                            |> deliverOnMainQueue).start(completed: {
-                                completed()
-                            }))
-                    }
-                }
-            })
-        }
-        
-        let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.ReportPeer_ReasonOther_Title), leftNavigationButton: ItemListNavigationButton(content: .text(presentationData.strings.Common_Cancel), style: .regular, enabled: true, action: {
-            dismissImpl?()
-            completion(nil, false)
-        }), rightNavigationButton: rightButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back))
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: peerReportControllerEntries(presentationData: presentationData, state: state), style: .blocks, focusItemTag: PeerReportControllerEntryTag.text)
-        
-        return (controllerState, (listState, arguments))
-    }
-    |> afterDisposed {
-        reportDisposable.dispose()
-    }
-    
-    let controller = ItemListController(context: context, state: signal)
-    controller.navigationPresentation = .modal
-    presentControllerImpl = { [weak controller] c, a in
-        controller?.present(c, in: .window(.root), with: a)
-    }
-    dismissImpl = { [weak controller] in
-        controller?.view.endEditing(true)
-        controller?.dismiss()
-    }
-    return controller
-}