Ver Fonte

show fullMessageButton, if message has HTML

cyberta há 4 anos atrás
pai
commit
4189f48567

+ 4 - 0
DcCore/DcCore/DC/Wrapper.swift

@@ -1015,6 +1015,10 @@ public class DcMsg {
         return dc_msg_is_setupmessage(messagePointer) == 1
         return dc_msg_is_setupmessage(messagePointer) == 1
     }
     }
 
 
+    public var hasHtml: Bool {
+        return dc_msg_has_html(messagePointer) == 1
+    }
+
     public var setupCodeBegin: String {
     public var setupCodeBegin: String {
         guard let cString = dc_msg_get_setupcodebegin(messagePointer) else { return "" }
         guard let cString = dc_msg_get_setupcodebegin(messagePointer) else { return "" }
         let swiftString = String(cString: cString)
         let swiftString = String(cString: cString)

+ 3 - 1
deltachat-ios/Chat/Views/Cells/BaseMessageCell.swift

@@ -219,7 +219,7 @@ public class BaseMessageCell: UITableViewCell {
 
 
         topCompactView = false
         topCompactView = false
         bottomCompactView = false
         bottomCompactView = false
-        isFullMessageButtonHidden = false
+        isFullMessageButtonHidden = true
         
         
 
 
         let gestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(onAvatarTapped))
         let gestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(onAvatarTapped))
@@ -297,6 +297,8 @@ public class BaseMessageCell: UITableViewCell {
             avatarView.isHidden = true
             avatarView.isHidden = true
         }
         }
 
 
+        isFullMessageButtonHidden = !msg.hasHtml
+
         messageBackgroundContainer.update(rectCorners: messageStyle,
         messageBackgroundContainer.update(rectCorners: messageStyle,
                                           color: msg.isFromCurrentSender ? DcColors.messagePrimaryColor : DcColors.messageSecondaryColor)
                                           color: msg.isFromCurrentSender ? DcColors.messagePrimaryColor : DcColors.messageSecondaryColor)