From b408d59a6e986dc559aa06f237da0f0320b77c17 Mon Sep 17 00:00:00 2001 From: Augustinas Malinauskas Date: Mon, 29 Apr 2024 05:13:55 -0700 Subject: [PATCH] feat: loader (#90) --- .../xcshareddata/swiftpm/Package.resolved | 6 +++--- .../Chat/Components/ChatMessageView.swift | 20 ++++++++++++++----- .../Chat/Components/MessageListVIew.swift | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Enchanted.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Enchanted.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 636f9c0..c7de0f5 100644 --- a/Enchanted.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Enchanted.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -111,10 +111,10 @@ { "identity" : "swift-markdown-ui", "kind" : "remoteSourceControl", - "location" : "https://github.com/gonzalezreal/swift-markdown-ui", + "location" : "https://github.com/AugustDev/swift-markdown-ui", "state" : { - "revision" : "ae799d015a5374708f7b4c85f3294c05f2a564e2", - "version" : "2.3.0" + "branch" : "main", + "revision" : "acb83e45394334a04ba0cf3487e4d07f4709eeb4" } }, { diff --git a/Enchanted/UI/Shared/Chat/Components/ChatMessageView.swift b/Enchanted/UI/Shared/Chat/Components/ChatMessageView.swift index e258aaf..0c5dbe2 100644 --- a/Enchanted/UI/Shared/Chat/Components/ChatMessageView.swift +++ b/Enchanted/UI/Shared/Chat/Components/ChatMessageView.swift @@ -8,10 +8,12 @@ import SwiftUI import MarkdownUI import Splash +import ActivityIndicatorView struct ChatMessageView: View { @Environment(\.colorScheme) var colorScheme var message: MessageSD + var showLoader: Bool = false @Binding var editMessage: MessageSD? @State private var mouseHover = false @@ -196,6 +198,7 @@ struct ChatMessageView: View { } .frame(width: 24, height: 24) + } else { Image("logo-nobg") .resizable() @@ -204,11 +207,18 @@ struct ChatMessageView: View { } VStack(alignment: .leading) { - Text(message.role.capitalized) - .font(.system(size: 16)) - .fontWeight(.medium) - .padding(.bottom, 2) - .frame(height: 27) + HStack { + Text(message.role.capitalized) + .font(.system(size: 16)) + .fontWeight(.medium) + .padding(.bottom, 2) + .frame(height: 27) + + ActivityIndicatorView(isVisible: .constant(true), type: .rotatingDots(count: 5)) + .frame(width: 20, height: 20) + .rotationEffect(.degrees(-90)) + .showIf(showLoader) + } Markdown(message.content) .textSelection(.enabled) diff --git a/Enchanted/UI/Shared/Chat/Components/MessageListVIew.swift b/Enchanted/UI/Shared/Chat/Components/MessageListVIew.swift index b5556e8..086e1cf 100644 --- a/Enchanted/UI/Shared/Chat/Components/MessageListVIew.swift +++ b/Enchanted/UI/Shared/Chat/Components/MessageListVIew.swift @@ -52,6 +52,7 @@ struct MessageListView: View { ForEach(messages) { message in ChatMessageView( message: message, + showLoader: conversationState == .loading && messages.last == message, editMessage: $editMessage ) .listRowInsets(EdgeInsets())