fix: update self-deleting system message - WPB-21395 (#4186)

Author: OlivellaO

wire-ios/Wire-iOS Tests/ReferenceImages/ConversationFileCollaborationSystemMessageCellSnapshotTests/testFileCollaboration_DarkTheme.1.png

@@ -45,7 +45,21 @@ class DynamicFontLabel: UILabel, DynamicTypeCapable {
         self.adjustsFontForContentSizeCategory = true
     }
 
-    @available(*, deprecated, message: "Use `init(text:style:color)` instead")
+    init(
+        attributedText: NSAttributedString,
+        style: WireTextStyle = .body1,
+        color: UIColor
+    ) {
+        // Not needed when we use a font style.
+        self.onRedrawFont = { nil }
+        super.init(frame: .zero)
+        self.attributedText = attributedText
+        self.textColor = color
+        self.font = .font(for: style)
+        self.adjustsFontForContentSizeCategory = true
+    }
+
+    @available(*, deprecated, message: "Use `init(text:style:color)` or `init(attributedText:style:color)` instead")
     init(
         text: String? = nil,
         fontSpec: FontSpec = .normalRegularFont,

wire-ios/Wire-iOS Tests/ReferenceImages/ConversationFileCollaborationSystemMessageCellSnapshotTests/testFileCollaboration_LightTheme.1.png

@@ -23,7 +23,7 @@ import WireDesign
 
 final class ConversationFileCollaborationSystemMessageCellDescription: ConversationMessageCellDescription {
 
-    typealias View = ConversationSystemMessageCell<ConversationFileCollaborationSystemMessageCellDescription>
+    typealias View = ConversationWarningSystemMessageCell<ConversationFileCollaborationSystemMessageCellDescription>
     typealias LabelColors = SemanticColors.Label
     typealias IconColors = SemanticColors.Icon
 
@@ -59,7 +59,11 @@ final class ConversationFileCollaborationSystemMessageCellDescription: Conversat
             attributedText.addAttribute(.font, value: UIFont.mediumSemiboldFont, range: nsRange)
         }
 
-        self.configuration = View.Configuration(icon: icon, attributedText: attributedText, showLine: false)
+        self.configuration = View.Configuration(
+            icon: icon,
+            topText: NSAttributedString(string: ""),
+            bottomText: attributedText,
+        )
         self.accessibilityLabel = attributedText.string
         self.actionController = nil
     }

wire-ios/Wire-iOS/Sources/Helpers/DynamicFontLabel.swift

@@ -23,7 +23,7 @@ import WireDesign
 
 final class ConversationMessageTimerSystemMessageCellDescription: ConversationMessageCellDescription {
 
-    typealias View = ConversationSystemMessageCell<ConversationMessageTimerSystemMessageCellDescription>
+    typealias View = ConversationWarningSystemMessageCell<ConversationMessageTimerSystemMessageCellDescription>
     typealias LabelColors = SemanticColors.Label
     typealias IconColors = SemanticColors.Icon
 
@@ -82,7 +82,11 @@ final class ConversationMessageTimerSystemMessageCellDescription: ConversationMe
 
         typealias LabelColors = SemanticColors.Label
         let icon = StyleKitIcon.hourglass.makeImage(size: 16, color: IconColors.backgroundDefault)
-        self.configuration = View.Configuration(icon: icon, attributedText: updateText, showLine: false)
+        self.configuration = View.Configuration(
+            icon: icon,
+            topText: NSAttributedString(string: ""),
+            bottomText: updateText ?? NSAttributedString(string: "")
+        )
         self.accessibilityLabel = updateText?.string
         self.actionController = nil
     }

wire-ios/Wire-iOS/Sources/UserInterface/Conversation/Content/Cells/ConfigurationMessageCell/Components/ConversationFileCollaborationSystemMessageCellDescription.swift

@@ -28,22 +28,26 @@ final class ConversationWarningSystemMessageCell<
     private typealias IconColors = SemanticColors.Icon
 
     struct Configuration: Equatable {
-        let topText: String
-        let bottomText: String
+        let icon: UIImage?
+        let topText: NSAttributedString
+        let bottomText: NSAttributedString
     }
 
     private let encryptionLabel = DynamicFontLabel(
+        attributedText: NSAttributedString(string: ""),
         style: .subline1,
         color: LabelColors.textDefault
     )
     private let sensitiveInfoLabel = DynamicFontLabel(
+        attributedText: NSAttributedString(string: ""),
         style: .subline1,
         color: LabelColors.textDefault
     )
 
     func configure(with object: Configuration, animated: Bool) {
-        encryptionLabel.text = object.topText
-        sensitiveInfoLabel.text = object.bottomText
+        encryptionLabel.attributedText = object.topText
+        sensitiveInfoLabel.attributedText = object.bottomText
+        imageView.image = object.icon
     }
 
     override func configureSubviews() {
@@ -57,14 +61,19 @@ final class ConversationWarningSystemMessageCell<
         bottomContentView.addSubview(sensitiveInfoLabel)
 
         lineView.isHidden = true
-        imageView.image = .init(resource: .attention)
         imageView.tintColor = IconColors.backgroundDefault
     }
 
     override func configureConstraints() {
         super.configureConstraints()
-        encryptionLabel.fitIn(view: topContentView)
-        sensitiveInfoLabel.fitIn(view: bottomContentView)
+        let padding: CGFloat = 6.0
+
+        encryptionLabel.fitIn(view: topContentView, insets: UIEdgeInsets(top: 0, left: 0, bottom: 0, right: padding))
+        sensitiveInfoLabel.fitIn(
+            view: bottomContentView,
+            insets: UIEdgeInsets(top: 0, left: 0, bottom: 0, right: padding)
+        )
+
         NSLayoutConstraint.activate([
             imageContainer.topAnchor.constraint(equalTo: bottomContentView.topAnchor).withPriority(.required)
         ])