Merge pull request #175 from deltachat/cleanup-comments

cleanup comments

deltachat-ios/Controller/AccountSetup/PortSettingsController.swift

@@ -70,7 +70,6 @@ class PortSettingsController: UITableViewController {
     // MARK: - Table view data source
 
     override func numberOfSections(in tableView: UITableView) -> Int {
-        // #warning Incomplete implementation, return the number of sections
         return 2
     }
 

deltachat-ios/Controller/AccountSetupController.swift

@@ -228,12 +228,10 @@ class AccountSetupController: UITableViewController {
     // MARK: - Table view data source
 
     override func numberOfSections(in _: UITableView) -> Int {
-        // #warning Incomplete implementation, return the number of sections
         return 3
     }
 
     override func tableView(_: UITableView, numberOfRowsInSection section: Int) -> Int {
-        // #warning Incomplete implementation, return the number of rows
         if section == 0 {
             return basicSectionCells.count
         } else if section == 1 {

deltachat-ios/Controller/ChatViewController.swift

@@ -960,1029 +960,3 @@ extension MessageCollectionViewCell {
         }
     }
 }
-
-/*
- class ChatViewController: MessagesViewController {
- weak var coordinator: ChatViewCoordinator?
-
- let outgoingAvatarOverlap: CGFloat = 17.5
- let loadCount = 30
-
- private var isGroupChat: Bool {
- 	return MRChat(id: chatId).chatType != .SINGLE
- }
-
- let chatId: Int
- let refreshControl = UIRefreshControl()
- var messageList: [MRMessage] = []
-
- var msgChangedObserver: Any?
- var incomingMsgObserver: Any?
-
- lazy var navBarTap: UITapGestureRecognizer = {
- 	UITapGestureRecognizer(target: self, action: #selector(chatProfilePressed))
- }()
-
- var disableWriting = false
-
- var previewView: UIView?
- var previewController: PreviewController?
-
- override var inputAccessoryView: UIView? {
- 	if disableWriting {
- 		return nil
- 	}
- 	return messageInputBar
- }
-
- init(chatId: Int, title: String? = nil) {
- 	self.chatId = chatId
- 	super.init(nibName: nil, bundle: nil)
- 	if let title = title {
- 		updateTitleView(title: title, subtitle: nil)
- 	}
- 	hidesBottomBarWhenPushed = true
- }
-
- required init?(coder _: NSCoder) {
- 	fatalError("init(coder:) has not been implemented")
- }
-
- override func viewDidLoad() {
- 	messagesCollectionView.register(CustomCell.self)
- 	super.viewDidLoad()
- 	view.backgroundColor = DCColors.chatBackgroundColor
- 	if !MRConfig.configured {
- 		// TODO: display message about nothing being configured
- 		return
- 	}
- 	configureMessageCollectionView()
-
- 	if !disableWriting {
- 		configureMessageInputBar()
- 		messageInputBar.inputTextView.text = textDraft
- 		messageInputBar.inputTextView.becomeFirstResponder()
- 	}
-
- 	loadFirstMessages()
- }
-
- override func viewWillAppear(_ animated: Bool) {
- 	super.viewWillAppear(animated)
-
- 	// this will be removed in viewWillDisappear
- 	navigationController?.navigationBar.addGestureRecognizer(navBarTap)
-
- 	let chat = MRChat(id: chatId)
- 	updateTitleView(title: chat.name, subtitle: chat.subtitle)
-
- 	if let image = chat.profileImage {
- 		navigationItem.rightBarButtonItem = UIBarButtonItem(image: image, style: .done, target: self, action: #selector(chatProfilePressed))
- 	} else {
- 		let initialsLabel = InitialsLabel(name: chat.name, color: chat.color, size: 28)
- 		navigationItem.rightBarButtonItem = UIBarButtonItem(customView: initialsLabel)
- 	}
-
- 	configureMessageMenu()
-
- 	if #available(iOS 11.0, *) {
- 		if disableWriting {
- 			navigationController?.navigationBar.prefersLargeTitles = true
- 		}
- 	}
-
- 	let nc = NotificationCenter.default
- 	msgChangedObserver = nc.addObserver(
- 		forName: dcNotificationChanged,
- 		object: nil,
- 		queue: OperationQueue.main
- 	) { notification in
- 		if let ui = notification.userInfo {
- 			if self.disableWriting {
- 				// always refresh, as we can't check currently
- 				self.refreshMessages()
- 			} else if let id = ui["message_id"] as? Int {
- 				if id > 0 {
- 					self.updateMessage(id)
- 				}
- 			}
- 		}
- 	}
-
- 	incomingMsgObserver = nc.addObserver(
- 		forName: dcNotificationIncoming,
- 		object: nil, queue: OperationQueue.main
- 	) { notification in
- 		if let ui = notification.userInfo {
- 			if self.chatId == ui["chat_id"] as! Int {
- 				let id = ui["message_id"] as! Int
- 				if id > 0 {
- 					self.insertMessage(MRMessage(id: id))
- 				}
- 			}
- 		}
- 	}
- }
-
- override func viewWillDisappear(_ animated: Bool) {
- 	super.viewWillDisappear(animated)
-
- 	// the navigationController will be used when chatDetail is pushed, so we have to remove that gestureRecognizer
- 	navigationController?.navigationBar.removeGestureRecognizer(navBarTap)
-
- 	let cnt = Int(dc_get_fresh_msg_cnt(mailboxPointer, UInt32(chatId)))
- 	logger.info("updating count for chat \(cnt)")
- 	UIApplication.shared.applicationIconBadgeNumber = cnt
-
- 	if #available(iOS 11.0, *) {
- 		if disableWriting {
- 			navigationController?.navigationBar.prefersLargeTitles = false
- 		}
- 	}
- }
-
- override func viewDidDisappear(_ animated: Bool) {
- 	super.viewDidDisappear(animated)
-
- 	setTextDraft()
- 	let nc = NotificationCenter.default
- 	if let msgChangedObserver = self.msgChangedObserver {
- 		nc.removeObserver(msgChangedObserver)
- 	}
- 	if let incomingMsgObserver = self.incomingMsgObserver {
- 		nc.removeObserver(incomingMsgObserver)
- 	}
- }
-
- @objc
- private func loadMoreMessages() {
- 	DispatchQueue.global(qos: .userInitiated).asyncAfter(deadline: .now() + 1) {
- 		DispatchQueue.main.async {
- 			self.messageList = self.getMessageIds(self.loadCount, from: self.messageList.count) + self.messageList
- 			self.messagesCollectionView.reloadDataAndKeepOffset()
- 			self.refreshControl.endRefreshing()
- 		}
- 	}
- }
-
- @objc
- private func refreshMessages() {
- 	DispatchQueue.global(qos: .userInitiated).asyncAfter(deadline: .now() + 1) {
- 		DispatchQueue.main.async {
- 			self.messageList = self.getMessageIds(self.messageList.count)
- 			self.messagesCollectionView.reloadDataAndKeepOffset()
- 			self.refreshControl.endRefreshing()
- 			if self.isLastSectionVisible() {
- 				self.messagesCollectionView.scrollToBottom(animated: true)
- 			}
- 		}
- 	}
- }
-
- private func loadFirstMessages() {
- 	DispatchQueue.global(qos: .userInitiated).async {
- 		DispatchQueue.main.async {
- 			self.messageList = self.getMessageIds(self.loadCount)
- 			self.messagesCollectionView.reloadData()
- 			self.refreshControl.endRefreshing()
- 			self.messagesCollectionView.scrollToBottom(animated: false)
- 		}
- 	}
- }
-
- private var textDraft: String? {
- 	// FIXME: need to free pointer
- 	if let draft = dc_get_draft(mailboxPointer, UInt32(chatId)) {
- 		if let text = dc_msg_get_text(draft) {
- 			let s = String(validatingUTF8: text)!
- 			return s
- 		}
- 		return nil
- 	}
- 	return nil
- }
-
- private func getMessageIds(_ count: Int, from: Int? = nil) -> [MRMessage] {
- 	let cMessageIds = dc_get_chat_msgs(mailboxPointer, UInt32(chatId), 0, 0)
-
- 	let ids: [Int]
- 	if let from = from {
- 		ids = Utils.copyAndFreeArrayWithOffset(inputArray: cMessageIds, len: count, skipEnd: from)
- 	} else {
- 		ids = Utils.copyAndFreeArrayWithLen(inputArray: cMessageIds, len: count)
- 	}
-
- 	let markIds: [UInt32] = ids.map { UInt32($0) }
- 	dc_markseen_msgs(mailboxPointer, UnsafePointer(markIds), Int32(ids.count))
-
- 	return ids.map {
- 		MRMessage(id: $0)
- 	}
- }
-
- private func setTextDraft() {
- 	if let text = self.messageInputBar.inputTextView.text {
- 		let draft = dc_msg_new(mailboxPointer, DC_MSG_TEXT)
- 		dc_msg_set_text(draft, text.cString(using: .utf8))
- 		dc_set_draft(mailboxPointer, UInt32(chatId), draft)
-
- 		// cleanup
- 		dc_msg_unref(draft)
- 	}
- }
-
-
-
- private func configureMessageMenu() {
- 	var menuItems: [UIMenuItem]
-
- 	if disableWriting {
- 		menuItems = [
- 			UIMenuItem(title: "Start Chat", action: #selector(MessageCollectionViewCell.messageStartChat(_:))),
- 			UIMenuItem(title: "Dismiss", action: #selector(MessageCollectionViewCell.messageDismiss(_:))),
- 			UIMenuItem(title: "Block", action: #selector(MessageCollectionViewCell.messageBlock(_:))),
- 		]
- 	} else {
- 		// Configures the UIMenu which is shown when selecting a message
- 		menuItems = [
- 			UIMenuItem(title: "Info", action: #selector(MessageCollectionViewCell.messageInfo(_:))),
- 		]
- 	}
-
- 	UIMenuController.shared.menuItems = menuItems
- }
-
- private func configureMessageCollectionView() {
- 	messagesCollectionView.messagesDataSource = self
- 	messagesCollectionView.messageCellDelegate = self
-
- 	scrollsToBottomOnKeyboardBeginsEditing = true // default false
- 	maintainPositionOnKeyboardFrameChanged = true // default false
- 	messagesCollectionView.addSubview(refreshControl)
- 	refreshControl.addTarget(self, action: #selector(loadMoreMessages), for: .valueChanged)
-
- 	let layout = messagesCollectionView.collectionViewLayout as? MessagesCollectionViewFlowLayout
- 	messagesCollectionView.messagesLayoutDelegate = self
- 	messagesCollectionView.messagesDisplayDelegate = self
-
-
- /*
-   	let layout = messagesCollectionView.collectionViewLayout as? MessagesCollectionViewFlowLayout
-   	layout?.sectionInset = UIEdgeInsets(top: 1, left: 8, bottom: 1, right: 8)
-
-   	// Hide the outgoing avatar and adjust the label alignment to line up with the messages
-   	layout?.setMessageOutgoingAvatarSize(.zero)
-   	layout?.setMessageOutgoingMessageTopLabelAlignment(LabelAlignment(textAlignment: .right, textInsets: UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 8)))
-   	layout?.setMessageOutgoingMessageBottomLabelAlignment(LabelAlignment(textAlignment: .right, textInsets: UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 8)))
-
-   	// Set outgoing avatar to overlap with the message bubble
-   	if isGroupChat {
-   		layout?.setMessageIncomingMessageTopLabelAlignment(LabelAlignment(textAlignment: .left, textInsets: UIEdgeInsets(top: 0, left: 18, bottom: outgoingAvatarOverlap, right: 0)))
-   		layout?.setMessageIncomingAvatarSize(CGSize(width: 30, height: 30))
-   		layout?.setMessageIncomingMessagePadding(UIEdgeInsets(top: -outgoingAvatarOverlap, left: -18, bottom: outgoingAvatarOverlap / 2, right: 18))
-   		layout?.setMessageIncomingMessageBottomLabelAlignment(LabelAlignment(textAlignment: .left, textInsets: UIEdgeInsets(top: -7, left: 38, bottom: 0, right: 0)))
-
-   	} else {
-   		layout?.setMessageIncomingMessageTopLabelAlignment(LabelAlignment(textAlignment: .left, textInsets: UIEdgeInsets(top: 0, left: 0, bottom: 5, right: 0)))
-   		layout?.setMessageIncomingAvatarSize(CGSize.zero) // no batch displayed in singleChats
-   		layout?.setMessageIncomingMessagePadding(UIEdgeInsets(top: -outgoingAvatarOverlap, left: 0, bottom: outgoingAvatarOverlap / 2, right: 18))
-   		layout?.setMessageIncomingMessageBottomLabelAlignment(LabelAlignment(textAlignment: .left, textInsets: UIEdgeInsets(top: -7, left: 12, bottom: 0, right: 0)))
-   	}
-
-   	layout?.setMessageIncomingAccessoryViewSize(CGSize(width: 30, height: 30))
-   	layout?.setMessageIncomingAccessoryViewPadding(HorizontalEdgeInsets(left: 8, right: 0))
-   	layout?.setMessageOutgoingAccessoryViewSize(CGSize(width: 30, height: 30))
-   	layout?.setMessageOutgoingAccessoryViewPadding(HorizontalEdgeInsets(left: 0, right: 8))
-
-   	messagesCollectionView.messagesLayoutDelegate = self
-   	messagesCollectionView.messagesDisplayDelegate = self
-  */
- }
-
- private func configureMessageInputBar() {
- 	messageInputBar.delegate = self
- 	messageInputBar.inputTextView.tintColor = DCColors.primary
-
- 	messageInputBar.isTranslucent = true
- 	messageInputBar.separatorLine.isHidden = true
- 	messageInputBar.inputTextView.tintColor = DCColors.primary
-
- 	scrollsToBottomOnKeyboardBeginsEditing = true
-
- 	messageInputBar.inputTextView.backgroundColor = UIColor(red: 245 / 255, green: 245 / 255, blue: 245 / 255, alpha: 1)
- 	messageInputBar.inputTextView.placeholderTextColor = UIColor(red: 0.6, green: 0.6, blue: 0.6, alpha: 1)
- 	messageInputBar.inputTextView.textContainerInset = UIEdgeInsets(top: 8, left: 16, bottom: 8, right: 38)
- 	messageInputBar.inputTextView.placeholderLabelInsets = UIEdgeInsets(top: 8, left: 20, bottom: 8, right: 38)
- 	messageInputBar.inputTextView.layer.borderColor = UIColor(red: 200 / 255, green: 200 / 255, blue: 200 / 255, alpha: 1).cgColor
- 	messageInputBar.inputTextView.layer.borderWidth = 1.0
- 	messageInputBar.inputTextView.layer.cornerRadius = 16.0
- 	messageInputBar.inputTextView.layer.masksToBounds = true
- 	messageInputBar.inputTextView.scrollIndicatorInsets = UIEdgeInsets(top: 8, left: 0, bottom: 8, right: 0)
- 	configureInputBarItems()
- }
-
- private func configureInputBarItems() {
-
- 	messageInputBar.setLeftStackViewWidthConstant(to: 30, animated: false)
- 	messageInputBar.setRightStackViewWidthConstant(to: 30, animated: false)
-
-
- 	let sendButtonImage = UIImage(named: "paper_plane")?.withRenderingMode(.alwaysTemplate)
- 	messageInputBar.sendButton.image = sendButtonImage
- 	messageInputBar.sendButton.title = nil
- 	messageInputBar.sendButton.tintColor = UIColor(white: 1, alpha: 1)
- 	messageInputBar.sendButton.layer.cornerRadius = 15
- 	messageInputBar.middleContentViewPadding = UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 10)	// this adds a padding between textinputfield and send button
- 	messageInputBar.sendButton.contentEdgeInsets = UIEdgeInsets(top: 5, left: 5, bottom: 5, right: 5)
- 	messageInputBar.sendButton.setSize(CGSize(width: 30, height: 30), animated: false)
-
- 	let leftItems = [
- 		InputBarButtonItem()
- 			.configure {
- 				$0.spacing = .fixed(0)
- 				let clipperIcon = #imageLiteral(resourceName: "ic_attach_file_36pt").withRenderingMode(.alwaysTemplate)
- 				$0.image = clipperIcon
- 				$0.tintColor = UIColor(white: 0.8, alpha: 1)
- 				$0.setSize(CGSize(width: 30, height: 30), animated: false)
- 			}.onSelected {
- 				$0.tintColor = DCColors.primary
- 			}.onDeselected {
- 				$0.tintColor = UIColor(white: 0.8, alpha: 1)
- 			}.onTouchUpInside { _ in
- 				self.clipperButtonPressed()
- 		}
- /*
-   		InputBarButtonItem()
-   		.configure {
-   		$0.spacing = .fixed(0)
-   		$0.image = UIImage(named: "camera")?.withRenderingMode(.alwaysTemplate)
-   		$0.setSize(CGSize(width: 36, height: 36), animated: false)
-   		$0.tintColor = UIColor(white: 0.8, alpha: 1)
-   		}.onSelected {
-   		$0.tintColor = DCColors.primary
-   		}.onDeselected {
-   		$0.tintColor = UIColor(white: 0.8, alpha: 1)
-   		}.onTouchUpInside { _ in
-   		self.didPressPhotoButton()
-   		},
-  */
- 	]
-
- 	messageInputBar.setStackViewItems(leftItems, forStack: .left, animated: false)
-
- 	// This just adds some more flare
- 	messageInputBar.sendButton
- 		.onEnabled { item in
- 			UIView.animate(withDuration: 0.3, animations: {
- 				item.backgroundColor = DCColors.primary
- 			})
- 		}.onDisabled { item in
- 			UIView.animate(withDuration: 0.3, animations: {
- 				item.backgroundColor = UIColor(white: 0.9, alpha: 1)
- 			})
- 	}
- }
-
-
- @objc private func chatProfilePressed() {
- 	coordinator?.showChatDetail(chatId: chatId)
- }
-
- // MARK: - UICollectionViewDataSource
- public override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
- 	guard let messagesCollectionView = collectionView as? MessagesCollectionView else {
- 		fatalError("notMessagesCollectionView")
- 	}
-
- 	guard let messagesDataSource = messagesCollectionView.messagesDataSource else {
- 		fatalError("nilMessagesDataSource")
- 	}
-
- 	let message = messagesDataSource.messageForItem(at: indexPath, in: messagesCollectionView)
- 	switch message.kind {
- 	case .text, .attributedText, .emoji:
- 		let cell = messagesCollectionView.dequeueReusableCell(TextMessageCell.self, for: indexPath)
- 		cell.configure(with: message, at: indexPath, and: messagesCollectionView)
- 		return cell
- 	case .photo, .video:
- 		let cell = messagesCollectionView.dequeueReusableCell(MediaMessageCell.self, for: indexPath)
- 		cell.configure(with: message, at: indexPath, and: messagesCollectionView)
- 		return cell
- 	case .location:
- 		let cell = messagesCollectionView.dequeueReusableCell(LocationMessageCell.self, for: indexPath)
- 		cell.configure(with: message, at: indexPath, and: messagesCollectionView)
- 		return cell
- 	case .contact:
- 		let cell = messagesCollectionView.dequeueReusableCell(ContactMessageCell.self, for: indexPath)
- 		cell.configure(with: message, at: indexPath, and: messagesCollectionView)
- 		return cell
- 	case .custom:
- 		let cell = messagesCollectionView.dequeueReusableCell(CustomCell.self, for: indexPath)
- 		cell.configure(with: message, at: indexPath, and: messagesCollectionView)
- 		return cell
- 	case .audio(_):
- 		let cell = messagesCollectionView.dequeueReusableCell(AudioMessageCell.self, for: indexPath)
- 		cell.configure(with: message, at: indexPath, and: messagesCollectionView)
- 		return cell
- 	}
- }
-
- override func collectionView(_ collectionView: UICollectionView, canPerformAction action: Selector, forItemAt indexPath: IndexPath, withSender sender: Any?) -> Bool {
- 	if action == NSSelectorFromString("messageInfo:") ||
- 		action == NSSelectorFromString("messageBlock:") ||
- 		action == NSSelectorFromString("messageDismiss:") ||
- 		action == NSSelectorFromString("messageStartChat:") {
- 		return true
- 	} else {
- 		return super.collectionView(collectionView, canPerformAction: action, forItemAt: indexPath, withSender: sender)
- 	}
- }
-
- override func collectionView(_ collectionView: UICollectionView, performAction action: Selector, forItemAt indexPath: IndexPath, withSender sender: Any?) {
- 	switch action {
- 	case NSSelectorFromString("messageInfo:"):
- 		let msg = messageList[indexPath.section]
- 		logger.info("message: View info \(msg.messageId)")
-
- 		let msgViewController = MessageInfoViewController(message: msg)
- 		if let ctrl = navigationController {
- 			ctrl.pushViewController(msgViewController, animated: true)
- 		}
- 	case NSSelectorFromString("messageStartChat:"):
- 		let msg = messageList[indexPath.section]
- 		logger.info("message: Start Chat \(msg.messageId)")
- 		_ = msg.createChat()
- 		// TODO: figure out how to properly show the chat after creation
- 		refreshMessages()
- 	case NSSelectorFromString("messageBlock:"):
- 		let msg = messageList[indexPath.section]
- 		logger.info("message: Block \(msg.messageId)")
- 		msg.fromContact.block()
-
- 		refreshMessages()
- 	case NSSelectorFromString("messageDismiss:"):
- 		let msg = messageList[indexPath.section]
- 		logger.info("message: Dismiss \(msg.messageId)")
- 		msg.fromContact.marknoticed()
-
- 		refreshMessages()
- 	default:
- 		super.collectionView(collectionView, performAction: action, forItemAt: indexPath, withSender: sender)
- 	}
- }
- }
-
- // MARK: - MessagesDataSource
- extension ChatViewController: MessagesDataSource {
-
- func numberOfSections(in _: MessagesCollectionView) -> Int {
- 	return messageList.count
- }
-
- func currentSender() -> SenderType {
- 	let currentSender = Sender(id: "1", displayName: "Alice")
- 	return currentSender
- }
-
- func messageForItem(at indexPath: IndexPath, in _: MessagesCollectionView) -> MessageType {
- 	return messageList[indexPath.section]
- }
-
- func avatar(for message: MessageType, at indexPath: IndexPath, in _: MessagesCollectionView) -> Avatar {
- 	let message = messageList[indexPath.section]
- 	let contact = message.fromContact
- 	return Avatar(image: contact.profileImage, initials: Utils.getInitials(inputName: contact.name))
- }
-
- func cellTopLabelAttributedText(for message: MessageType, at indexPath: IndexPath) -> NSAttributedString? {
- 	if isInfoMessage(at: indexPath) {
- 		return nil
- 	}
-
- 	if isTimeLabelVisible(at: indexPath) {
- 		return NSAttributedString(
- 			string: MessageKitDateFormatter.shared.string(from: message.sentDate),
- 			attributes: [
- 				NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 10),
- 				NSAttributedString.Key.foregroundColor: UIColor.darkGray,
- 			]
- 		)
- 	}
-
- 	return nil
- }
-
- func messageTopLabelAttributedText(for message: MessageType, at indexPath: IndexPath) -> NSAttributedString? {
-
- 	if !isGroupChat {
- 		return nil
- 	}
-
- 	if !isPreviousMessageSameSender(at: indexPath) {
- 		let name = message.sender.displayName
- 		let m = messageList[indexPath.section]
- 		return NSAttributedString(string: name, attributes: [
- 			.font: UIFont.systemFont(ofSize: 14),
- 			.foregroundColor: m.fromContact.color,
- 			])
- 	}
- 	return nil
- }
-
- func isTimeLabelVisible(at indexPath: IndexPath) -> Bool {
- 	guard indexPath.section + 1 < messageList.count else { return false }
-
- 	let messageA = messageList[indexPath.section]
- 	let messageB = messageList[indexPath.section + 1]
-
- 	if messageA.fromContactId == messageB.fromContactId {
- 		return false
- 	}
-
- 	let calendar = NSCalendar(calendarIdentifier: NSCalendar.Identifier.gregorian)
- 	let dateA = messageA.sentDate
- 	let dateB = messageB.sentDate
-
- 	let dayA = (calendar?.component(.day, from: dateA))
- 	let dayB = (calendar?.component(.day, from: dateB))
-
- 	return dayA != dayB
- }
-
- func isPreviousMessageSameSender(at indexPath: IndexPath) -> Bool {
- 	guard indexPath.section - 1 >= 0 else { return false }
- 	let messageA = messageList[indexPath.section - 1]
- 	let messageB = messageList[indexPath.section]
-
- 	if messageA.isInfo {
- 		return false
- 	}
-
- 	return messageA.fromContactId == messageB.fromContactId
- }
-
- func isInfoMessage(at indexPath: IndexPath) -> Bool {
- 	return messageList[indexPath.section].isInfo
- }
-
- func isNextMessageSameSender(at indexPath: IndexPath) -> Bool {
- 	guard indexPath.section + 1 < messageList.count else { return false }
- 	let messageA = messageList[indexPath.section]
- 	let messageB = messageList[indexPath.section + 1]
-
- 	if messageA.isInfo {
- 		return false
- 	}
-
- 	return messageA.fromContactId == messageB.fromContactId
- }
-
- func messageBottomLabelAttributedText(for message: MessageType, at indexPath: IndexPath) -> NSAttributedString? {
- 	guard indexPath.section < messageList.count else { return nil }
- 	let m = messageList[indexPath.section]
-
- 	if m.isInfo || isNextMessageSameSender(at: indexPath) {
- 		return nil
- 	}
-
- 	let timestampAttributes: [NSAttributedString.Key: Any] = [
- 		.font: UIFont.systemFont(ofSize: 12),
- 		.foregroundColor: UIColor.lightGray,
- 	]
-
- 	if isFromCurrentSender(message: message) {
- 		let text = NSMutableAttributedString()
- 		text.append(NSAttributedString(string: m.formattedSentDate(), attributes: timestampAttributes))
-
- 		text.append(NSAttributedString(
- 			string: " - " + m.stateDescription(),
- 			attributes: [
- 				.font: UIFont.systemFont(ofSize: 12),
- 				.foregroundColor: UIColor.darkText,
- 			]
- 		))
-
- 		return text
- 	}
-
- 	return NSAttributedString(string: m.formattedSentDate(), attributes: timestampAttributes)
- }
-
- func updateMessage(_ messageId: Int) {
- 	if let index = messageList.firstIndex(where: { $0.id == messageId }) {
- 		dc_markseen_msgs(mailboxPointer, UnsafePointer([UInt32(messageId)]), 1)
-
- 		messageList[index] = MRMessage(id: messageId)
- 		// Reload section to update header/footer labels
- 		messagesCollectionView.performBatchUpdates({
- 			messagesCollectionView.reloadSections([index])
- 			if index > 0 {
- 				messagesCollectionView.reloadSections([index - 1])
- 			}
- 			if index < messageList.count - 1 {
- 				messagesCollectionView.reloadSections([index + 1])
- 			}
- 		}, completion: { [weak self] _ in
- 			if self?.isLastSectionVisible() == true {
- 				self?.messagesCollectionView.scrollToBottom(animated: true)
- 			}
- 		})
- 	} else {
- 		let msg = MRMessage(id: messageId)
- 		if msg.chatId == chatId {
- 			insertMessage(msg)
- 		}
- 	}
- }
-
- func insertMessage(_ message: MRMessage) {
- 	dc_markseen_msgs(mailboxPointer, UnsafePointer([UInt32(message.id)]), 1)
- 	messageList.append(message)
- 	// Reload last section to update header/footer labels and insert a new one
- 	messagesCollectionView.performBatchUpdates({
- 		messagesCollectionView.insertSections([messageList.count - 1])
- 		if messageList.count >= 2 {
- 			messagesCollectionView.reloadSections([messageList.count - 2])
- 		}
- 	}, completion: { [weak self] _ in
- 		if self?.isLastSectionVisible() == true {
- 			self?.messagesCollectionView.scrollToBottom(animated: true)
- 		}
- 	})
- }
-
- func isLastSectionVisible() -> Bool {
- 	guard !messageList.isEmpty else { return false }
-
- 	let lastIndexPath = IndexPath(item: 0, section: messageList.count - 1)
- 	return messagesCollectionView.indexPathsForVisibleItems.contains(lastIndexPath)
- }
- }
-
- // MARK: - MessagesDisplayDelegate
-
- extension ChatViewController: MessagesDisplayDelegate {
-
- func configureAvatarView(_ avatarView: AvatarView, for message: MessageType, at indexPath: IndexPath, in _: MessagesCollectionView) {
- 	let message = messageList[indexPath.section]
- 	let contact = message.fromContact
- 	let avatar = Avatar(image: contact.profileImage, initials: Utils.getInitials(inputName: contact.name))
- 	avatarView.set(avatar: avatar)
- 	avatarView.isHidden = isNextMessageSameSender(at: indexPath) || message.isInfo
- 	avatarView.backgroundColor = contact.color
- }
-
-
- func messageStyle(for message: MessageType, at indexPath: IndexPath, in _: MessagesCollectionView) -> MessageStyle {
- 	if isInfoMessage(at: indexPath) {
- 		return .custom { view in
- 			view.style = .none
- 			view.backgroundColor = UIColor(alpha: 10, red: 0, green: 0, blue: 0)
- 			let radius: CGFloat = 16
- 			let path = UIBezierPath(roundedRect: view.bounds, byRoundingCorners: UIRectCorner.allCorners, cornerRadii: CGSize(width: radius, height: radius))
- 			let mask = CAShapeLayer()
- 			mask.path = path.cgPath
- 			view.layer.mask = mask
- 			view.center.x = self.view.center.x
- 		}
- 	}
-
- 	var corners: UIRectCorner = []
-
- 	if isFromCurrentSender(message: message) {
- 		corners.formUnion(.topLeft)
- 		corners.formUnion(.bottomLeft)
- 		if !isPreviousMessageSameSender(at: indexPath) {
- 			corners.formUnion(.topRight)
- 		}
- 		if !isNextMessageSameSender(at: indexPath) {
- 			corners.formUnion(.bottomRight)
- 		}
- 	} else {
- 		corners.formUnion(.topRight)
- 		corners.formUnion(.bottomRight)
- 		if !isPreviousMessageSameSender(at: indexPath) {
- 			corners.formUnion(.topLeft)
- 		}
- 		if !isNextMessageSameSender(at: indexPath) {
- 			corners.formUnion(.bottomLeft)
- 		}
- 	}
-
- 	return .custom { view in
- 		let radius: CGFloat = 16
- 		let path = UIBezierPath(roundedRect: view.bounds, byRoundingCorners: corners, cornerRadii: CGSize(width: radius, height: radius))
- 		let mask = CAShapeLayer()
- 		mask.path = path.cgPath
- 		view.layer.mask = mask
- 	}
- }
- }
-
-
- /*
-   extension ChatViewController: MessagesDisplayDelegate {
-   // MARK: - Text Messages
-   func textColor(for _: MessageType, at _: IndexPath, in _: MessagesCollectionView) -> UIColor {
-   	return .darkText
-   }
-
-   // MARK: - All Messages
-   func backgroundColor(for message: MessageType, at _: IndexPath, in _: MessagesCollectionView) -> UIColor {
-   	return isFromCurrentSender(message: message) ? DCColors.messagePrimaryColor : DCColors.messageSecondaryColor
-   }
-
-
-
-   func enabledDetectors(for _: MessageType, at _: IndexPath, in _: MessagesCollectionView) -> [DetectorType] {
-   	return [.url, .date, .phoneNumber, .address]
-   }
-   }
-  */
-
- // MARK: - MessagesLayoutDelegate
-
- extension ChatViewController: MessagesLayoutDelegate {
- func cellTopLabelHeight(for _: MessageType, at indexPath: IndexPath, in _: MessagesCollectionView) -> CGFloat {
- 	if isTimeLabelVisible(at: indexPath) {
- 		return 18
- 	}
- 	if !isPreviousMessageSameSender(at: indexPath) {
- 		return 18
- 	}
- 	return 0
- }
- }
-
- /*
-   extension ChatViewController: MessagesLayoutDelegate {
-   func cellTopLabelHeight(for _: MessageType, at indexPath: IndexPath, in _: MessagesCollectionView) -> CGFloat {
-   	if isTimeLabelVisible(at: indexPath) {
-   		return 18
-   	}
-   	return !isPreviousMessageSameSender(at: indexPath) ? 18 : 0
-   }
-
-   func messageTopLabelHeight(for message: MessageType, at indexPath: IndexPath, in _: MessagesCollectionView) -> CGFloat {
-   	if isInfoMessage(at: indexPath) {
-   		return 0
-   	}
-
-   	if isFromCurrentSender(message: message) {
-   		if !isGroupChat {
-   			return !isPreviousMessageSameSender(at: indexPath) ? 20 : 0
-   		} else {
-   			return !isPreviousMessageSameSender(at: indexPath) ? 20 : 0
-   		}
-   	} else {
-   		if !isGroupChat {
-   			return !isPreviousMessageSameSender(at: indexPath) ? 20 : 0
-   		} else {
-   			return !isPreviousMessageSameSender(at: indexPath) ? (20 + outgoingAvatarOverlap) : 0
-   		}
-   	}
-   }
-
-   func messageBottomLabelHeight(for message: MessageType, at indexPath: IndexPath, in _: MessagesCollectionView) -> CGFloat {
-   	if isInfoMessage(at: indexPath) {
-   		return 0
-   	}
-
-   	if !isNextMessageSameSender(at: indexPath) {
-   		return 16
-   	}
-
-   	if isFromCurrentSender(message: message) {
-   		return 0
-   	}
-   	return 0
-   }
-
-   func heightForLocation(message _: MessageType, at _: IndexPath, with _: CGFloat, in _: MessagesCollectionView) -> CGFloat {
-   	return 40
-   }
-
-   func footerViewSize(for _: MessageType, at _: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize {
-   	return CGSize(width: messagesCollectionView.bounds.width, height: 10)
-   }
-  */
-
- extension ChatViewController {
-
- @objc private func clipperButtonPressed() {
- 	showClipperOptions()
- }
-
- private func photoButtonPressed() {
- 	if UIImagePickerController.isSourceTypeAvailable(.camera) {
- 		let cameraViewController = CameraViewController { [weak self] image, _ in
- 			self?.dismiss(animated: true, completion: nil)
-
- 			DispatchQueue.global().async {
- 				if let pickedImage = image {
- 					let width = Int32(exactly: pickedImage.size.width)!
- 					let height = Int32(exactly: pickedImage.size.height)!
- 					let path = Utils.saveImage(image: pickedImage)
- 					let msg = dc_msg_new(mailboxPointer, DC_MSG_IMAGE)
- 					dc_msg_set_file(msg, path, "image/jpeg")
- 					dc_msg_set_dimension(msg, width, height)
- 					dc_send_msg(mailboxPointer, UInt32(self!.chatId), msg)
- 					// cleanup
- 					dc_msg_unref(msg)
- 				}
- 			}
- 		}
-
- 		present(cameraViewController, animated: true, completion: nil)
- 	} else {
- 		let alert = UIAlertController(title: "Camera is not available", message: nil, preferredStyle: .alert)
- 		alert.addAction(UIAlertAction(title: "OK", style: .cancel, handler: { _ in
- 			self.dismiss(animated: true, completion: nil)
- 		}))
- 		present(alert, animated: true, completion: nil)
- 	}
- }
-
- private func showClipperOptions() {
- 	let alert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
-
- 	let photoAction = PhotoPickerAlertAction(title: "Photo", style: .default, handler: photoActionPressed(_:))
- 	alert.addAction(photoAction)
- 	alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
- 	self.present(alert, animated: true, completion: nil)
- }
-
- private func photoActionPressed(_ action: UIAlertAction) {
- 	photoButtonPressed()
- }
- }
-
-
- // MARK: - MessageCellDelegate
- extension ChatViewController: MessageCellDelegate {
- func didTapMessage(in cell: MessageCollectionViewCell) {
- 	if let indexPath = messagesCollectionView.indexPath(for: cell) {
- 		let message = messageList[indexPath.section]
-
- 		if let url = message.fileURL {
- 			previewController = PreviewController(urls: [url])
- 			present(previewController!.qlController, animated: true)
- 		}
- 	}
- }
-
- func didTapAvatar(in cell: MessageCollectionViewCell) {
- 	logger.info("Avatar tapped")
- 	if let indexPath = super.messagesCollectionView.indexPath(for: cell) {
- 		let contactId = messageList[indexPath.row].fromContact.id
- 		coordinator?.showContactDetail(of: contactId)
- 	}
- }
-
- @objc(didTapCellTopLabelIn:) func didTapCellTopLabel(in _: MessageCollectionViewCell) {
- 	logger.info("Top label tapped")
- }
-
- func didTapBottomLabel(in _: MessageCollectionViewCell) {
- 	print("Bottom label tapped")
- }
- }
-
- class PreviewController: QLPreviewControllerDataSource {
- var urls: [URL]
- var qlController: QLPreviewController
-
- init(urls: [URL]) {
- 	self.urls = urls
- 	qlController = QLPreviewController()
- 	qlController.dataSource = self
- }
-
- func numberOfPreviewItems(in _: QLPreviewController) -> Int {
- 	return urls.count
- }
-
- func previewController(_: QLPreviewController, previewItemAt index: Int) -> QLPreviewItem {
- 	return urls[index] as QLPreviewItem
- }
- }
-
- // MARK: - MessageLabelDelegate
- extension ChatViewController: MessageLabelDelegate {
- func didSelectAddress(_ addressComponents: [String: String]) {
- 	let mapAddress = Utils.formatAddressForQuery(address: addressComponents)
- 	if let escapedMapAddress = mapAddress.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) {
- 		// Use query, to handle malformed addresses
- 		if let url = URL(string: "http://maps.apple.com/?q=\(escapedMapAddress)") {
- 			UIApplication.shared.open(url as URL)
- 		}
- 	}
- }
-
- func didSelectDate(_ date: Date) {
- 	let interval = date.timeIntervalSinceReferenceDate
- 	if let url = NSURL(string: "calshow:\(interval)") {
- 		UIApplication.shared.open(url as URL)
- 	}
- }
-
- func didSelectPhoneNumber(_ phoneNumber: String) {
- 	logger.info("phone open", phoneNumber)
- 	if let escapedPhoneNumber = phoneNumber.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) {
- 		if let url = NSURL(string: "tel:\(escapedPhoneNumber)") {
- 			UIApplication.shared.open(url as URL)
- 		}
- 	}
- }
-
- func didSelectURL(_ url: URL) {
- 	UIApplication.shared.open(url)
- }
- }
-
- // MARK: - LocationMessageDisplayDelegate
- /*
-   extension ChatViewController: LocationMessageDisplayDelegate {
-   func annotationViewForLocation(message: MessageType, at indexPath: IndexPath, in messageCollectionView: MessagesCollectionView) -> MKAnnotationView? {
-   let annotationView = MKAnnotationView(annotation: nil, reuseIdentifier: nil)
-   let pinImage = #imageLiteral(resourceName: "ic_block_36pt").withRenderingMode(.alwaysTemplate)
-   annotationView.image = pinImage
-   annotationView.centerOffset = CGPoint(x: 0, y: -pinImage.size.height / 2)
-   return annotationView
-   }
-   func animationBlockForLocation(message: MessageType, at indexPath: IndexPath, in messagesCollectionView: MessagesCollectionView) -> ((UIImageView) -> Void)? {
-   return { view in
-   view.layer.transform = CATransform3DMakeScale(0, 0, 0)
-   view.alpha = 0.0
-   UIView.animate(withDuration: 0.6, delay: 0, usingSpringWithDamping: 0.9, initialSpringVelocity: 0, options: [], animations: {
-   view.layer.transform = CATransform3DIdentity
-   view.alpha = 1.0
-   }, completion: nil)
-   }
-   }
-   }
-  */
-
- // MARK: - MessageInputBarDelegate
- extension ChatViewController: InputBarAccessoryViewDelegate {
- func inputBar(_ inputBar: InputBarAccessoryView, didPressSendButtonWith text: String) {
- 	DispatchQueue.global().async {
- 		dc_send_text_msg(mailboxPointer, UInt32(self.chatId), text)
- 	}
- 	inputBar.inputTextView.text = String()
- }
- }
-
- /*
-   extension ChatViewController: MessageInputBarDelegate {
-   }
-  */
-
- // MARK: - MessageCollectionViewCell
- extension MessageCollectionViewCell {
- @objc func messageInfo(_ sender: Any?) {
- 	// Get the collectionView
- 	if let collectionView = self.superview as? UICollectionView {
- 		// Get indexPath
- 		if let indexPath = collectionView.indexPath(for: self) {
- 			// Trigger action
- 			collectionView.delegate?.collectionView?(collectionView, performAction: #selector(MessageCollectionViewCell.messageInfo(_:)), forItemAt: indexPath, withSender: sender)
- 		}
- 	}
- }
-
- @objc func messageBlock(_ sender: Any?) {
- 	// Get the collectionView
- 	if let collectionView = self.superview as? UICollectionView {
- 		// Get indexPath
- 		if let indexPath = collectionView.indexPath(for: self) {
- 			// Trigger action
- 			collectionView.delegate?.collectionView?(collectionView, performAction: #selector(MessageCollectionViewCell.messageBlock(_:)), forItemAt: indexPath, withSender: sender)
- 		}
- 	}
- }
-
- @objc func messageDismiss(_ sender: Any?) {
- 	// Get the collectionView
- 	if let collectionView = self.superview as? UICollectionView {
- 		// Get indexPath
- 		if let indexPath = collectionView.indexPath(for: self) {
- 			// Trigger action
- 			collectionView.delegate?.collectionView?(collectionView, performAction: #selector(MessageCollectionViewCell.messageDismiss(_:)), forItemAt: indexPath, withSender: sender)
- 		}
- 	}
- }
-
- @objc func messageStartChat(_ sender: Any?) {
- 	// Get the collectionView
- 	if let collectionView = self.superview as? UICollectionView {
- 		// Get indexPath
- 		if let indexPath = collectionView.indexPath(for: self) {
- 			// Trigger action
- 			collectionView.delegate?.collectionView?(collectionView, performAction: #selector(MessageCollectionViewCell.messageStartChat(_:)), forItemAt: indexPath, withSender: sender)
- 		}
- 	}
- }
- }
-
- */

deltachat-ios/Controller/EditSettingsController.swift

@@ -27,11 +27,6 @@ class EditSettingsController: UITableViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        // Uncomment the following line to preserve selection between presentations
-        // self.clearsSelectionOnViewWillAppear = false
-
-        // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
-        // self.navigationItem.rightBarButtonItem = self.editButtonItem
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -50,12 +45,10 @@ class EditSettingsController: UITableViewController {
     // MARK: - Table view data source
 
     override func numberOfSections(in tableView: UITableView) -> Int {
-        // #warning Incomplete implementation, return the number of sections
         return 2
     }
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        // #warning Incomplete implementation, return the number of rows
         return 1
     }
 

deltachat-ios/DC/events.swift

@@ -14,20 +14,20 @@ let dcNotificationViewChat = Notification.Name(rawValue: "MrEventViewChat")
 
 public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLong, data1String: UnsafePointer<Int8>, data2String: UnsafePointer<Int8>) -> UnsafePointer<Int8>? {
     switch event {
+
     case DC_EVENT_INFO:
         let s = String(cString: data2String)
         logger.info("event: \(s)")
+
     case DC_EVENT_WARNING:
         let s = String(cString: data2String)
         logger.warning("event: \(s)")
+
     case DC_EVENT_ERROR:
         let s = String(cString: data2String)
         AppDelegate.lastErrorDuringConfig = s
         logger.error("event: \(s)")
-    // TODO:
-    // check online state, return
-    // - 0 when online
-    // - 1 when offline
+
     case DC_EVENT_CONFIGURE_PROGRESS:
         logger.info("configure progress: \(Int(data1)) \(Int(data2))")
         let nc = NotificationCenter.default
@@ -51,6 +51,7 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                 AppDelegate.lastErrorDuringConfig = nil
             }
         }
+
     case DC_EVENT_ERROR_NETWORK:
         let msg = String(cString: data2String)
         if data1 == 1 {
@@ -68,6 +69,7 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                         userInfo: ["state": "offline"])
             }
         }
+
     case DC_EVENT_IMAP_CONNECTED, DC_EVENT_SMTP_CONNECTED:
         logger.warning("network: \(String(cString: data2String))")
 
@@ -77,6 +79,7 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                     object: nil,
                     userInfo: ["state": "online"])
         }
