Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Conditionally flip message view contents #251

Draft
wants to merge 2 commits into
base: stable
Choose a base branch
from
Draft

Conditionally flip message view contents #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4878fba
Introduce FlipGroup w/ BorderlessMessageView
kiliankoe Feb 14, 2021
94854c2
Rename FlipGroup to Flipped
kiliankoe Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Nio.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
392389CC238EBB1500B2E1DF /* ReverseList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392389CB238EBB1400B2E1DF /* ReverseList.swift */; };
393411D1239087D2003B49B8 /* EventCollectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 393411D0239087D2003B49B8 /* EventCollectionTests.swift */; };
3964D5D625C4BB8600617C35 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3964D5CC25C4BB0200617C35 /* Configuration.swift */; };
396F072F25D94BEC00C9907A /* Flipped.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396F072E25D94BEC00C9907A /* Flipped.swift */; };
3984654523B7ECBA006C173B /* MXURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3984654423B7ECBA006C173B /* MXURL.swift */; };
3984654823B8D809006C173B /* SDWebImageSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 3984654723B8D809006C173B /* SDWebImageSwiftUI */; };
39B834C0243FC42000AE1EA0 /* TypingIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39B834BF243FC42000AE1EA0 /* TypingIndicatorView.swift */; };
Expand Down Expand Up @@ -234,6 +235,7 @@
3955DD36245C371C00827F07 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
395DDC1825C0C2D6002FC413 /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Localizable.strings; sourceTree = "<group>"; };
3964D5CC25C4BB0200617C35 /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
396F072E25D94BEC00C9907A /* Flipped.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Flipped.swift; sourceTree = "<group>"; };
3984654423B7ECBA006C173B /* MXURL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MXURL.swift; sourceTree = "<group>"; };
3997DCCF245732F000763C07 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
39B834BF243FC42000AE1EA0 /* TypingIndicatorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypingIndicatorView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -474,6 +476,7 @@
A51F762B25D6E9950061B4A4 /* MessageTextViewWrapper.swift */,
CAAF5BF72478696F006FDC33 /* UITextViewWrapper.swift */,
4B29F5B42466EC240084043B /* ImagePicker.swift */,
396F072E25D94BEC00C9907A /* Flipped.swift */,
);
path = "Shared Views";
sourceTree = "<group>";
Expand Down Expand Up @@ -1094,6 +1097,7 @@
CAFCB323245F6E6700869320 /* NSAttributedString+Extensions.swift in Sources */,
CAF2AE892458EEBC00D84133 /* AttributedText.swift in Sources */,
CAC46D5B23A2734C0079C24F /* EnvironmentValues.swift in Sources */,
396F072F25D94BEC00C9907A /* Flipped.swift in Sources */,
39C932072384BB13004449E1 /* RecentRoomsView.swift in Sources */,
CAC46D6F23A56BBE0079C24F /* GroupingIterator.swift in Sources */,
392221B2243D0CCC004D8794 /* RoomTopicEventView.swift in Sources */,
Expand Down
12 changes: 2 additions & 10 deletions Nio/Conversations/Event Views/MessageView/BorderlessMessageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,22 +87,14 @@ struct BorderlessMessageView<Model>: View where Model: MessageViewModelProtocol

var bodyView: some View {
VStack(alignment: isMe ? .trailing : .leading, spacing: 0) {
if isMe {
HStack {
if !self.connectedEdges.contains(.bottomEdge) {
self.timestampView
}
self.conditionalBadgedContentView
}
} else {
HStack {
HStack {
Flipped(if: isMe) {
self.conditionalBadgedContentView
if !self.connectedEdges.contains(.bottomEdge) {
self.timestampView
}
}
}

GroupedReactionsView(reactions: model.reactions)
}
}
Expand Down
37 changes: 37 additions & 0 deletions Nio/Shared Views/Flipped.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import SwiftUI

// Credit goes to https://stackoverflow.com/a/62652866/1843020

// swiftlint:disable:next identifier_name
@ViewBuilder func Flipped<V1: View, V2: View>(
if condition: Bool,
@ViewBuilder _ content: @escaping () -> TupleView<(V1, V2)>
) -> some View {
let pair = content()
if condition {
TupleView((pair.value.1, pair.value.0))
} else {
TupleView((pair.value.0, pair.value.1))
}
}

struct FlipGroup_Previews: PreviewProvider {
static var previews: some View {
Group {
HStack {
Flipped(if: false) {
Text("A")
Text("B")
}
}

HStack {
Flipped(if: true) {
Text("A")
Text("B")
}
}
}
.previewLayout(.sizeThatFits)
}
}