Эх сурвалжийг харах

in chatview changed input bar placeholder from AA to MESSAGE

Bastian van de Wetering 6 жил өмнө
parent
commit
4ffeba9857

+ 1 - 3
deltachat-ios/Controller/ChatListController.swift

@@ -30,10 +30,9 @@ class ChatListController: UIViewController {
 		super.viewWillAppear(animated)
 
 		if #available(iOS 11.0, *) {
-			// TODO: check if this is really nessesary - dc navigationController has large titles
 			navigationController?.navigationBar.prefersLargeTitles = true
+			navigationItem.largeTitleDisplayMode = .always
 		}
-
 		getChatList()
 	}
 
@@ -52,7 +51,6 @@ class ChatListController: UIViewController {
 																					_ in
 																					self.getChatList()
 		}
-
 		incomingMsgObserver = nc.addObserver(forName: dcNotificationIncoming,
 																				 object: nil, queue: nil) {
 																					_ in

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

@@ -302,7 +302,7 @@ class ChatViewController: MessagesViewController {
 	private func configureMessageInputBar() {
 		messageInputBar.delegate = self
 		messageInputBar.inputTextView.tintColor = DCColors.primary
-
+		messageInputBar.inputTextView.placeholder = "Message"
 		messageInputBar.isTranslucent = true
 		messageInputBar.separatorLine.isHidden = true
 		messageInputBar.inputTextView.tintColor = DCColors.primary

+ 1 - 1
deltachat-ios/Controller/ProfileViewController.swift

@@ -45,7 +45,7 @@ class ProfileViewController: UITableViewController {
   }
 
   override func viewWillAppear(_: Bool) {
-    navigationController?.navigationBar.prefersLargeTitles = false
+   navigationController?.navigationBar.prefersLargeTitles = false
     tableView.reloadData()
   }
 

+ 24 - 7
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -12,7 +12,7 @@ import Photos
 import MobileCoreServices
 
 
-class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
+class AppCoordinator: NSObject, Coordinator {
 	private let window: UIWindow
 
 	var rootViewController: UIViewController {
@@ -37,7 +37,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 		let controller = ContactListController()
 		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "contacts")
-		nav.tabBarItem = UITabBarItem(title: "Contacts", image: settingsImage, tag: 4)
+		nav.tabBarItem = UITabBarItem(title: "Contacts", image: settingsImage, tag: 0)
 		let coordinator = ContactListCoordinator(navigationController: nav)
 		self.childCoordinators.append(coordinator)
 		controller.coordinator = coordinator
@@ -49,7 +49,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 		controller.disableWriting = true
 		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "message")
-		nav.tabBarItem = UITabBarItem(title: "Mailbox", image: settingsImage, tag: 0)
+		nav.tabBarItem = UITabBarItem(title: "Mailbox", image: settingsImage, tag: 1)
 		let coordinator = MailboxCoordinator(navigationController: nav)
 		self.childCoordinators.append(coordinator)
 		controller.coordinator = coordinator
@@ -60,7 +60,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 		let controller = ProfileViewController()
 		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "report_card")
-		nav.tabBarItem = UITabBarItem(title: "My Profile", image: settingsImage, tag: 1)
+		nav.tabBarItem = UITabBarItem(title: "My Profile", image: settingsImage, tag: 2)
 		let coordinator = ProfileCoordinator(rootViewController: nav)
 		self.childCoordinators.append(coordinator)
 		controller.coordinator = coordinator
@@ -71,7 +71,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 		let controller = ChatListController()
 		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "chat")
-		nav.tabBarItem = UITabBarItem(title: "Chats", image: settingsImage, tag: 2)
+		nav.tabBarItem = UITabBarItem(title: "Chats", image: settingsImage, tag: 3)
 		let coordinator = ChatListCoordinator(navigationController: nav)
 		self.childCoordinators.append(coordinator)
 		controller.coordinator = coordinator
@@ -82,7 +82,7 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 		let controller = SettingsViewController()
 		let nav = DCNavigationController(rootViewController: controller)
 		let settingsImage = UIImage(named: "settings")
-		nav.tabBarItem = UITabBarItem(title: "Settings", image: settingsImage, tag: 3)
+		nav.tabBarItem = UITabBarItem(title: "Settings", image: settingsImage, tag: 4)
 		let coordinator = SettingsCoordinator(navigationController: nav)
 		self.childCoordinators.append(coordinator)
 		controller.coordinator = coordinator
@@ -112,9 +112,26 @@ class AppCoordinator: NSObject, Coordinator, UITabBarControllerDelegate {
 	}
 }
 
+extension AppCoordinator: UITabBarControllerDelegate {
+	func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
+		if let dcNav = viewController as? DCNavigationController {
+			switch tabBarController.selectedIndex {
+			case 0,3,4:
+				dcNav.navigationBar.prefersLargeTitles = true
+			case 1,2:
+				dcNav.navigationBar.prefersLargeTitles = false
+			default:
+				// should never get here
+				dcNav.navigationBar.prefersLargeTitles = false
+			}
+		}
+	}
+
+}
+
 extension AppCoordinator: UITabBarDelegate {
 	func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
-		print("item selected")
+
 	}
 
 	func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool {