From 4379c8ae85ea9c8183c2f3564135bcfdf31654f6 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Wed, 14 Sep 2022 14:40:04 +0200
Subject: [PATCH] Update ChatView
---
.../Sources/ChatFeature/ChatView.swift | 60 ++++++++++++++-----
1 file changed, 45 insertions(+), 15 deletions(-)
diff --git a/Examples/xx-messenger/Sources/ChatFeature/ChatView.swift b/Examples/xx-messenger/Sources/ChatFeature/ChatView.swift
index fed16ae9..23596dc1 100644
--- a/Examples/xx-messenger/Sources/ChatFeature/ChatView.swift
+++ b/Examples/xx-messenger/Sources/ChatFeature/ChatView.swift
@@ -13,12 +13,14 @@ public struct ChatView: View {
var myContactId: Data?
var messages: IdentifiedArrayOf<ChatState.Message>
var failure: String?
+ var sendFailure: String?
var text: String
init(state: ChatState) {
myContactId = state.myContactId
messages = state.messages
failure = state.failure
+ sendFailure = state.sendFailure
text = state.text
}
}
@@ -28,22 +30,47 @@ public struct ChatView: View {
ScrollView {
LazyVStack {
if let failure = viewStore.failure {
- Text(failure)
- .frame(maxWidth: .infinity, alignment: .leading)
- .padding()
- Button {
- viewStore.send(.start)
- } label: {
- Text("Retry")
+ VStack {
+ Text(failure)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ Button {
+ viewStore.send(.start)
+ } label: {
+ Text("Retry").padding()
+ }
+ }
+ .padding()
+ .background {
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .fill(Material.ultraThick)
}
.padding()
}
+
ForEach(viewStore.messages) { message in
MessageView(
message: message,
myContactId: viewStore.myContactId
)
}
+
+ if let sendFailure = viewStore.sendFailure {
+ VStack {
+ Text(sendFailure)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ Button {
+ viewStore.send(.dismissSendFailureTapped)
+ } label: {
+ Text("Dismiss").padding()
+ }
+ }
+ .padding()
+ .background {
+ RoundedRectangle(cornerRadius: 12, style: .continuous)
+ .fill(Material.ultraThick)
+ }
+ .padding()
+ }
}
}
.toolbar(
@@ -69,7 +96,7 @@ public struct ChatView: View {
}
.padding()
}
- .background(Material.regularMaterial)
+ .background(Material.bar)
}
.navigationTitle("Chat")
.task { viewStore.send(.start) }
@@ -85,10 +112,6 @@ public struct ChatView: View {
message.senderId == myContactId ? .trailing : .leading
}
- var backgroundColor: Color {
- message.senderId == myContactId ? Color.blue : Color.gray.opacity(0.5)
- }
-
var textColor: Color? {
message.senderId == myContactId ? Color.white : nil
}
@@ -105,8 +128,13 @@ public struct ChatView: View {
.padding(.horizontal, 16)
.padding(.vertical, 8)
.background {
- RoundedRectangle(cornerRadius: 16, style: .continuous)
- .fill(backgroundColor)
+ if message.senderId == myContactId {
+ RoundedRectangle(cornerRadius: 16, style: .continuous)
+ .fill(Color.blue)
+ } else {
+ RoundedRectangle(cornerRadius: 16, style: .continuous)
+ .fill(Material.ultraThick)
+ }
}
.frame(maxWidth: .infinity, alignment: alignment)
}
@@ -150,7 +178,9 @@ public struct ChatView_Previews: PreviewProvider {
text: "Hi!",
status: .sent
),
- ]
+ ],
+ failure: "Something went wrong when fetching messages from database.",
+ sendFailure: "Something went wrong when sending message."
),
reducer: .empty,
environment: ()
--
GitLab