Преглед изворни кода

bugfix - no header was displayed in chatdetail

Bastian van de Wetering пре 6 година
родитељ
комит
c38e5f23c7

+ 1 - 5
deltachat-ios/Controller/ChatViewController.swift

@@ -387,11 +387,7 @@ class ChatViewController: MessagesViewController {
 		}
 	}
 
-	/*
-	let rightItems = [
-	let sendButtonImage = UIImage(named: "paper_plane")?.withRenderingMode(.alwaysTemplate)
-	]
-	*/
+
 	@objc private func chatProfilePressed() {
 		coordinator?.showChatDetail(chatId: chatId)
 	}

+ 1 - 0
deltachat-ios/Controller/ContactDetailViewController.swift

@@ -129,6 +129,7 @@ class ContactDetailViewController: UITableViewController {
 				header.setBackupImage(name: contact.name, color: contact.color)
 			}
 			header.setVerified(isVerified: contact.isVerified)
+			return header
 		}
 		return nil
 	}

+ 2 - 1
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -102,7 +102,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 
 	func presentLoginController() {
 		let accountSetupController = AccountSetupController()
-		let accountSetupNavigationController = UINavigationController(rootViewController: accountSetupController)
+		let accountSetupNavigationController = NavigationController(rootViewController: accountSetupController)
 		rootViewController.present(accountSetupNavigationController, animated: false, completion: nil)
 	}
 }
@@ -376,6 +376,7 @@ class ChatViewCoordinator: Coordinator {
 		let contactDetailController = ContactDetailViewController(contactId: contactId)
 		//let nav = UINavigationController(rootViewController: contactDetailController)
 		let coordinator = ContactDetailCoordinator(navigationController: navigationController)
+		childCoordinators.append(coordinator)
 		contactDetailController.coordinator = coordinator
 		navigationController.pushViewController(contactDetailController, animated: true)
 		// navigationController.present(nav, animated: true, completion: nil)