+
     case DC_EVENT_MSGS_CHANGED, DC_EVENT_MSG_READ, DC_EVENT_MSG_DELIVERED:
         logger.info("change: \(event)")
 
@@ -93,6 +96,7 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                 ]
             )
         }
+
     case DC_EVENT_INCOMING_MSG:
         let nc = NotificationCenter.default
         let userInfo = [
@@ -119,10 +123,13 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
             UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
             logger.info("notifications: added \(content)")
         }
+
     case DC_EVENT_SMTP_MESSAGE_SENT:
         logger.info("network: \(String(cString: data2String))")
+
     case DC_EVENT_MSG_DELIVERED:
         logger.info("message delivered: \(data1)-\(data2)")
+
     case DC_EVENT_IMEX_PROGRESS:
         let nc = NotificationCenter.default
         DispatchQueue.main.async {
@@ -137,6 +144,7 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                 ]
             )
         }
+
     case DC_EVENT_IMEX_FILE_WRITTEN:
         logger.info("backup file written: \(String(cString: data1String))")
 
@@ -155,6 +163,7 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                 ]
             )
         }
+
     case DC_EVENT_SECUREJOIN_JOINER_PROGRESS:
         logger.info("securejoin joiner progress \(data1)")
         let nc = NotificationCenter.default
@@ -170,9 +179,10 @@ public func callbackSwift(event: CInt, data1: CUnsignedLong, data2: CUnsignedLon
                 ]
             )
         }
+
     case DC_EVENT_GET_STRING:
-        // nothing to do for now
         break
+
     default:
         logger.warning("unknown event: \(event)")
     }