Thread Decorator (#1686)

* just added the isThreaded property to message based events * done but I should add a bunch of tests for images and videos and locations * handling for image and videos, but locations might need to be double checked * code improvement * better tests and removed code that is not used, we need to fix first the appearence of replies * bubble style is solved, we now need plain style * also added plain style * better handling for bubble style * rounded corner only for bubbles in location * fix for wrong aspect ratio in replies * all changes done * better testing * swift format * changelog * PR comments and rebase. * Simplify corner radius on location timeline view. --------- Co-authored-by: Doug <douglase@element.io>
2026-11-04 10:33:45 +00:00 · 2023-09-15 12:58:30 +02:00
parent 64d5ba7a69
commit 7642508135
42 changed files with 618 additions and 116 deletions
@@ -0,0 +1,50 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+extension LabelStyle where Self == CustomLayoutLabelStyle {
+    /// A label style that uses an `HStack` with parameters to customise the label's layout.
+    static func custom(spacing: CGFloat, alignment: VerticalAlignment = .center, iconLayout: Self.IconLayout = .leading) -> Self {
+        CustomLayoutLabelStyle(spacing: spacing, alignment: alignment, iconLayout: iconLayout)
+    }
+}
+
+struct CustomLayoutLabelStyle: LabelStyle {
+    let spacing: CGFloat
+    var alignment: VerticalAlignment
+    
+    enum IconLayout { case leading, trailing }
+    var iconLayout: IconLayout
+    
+    fileprivate init(spacing: CGFloat, alignment: VerticalAlignment, iconLayout: IconLayout) {
+        self.spacing = spacing
+        self.alignment = alignment
+        self.iconLayout = iconLayout
+    }
+    
+    func makeBody(configuration: Configuration) -> some View {
+        HStack(alignment: alignment, spacing: spacing) {
+            if iconLayout == .leading {
+                configuration.icon
+                configuration.title
+            } else {
+                configuration.title
+                configuration.icon
+            }
+        }
+    }
+}
@@ -0,0 +1,25 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+extension View {
+    /// Constrains the max height of a media item in the timeline, whilst preserving its aspect ratio.
+    func timelineMediaFrame(height contentHeight: CGFloat?, aspectRatio contentAspectRatio: CGFloat?) -> some View {
+        aspectRatio(contentAspectRatio, contentMode: .fit)
+            .frame(maxHeight: min(300, max(100, contentHeight ?? .infinity)))
+    }
+}