|
@@ -326,14 +326,16 @@ class NewChatCoordinator: Coordinator {
|
|
navigationController.viewControllers.remove(at: 1)
|
|
navigationController.viewControllers.remove(at: 1)
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
func showContactDetail(contactId: Int) {
|
|
func showContactDetail(contactId: Int) {
|
|
- let viewModel = ContactDetailViewModel(contactId: contactId, context: dcContext)
|
|
|
|
|
|
+ let viewModel = ContactDetailViewModel(contactId: contactId, startChatOption: true, context: dcContext)
|
|
let contactDetailController = ContactDetailViewController(viewModel: viewModel)
|
|
let contactDetailController = ContactDetailViewController(viewModel: viewModel)
|
|
let coordinator = ContactDetailCoordinator(dcContext: dcContext, navigationController: navigationController)
|
|
let coordinator = ContactDetailCoordinator(dcContext: dcContext, navigationController: navigationController)
|
|
childCoordinators.append(coordinator)
|
|
childCoordinators.append(coordinator)
|
|
contactDetailController.coordinator = coordinator
|
|
contactDetailController.coordinator = coordinator
|
|
navigationController.pushViewController(contactDetailController, animated: true)
|
|
navigationController.pushViewController(contactDetailController, animated: true)
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
class GroupChatDetailCoordinator: Coordinator {
|
|
class GroupChatDetailCoordinator: Coordinator {
|
|
@@ -377,7 +379,7 @@ class GroupChatDetailCoordinator: Coordinator {
|
|
}
|
|
}
|
|
|
|
|
|
func showContactDetail(of contactId: Int) {
|
|
func showContactDetail(of contactId: Int) {
|
|
- let viewModel = ContactDetailViewModel(contactId: contactId, context: dcContext)
|
|
|
|
|
|
+ let viewModel = ContactDetailViewModel(contactId: contactId, startChatOption: true, context: dcContext)
|
|
let contactDetailController = ContactDetailViewController(viewModel: viewModel)
|
|
let contactDetailController = ContactDetailViewController(viewModel: viewModel)
|
|
let coordinator = ContactDetailCoordinator(dcContext: dcContext, navigationController: navigationController)
|
|
let coordinator = ContactDetailCoordinator(dcContext: dcContext, navigationController: navigationController)
|
|
childCoordinators.append(coordinator)
|
|
childCoordinators.append(coordinator)
|
|
@@ -412,7 +414,7 @@ class ChatViewCoordinator: NSObject, Coordinator {
|
|
switch chat.chatType {
|
|
switch chat.chatType {
|
|
case .SINGLE:
|
|
case .SINGLE:
|
|
if let contactId = chat.contactIds.first {
|
|
if let contactId = chat.contactIds.first {
|
|
- let viewModel = ContactDetailViewModel(contactId: contactId, context: dcContext)
|
|
|
|
|
|
+ let viewModel = ContactDetailViewModel(contactId: contactId, startChatOption: false, context: dcContext)
|
|
let contactDetailController = ContactDetailViewController(viewModel: viewModel)
|
|
let contactDetailController = ContactDetailViewController(viewModel: viewModel)
|
|
contactDetailController.showStartChat = false
|
|
contactDetailController.showStartChat = false
|
|
let coordinator = ContactDetailCoordinator(dcContext: dcContext, navigationController: navigationController)
|
|
let coordinator = ContactDetailCoordinator(dcContext: dcContext, navigationController: navigationController)
|
|
@@ -430,7 +432,14 @@ class ChatViewCoordinator: NSObject, Coordinator {
|
|
}
|
|
}
|
|
|
|
|
|
func showContactDetail(of contactId: Int, in chatOfType: ChatType) {
|
|
func showContactDetail(of contactId: Int, in chatOfType: ChatType) {
|
|
- let viewModel = ContactDetailViewModel(contactId: contactId, context: dcContext )
|
|
|
|
|
|
+ let startChatOption: Bool
|
|
|
|
+ switch chatOfType {
|
|
|
|
+ case .GROUP, .VERYFIEDGROUP:
|
|
|
|
+ startChatOption = true
|
|
|
|
+ case .SINGLE:
|
|
|
|
+ startChatOption = false
|
|
|
|
+ }
|
|
|
|
+ let viewModel = ContactDetailViewModel(contactId: contactId, startChatOption: startChatOption, context: dcContext )
|
|
let contactDetailController = ContactDetailViewController(viewModel: viewModel)
|
|
let contactDetailController = ContactDetailViewController(viewModel: viewModel)
|
|
if chatOfType == .SINGLE {
|
|
if chatOfType == .SINGLE {
|
|
contactDetailController.showStartChat = false
|
|
contactDetailController.showStartChat = false
|