浏览代码

in ChatViewController the speech bubbles and sections are little more compact

Bastian van de Wetering 6 年之前
父节点
当前提交
960a8a1c53
共有 2 个文件被更改,包括 19 次插入7 次删除
  1. 18 6
      deltachat-ios/Controller/ChatViewController.swift
  2. 1 1
      deltachat-ios/Info.plist

+ 18 - 6
deltachat-ios/Controller/ChatViewController.swift

@@ -521,6 +521,11 @@ extension ChatViewController: MessagesDataSource {
 	}
 
 	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]
@@ -739,7 +744,7 @@ extension ChatViewController: MessagesLayoutDelegate {
 		if isTimeLabelVisible(at: indexPath) {
 			return 18
 		}
-		return 0
+		return !isPreviousMessageSameSender(at: indexPath) ? 18 : 0
 	}
 
 	func messageTopLabelHeight(for message: MessageType, at indexPath: IndexPath, in _: MessagesCollectionView) -> CGFloat {
@@ -748,9 +753,17 @@ extension ChatViewController: MessagesLayoutDelegate {
 		}
 
 		if isFromCurrentSender(message: message) {
-			return !isPreviousMessageSameSender(at: indexPath) ? 40 : 0
+			if !isGroupChat {
+				return !isPreviousMessageSameSender(at: indexPath) ? 20 : 0
+			} else {
+				return !isPreviousMessageSameSender(at: indexPath) ? 20 : 0
+			}
 		} else {
-			return !isPreviousMessageSameSender(at: indexPath) ? (40 + outgoingAvatarOverlap) : 0
+			if !isGroupChat {
+				return !isPreviousMessageSameSender(at: indexPath) ? 20 : 0
+			} else {
+				return !isPreviousMessageSameSender(at: indexPath) ? (20 + outgoingAvatarOverlap) : 0
+			}
 		}
 	}
 
@@ -766,8 +779,7 @@ extension ChatViewController: MessagesLayoutDelegate {
 		if isFromCurrentSender(message: message) {
 			return 0
 		}
-
-		return 9
+		return 0
 	}
 
 	func heightForLocation(message _: MessageType, at _: IndexPath, with _: CGFloat, in _: MessagesCollectionView) -> CGFloat {
@@ -775,7 +787,7 @@ extension ChatViewController: MessagesLayoutDelegate {
 	}
 
 	func footerViewSize(for _: MessageType, at _: IndexPath, in messagesCollectionView: MessagesCollectionView) -> CGSize {
-		return CGSize(width: messagesCollectionView.bounds.width, height: 20)
+		return CGSize(width: messagesCollectionView.bounds.width, height: 10)
 	}
 
 	@objc private func clipperButtonPressed() {

+ 1 - 1
deltachat-ios/Info.plist

@@ -28,7 +28,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5.1</string>
+	<string>6.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>