mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-10-31 16:24:11 +00:00
Doug
ede4ab095c
- Fix sheet backgrounds in dark mode. - Fix background colours for reaction buttons. - Reply view layout. - Update separator colours. - Don't show sender name/avatar in DMs. - Fix inconsistent line heights with formatted body text. - Use plain text for reply - Increase tappable size of collapsed state changes button. - Blockquote layout and text colour. - Tap to expand the topic in room details. - Change the topic and security font size in room details. - Add cancel button when inviting someone to an existing room. - Reword Add Friends to Add People in start chat screen. - Update compound.
82 lines
3.0 KiB
Swift
82 lines
3.0 KiB
Swift
//
|
|
// 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
|
|
|
|
struct CollapsibleRoomTimelineView: View {
|
|
private let timelineItem: CollapsibleTimelineItem
|
|
private let timelineViews: [RoomTimelineViewProvider]
|
|
|
|
@State private var isExpanded = false
|
|
|
|
init(timelineItem: CollapsibleTimelineItem) {
|
|
self.timelineItem = timelineItem
|
|
timelineViews = timelineItem.items.map { RoomTimelineViewProvider(timelineItem: $0, groupStyle: .single) }
|
|
}
|
|
|
|
var body: some View {
|
|
DisclosureGroup(L10n.roomTimelineStateChanges(timelineItem.items.count), isExpanded: $isExpanded) {
|
|
Group {
|
|
ForEach(timelineViews) { timelineView in
|
|
timelineView.body
|
|
}
|
|
}.transition(.opacity.animation(.elementDefault))
|
|
}
|
|
.disclosureGroupStyle(CollapsibleRoomTimelineItemDisclosureGroupStyle())
|
|
.transaction { transaction in
|
|
transaction.animation = .noAnimation // Fixes weird animations on the disclosure indicator
|
|
}
|
|
}
|
|
}
|
|
|
|
private struct CollapsibleRoomTimelineItemDisclosureGroupStyle: DisclosureGroupStyle {
|
|
func makeBody(configuration: Configuration) -> some View {
|
|
VStack(spacing: 0.0) {
|
|
Button { configuration.isExpanded.toggle() } label: {
|
|
HStack(alignment: .center) {
|
|
configuration.label
|
|
Text(Image(systemName: "chevron.forward"))
|
|
.rotationEffect(.degrees(configuration.isExpanded ? 90 : 0))
|
|
.animation(.elementDefault, value: configuration.isExpanded)
|
|
}
|
|
.font(.compound.bodySM)
|
|
.foregroundColor(.compound.textSecondary)
|
|
.padding(.horizontal, 36.0)
|
|
.padding(.vertical, 12.0)
|
|
.contentShape(Rectangle())
|
|
}
|
|
.buttonStyle(.plain)
|
|
.frame(maxWidth: .infinity)
|
|
.padding(.top, 8.0)
|
|
|
|
if configuration.isExpanded {
|
|
configuration.content
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
struct CollapsibleRoomTimelineView_Previews: PreviewProvider {
|
|
static let item = CollapsibleTimelineItem(items: [
|
|
SeparatorRoomTimelineItem(id: "First separator", text: "This is a separator"),
|
|
SeparatorRoomTimelineItem(id: "Second separator", text: "This is another separator")
|
|
])
|
|
|
|
static var previews: some View {
|
|
CollapsibleRoomTimelineView(timelineItem: item)
|
|
}
|
|
}
|