[MBL-1027] Blocked User Messages UI

Kickstarter-iOS/Features/MessageBanner/Controller/MessageBannerViewController.swift

@@ -19,6 +19,7 @@
   @IBOutlet fileprivate var messageLabel: UILabel!
 
   private var bannerType: MessageBannerType?
+  private var dissmissable: Bool = true
 
   internal var bottomConstraint: NSLayoutConstraint?
   private let viewModel: MessageBannerViewModelType = MessageBannerViewModel()
@@ -66,7 +67,13 @@
     self.viewModel.outputs.messageBannerViewIsHidden
       .observeForUI()
       .observeValues { [weak self] isHidden in
-        self?.showViewAndAnimate(isHidden)
+        guard let self else { return }
+
+        if isHidden, !self.dissmissable {
+          return
+        }
+
+        self.showViewAndAnimate(isHidden)
       }
 
     self.viewModel.outputs.iconTintColor
@@ -95,20 +102,26 @@
       }
   }
 
-  public func showBanner(with type: MessageBannerType, message: String) {
+  public func showBanner(with type: MessageBannerType, message: String, dissmissable: Bool = true) {
     self.bannerType = type
+    self.dissmissable = dissmissable
     self.viewModel.inputs.update(with: (type, message))
     self.viewModel.inputs.bannerViewWillShow(true)
   }
 
   private func showViewAndAnimate(_ isHidden: Bool) {
+    if !isHidden, !self.view.isHidden, !self.dissmissable { return }
+
     let duration = isHidden ? AnimationConstants.hideDuration : AnimationConstants.showDuration
 
     let hiddenConstant = self.view.frame.height + (self.view.superview?.safeAreaInsets.bottom ?? 0)
 
     if !isHidden {
       self.view.superview?.bringSubviewToFront(self.view)
-      self.view.superview?.isUserInteractionEnabled = false
+
+      if self.dissmissable {
+        self.view.superview?.isUserInteractionEnabled = false
+      }
 
       self.view.isHidden = isHidden
 
@@ -162,7 +175,7 @@
   }
 
   @IBAction private func bannerViewPanned(_ sender: UIPanGestureRecognizer) {
-    guard let view = sender.view else {
+    guard self.dissmissable, let view = sender.view else {
       return
     }
 
@@ -191,6 +204,8 @@
   }
 
   @IBAction private func bannerViewTapped(_: Any) {
+    guard self.dissmissable else { return }
+
     self.viewModel.inputs.bannerViewWillShow(false)
   }
 }

Kickstarter-iOS/Features/Messages/Controller/MessagesViewController.swift

@@ -1,6 +1,7 @@
 import KsApi
 import Library
 import Prelude
+import SwiftUI
 import UIKit
 
 internal final class MessagesViewController: UITableViewController, MessageBannerViewControllerPresenting {
@@ -38,6 +39,18 @@
     self.viewModel.inputs.viewDidLoad()
   }
 
+  override func viewWillAppear(_ animated: Bool) {
+    super.viewWillAppear(animated)
+
+    self.viewModel.inputs.viewWillAppear()
+  }
+
+  override func viewDidAppear(_ animated: Bool) {
+    super.viewDidAppear(animated)
+
+    self.updateTableViewBottomContentInset()
+  }
+
   internal override func bindStyles() {
     super.bindStyles()
 
@@ -78,6 +91,15 @@
         self?.tableView.reloadData()
       }
 
+    self.viewModel.outputs.participantPreviouslyBlocked
+      .observeForControllerAction()
+      .observeValues { [weak self] isBlocked in
+        guard let self, isBlocked == true else { return }
+
+        self.messageBannerViewController?
+          .showBanner(with: .error, message: Strings.This_user_has_been_blocked(), dissmissable: false)
+      }
+
     self.viewModel.outputs.presentMessageDialog
       .observeForControllerAction()
       .observeValues { [weak self] messageThread, context in
@@ -92,7 +114,7 @@
       .observeForControllerAction()
       .observeValues { [weak self] params in self?.goToBacking(with: params) }
 
-    self.viewModel.outputs.userBlocked
+    self.viewModel.outputs.didBlockUser
       .observeForUI()
       .observeValues { [weak self] success in
 
@@ -161,6 +183,12 @@
     self.present(vc, animated: true)
   }
 
+  private func updateTableViewBottomContentInset() {
+    if let messageBannerView = messageBannerViewController?.view {
+      self.tableView.contentInset.bottom = messageBannerView.bounds.height
+    }
+  }
+
   private func presentBlockUserAlert(username: String) {
     let alert = UIAlertController
       .blockUserAlert(username: username, blockUserHandler: { _ in self.viewModel.inputs.blockUser() })

Library/ViewModels/MessagesViewModel.swift

@@ -24,6 +24,9 @@ public protocol MessagesViewModelInputs {
 
   /// Call when the view loads.
   func viewDidLoad()
+
+  /// Call when the view will appear.
+  func viewWillAppear()
 }
 
 public protocol MessagesViewModelOutputs {
@@ -45,6 +48,9 @@ public protocol MessagesViewModelOutputs {
   /// Emits a list of messages to be displayed.
   var messages: Signal<[Message], Never> { get }
 
+  /// Emits a bool whether the message participant has previously been blocked on viewWillAppear
+  var participantPreviouslyBlocked: Signal<Bool, Never> { get }
+
   /// Emits when we should show the message dialog.
   var presentMessageDialog: Signal<(MessageThread, KSRAnalytics.MessageDialogContext), Never> { get }
 
@@ -57,8 +63,8 @@ public protocol MessagesViewModelOutputs {
   /// Emits when the thread has been marked as read.
   var successfullyMarkedAsRead: Signal<(), Never> { get }
 
-  /// Emits when a request to block a user has been made
-  var userBlocked: Signal<Bool, Never> { get }
+  /// Emits whether a request to block a user was successful.
+  var didBlockUser: Signal<Bool, Never> { get }
 }
 
 public protocol MessagesViewModelType {
@@ -161,7 +167,8 @@ public final class MessagesViewModel: MessagesViewModelType, MessagesViewModelIn
 
     self.replyButtonIsEnabled = Signal.merge(
       self.viewDidLoadProperty.signal.mapConst(false),
-      self.messages.map { !$0.isEmpty }
+      self.messages.map { !$0.isEmpty },
+      participant.signal.map { $0.isBlocked == false }
     )
 
     self.presentMessageDialog = messageThreadEnvelope
@@ -191,12 +198,16 @@ public final class MessagesViewModel: MessagesViewModelType, MessagesViewModelIn
       .ignoreValues()
 
     // TODO: Call blocking GraphQL mutation
-    self.userBlocked = self.blockUserProperty.signal.map { true }
+    self.didBlockUser = self.blockUserProperty.signal.map { false }
 
-    self.userBlocked.observeValues { didBlock in
+    self.didBlockUser.observeValues { didBlock in
       guard didBlock == true else { return }
       NotificationCenter.default.post(.init(name: .ksr_blockedUser))
     }
+
+    /// TODO(MBL-1025): Get isBlocked status from the backend instead.
+    self.participantPreviouslyBlocked = self.viewWillAppearProperty.signal
+      .mapConst(false)
   }
 
   private let backingInfoPressedProperty = MutableProperty(())
@@ -234,16 +245,22 @@ public final class MessagesViewModel: MessagesViewModelType, MessagesViewModelIn
     self.viewDidLoadProperty.value = ()
   }
 
+  private let viewWillAppearProperty = MutableProperty(())
+  public func viewWillAppear() {
+    self.viewWillAppearProperty.value = ()
+  }
+
   public let backingAndProjectAndIsFromBacking: Signal<(Backing, Project, Bool), Never>
   public let emptyStateIsVisibleAndMessageToUser: Signal<(Bool, String), Never>
   public let goToBacking: Signal<ManagePledgeViewParamConfigData, Never>
   public let goToProject: Signal<(Project, RefTag), Never>
   public let messages: Signal<[Message], Never>
+  public let participantPreviouslyBlocked: Signal<Bool, Never>
   public let presentMessageDialog: Signal<(MessageThread, KSRAnalytics.MessageDialogContext), Never>
   public let project: Signal<Project, Never>
   public let replyButtonIsEnabled: Signal<Bool, Never>
   public let successfullyMarkedAsRead: Signal<(), Never>
-  public let userBlocked: Signal<Bool, Never>
+  public let didBlockUser: Signal<Bool, Never>
 
   public var inputs: MessagesViewModelInputs { return self }
   public var outputs: MessagesViewModelOutputs { return self }

Library/ViewModels/MessagesViewModelTests.swift

@@ -16,10 +16,12 @@ internal final class MessagesViewModelTests: TestCase {
   fileprivate let goToProject = TestObserver<Project, Never>()
   fileprivate let goToRefTag = TestObserver<RefTag, Never>()
   fileprivate let messages = TestObserver<[Message], Never>()
+  fileprivate let participantPreviouslyBlocked = TestObserver<Bool, Never>()
   fileprivate let presentMessageDialog = TestObserver<MessageThread, Never>()
   fileprivate let project = TestObserver<Project, Never>()
   fileprivate let replyButtonIsEnabled = TestObserver<Bool, Never>()
   fileprivate let successfullyMarkedAsRead = TestObserver<(), Never>()
+  fileprivate let didBlockUser = TestObserver<Bool, Never>()
 
   override func setUp() {
     super.setUp()
@@ -33,10 +35,12 @@ internal final class MessagesViewModelTests: TestCase {
     self.vm.outputs.goToProject.map { $0.0 }.observe(self.goToProject.observer)
     self.vm.outputs.goToProject.map { $0.1 }.observe(self.goToRefTag.observer)
     self.vm.outputs.messages.observe(self.messages.observer)
+    self.vm.outputs.participantPreviouslyBlocked.observe(self.participantPreviouslyBlocked.observer)
     self.vm.outputs.presentMessageDialog.map { $0.0 }.observe(self.presentMessageDialog.observer)
     self.vm.outputs.project.observe(self.project.observer)
     self.vm.outputs.replyButtonIsEnabled.observe(self.replyButtonIsEnabled.observer)
     self.vm.outputs.successfullyMarkedAsRead.observe(self.successfullyMarkedAsRead.observer)
+    self.vm.outputs.didBlockUser.observe(self.didBlockUser.observer)
 
     AppEnvironment.login(AccessTokenEnvelope(accessToken: "deadbeef", user: User.template))
   }
@@ -235,7 +239,7 @@ internal final class MessagesViewModelTests: TestCase {
       self.scheduler.advance()
 
       self.messages.assertValueCount(1)
-      self.replyButtonIsEnabled.assertValues([false, true])
+      self.replyButtonIsEnabled.assertValues([false, false, true])
       self.emptyStateIsVisible.assertValues([false], "Empty state does not emit again.")
 
       self.vm.inputs.replyButtonPressed()
@@ -250,6 +254,27 @@ internal final class MessagesViewModelTests: TestCase {
     }
   }
 
+  func testparticipantPreviouslyBlockedFlow() {
+    let project = Project.template |> Project.lens.id .~ 42
+    let backing = Backing.template
+    let messageThread = .template
+      |> MessageThread.lens.project .~ project
+      |> MessageThread.lens.participant .~ .template
+
+    let apiService = MockService(fetchMessageThreadResult: Result.success(messageThread))
+
+    withEnvironment(apiService: apiService, currentUser: .template) {
+      self.vm.inputs.configureWith(data: .right((project: project, backing: backing)))
+
+      self.participantPreviouslyBlocked.assertValueCount(0)
+
+      self.vm.inputs.viewWillAppear()
+
+      /// TODO(MBL-1025): Once we are getting isBlocked status from backend we need to update this use that. This is hardcoded for now.
+      self.participantPreviouslyBlocked.assertValues([false])
+    }
+  }
+
   func testMarkAsRead() {
     self.vm.inputs.configureWith(data: .left(MessageThread.template))
     self.vm.inputs.viewDidLoad()