narayana/another.im-ios
narayana/another.im-ios
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

mv-experiment #1

Merged
fmodf merged 88 commits from mv-experiment into develop 2024-09-03 15:13:59 +00:00
Conversation 0 Commits 88 Files changed 131 +38 -33
11 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3c9e8a1384 - Show all commits

14
ConversationsClassic/AppData/Store/AttachmentsStore.swift
View file

@ -9,13 +9,13 @@ final class AttachmentsStore: ObservableObject {
@Published var galleryAccessGranted = false
@Published var galleryItems: [GalleryItem] = []
// private let client: Client
// private let roster: Roster
//
// init(roster: Roster, client: Client) {
// self.client = client
// self.roster = roster
// }
private let client: Client
private let roster: Roster
init(roster: Roster, client: Client) {
self.client = client
self.roster = roster
}
}
extension AttachmentsStore {

12
ConversationsClassic/AppData/Store/ClientsStore.swift
View file

@ -141,7 +141,7 @@ extension ClientsStore {
}
extension ClientsStore {
func conversation(for roster: Roster) async throws -> ConversationStore {
func conversationStores(for roster: Roster) async throws -> (ConversationStore, AttachmentsStore) {
while !ready {
await Task.yield()
}
@ -150,10 +150,12 @@ extension ClientsStore {
throw ClientStoreError.clientNotFound
}
return ConversationStore(roster: roster, client: client)
let conversationStore = ConversationStore(roster: roster, client: client)
let attachmentsStore = AttachmentsStore(roster: roster, client: client)
return (conversationStore, attachmentsStore)
}
func conversation(for chat: Chat) async throws -> ConversationStore {
func conversationStores(for chat: Chat) async throws -> (ConversationStore, AttachmentsStore) {
while !ready {
await Task.yield()
}
@ -163,6 +165,8 @@ extension ClientsStore {
}
let roster = try await chat.fetchRoster()
return ConversationStore(roster: roster, client: client)
let conversationStore = ConversationStore(roster: roster, client: client)
let attachmentsStore = AttachmentsStore(roster: roster, client: client)
return (conversationStore, attachmentsStore)
}
}

4
ConversationsClassic/AppData/Store/ConversationStore.swift
View file

@ -40,10 +40,6 @@ extension ConversationStore {
}
extension ConversationStore {
var attachmentsStore: AttachmentsStore {
AttachmentsStore()
}
func sendMedia(_ items: [GalleryItem]) async {
for item in items {
Task {

4
ConversationsClassic/View/Main/ChatList/ChatsListScreen.swift
View file

@ -60,9 +60,9 @@ private struct ChatsRow: View {
}
do {
let conversation = try await clientsStore.conversation(for: chat)
let (conversation, attachments) = try await clientsStore.conversationStores(for: chat)
router.showScreen(.push) { _ in
ConversationScreen(conversation: conversation)
ConversationScreen(conversation: conversation, attachments: attachments)
.navigationBarHidden(true)
}
} catch {

4
ConversationsClassic/View/Main/Contacts/ContactsScreen.swift
View file

@ -158,9 +158,9 @@ private struct ContactsScreenRow: View {
}
do {
let conversation = try await clientsStore.conversation(for: roster)
let (conversation, attachments) = try await clientsStore.conversationStores(for: roster)
router.showScreen(.push) { _ in
ConversationScreen(conversation: conversation)
ConversationScreen(conversation: conversation, attachments: attachments)
.navigationBarHidden(true)
}
} catch {

4
ConversationsClassic/View/Main/Conversation/Attachments/AttachmentPickerScreen.swift
View file

@ -9,7 +9,7 @@ enum AttachmentTab: Int, CaseIterable {
struct AttachmentPickerScreen: View {
@Environment(\.router) var router
@StateObject var attachmentsStore: AttachmentsStore
@EnvironmentObject var attachments: AttachmentsStore
@State private var selectedTab: AttachmentTab = .media
@ -36,7 +36,7 @@ struct AttachmentPickerScreen: View {
switch selectedTab {
case .media:
MediaPickerView()
.environmentObject(attachmentsStore)
.environmentObject(attachments)
case .files:
FilesPickerView()

6
ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/CameraCellPreview.swift
View file

@ -4,11 +4,11 @@ import SwiftUI
struct CameraCellPreview: View {
@Environment(\.router) var router
@EnvironmentObject var conversation: ConversationStore
@EnvironmentObject var store: AttachmentsStore
@EnvironmentObject var attachments: AttachmentsStore
var body: some View {
Group {
if store.cameraAccessGranted {
if attachments.cameraAccessGranted {
ZStack {
CameraView()
.aspectRatio(1, contentMode: .fit)
@ -57,7 +57,7 @@ struct CameraCellPreview: View {
}
}
.task {
await store.checkCameraAuthorization()
await attachments.checkCameraAuthorization()
}
}
}

12
ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/GalleryView.swift
View file

@ -1,13 +1,13 @@
import SwiftUI
struct GalleryView: View {
@EnvironmentObject var store: AttachmentsStore
@EnvironmentObject var attachments: AttachmentsStore
@Binding var selectedItems: [String]
var body: some View {
Group {
if store.galleryAccessGranted {
ForEach(store.galleryItems) { item in
if attachments.galleryAccessGranted {
ForEach(attachments.galleryItems) { item in
GridViewItem(item: item, selected: $selectedItems)
}
} else {
@ -33,12 +33,12 @@ struct GalleryView: View {
}
}
.task {
await store.checkGalleryAuthorization()
await attachments.checkGalleryAuthorization()
}
.onChange(of: store.galleryAccessGranted) { flag in
.onChange(of: attachments.galleryAccessGranted) { flag in
if flag {
Task {
await store.fetchGalleryItems()
await attachments.fetchGalleryItems()
}
}
}

4
ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/MediaPickerView.swift
View file

@ -6,7 +6,7 @@ import SwiftUI
struct MediaPickerView: View {
@Environment(\.router) var router
@EnvironmentObject var conversation: ConversationStore
@EnvironmentObject var store: AttachmentsStore
@EnvironmentObject var attachments: AttachmentsStore
@State private var selectedItems: [String] = []
@ -45,7 +45,7 @@ struct MediaPickerView: View {
.clipped()
.onTapGesture {
Task {
let items = store.galleryItems.filter { selectedItems.contains($0.id) }
let items = attachments.galleryItems.filter { selectedItems.contains($0.id) }
await conversation.sendMedia(items)
}
router.dismissEnvironment()

3
ConversationsClassic/View/Main/Conversation/ConversationScreen.swift
View file

@ -6,6 +6,7 @@ import SwiftUI
struct ConversationScreen: View {
@Environment(\.router) var router
@StateObject var conversation: ConversationStore
@StateObject var attachments: AttachmentsStore
@State private var autoScroll = true
@State private var firstIsVisible = true
@ -98,9 +99,11 @@ struct ConversationScreen: View {
}
}
.environmentObject(conversation)
.environmentObject(attachments)
.safeAreaInset(edge: .bottom, spacing: 0) {
ConversationTextInput(autoScroll: $autoScroll)
.environmentObject(conversation)
.environmentObject(attachments)
}
}
}

4
ConversationsClassic/View/Main/Conversation/ConversationTextInput.swift
View file

@ -4,6 +4,7 @@ import UIKit
struct ConversationTextInput: View {
@Environment(\.router) var router
@EnvironmentObject var conversation: ConversationStore
@EnvironmentObject var attachments: AttachmentsStore
@State private var messageStr = ""
@FocusState private var isFocused: Bool
@ -51,8 +52,9 @@ struct ConversationTextInput: View {
.padding(.leading, 8)
.tappablePadding(.symmetric(8)) {
router.showScreen(.fullScreenCover) { _ in
AttachmentPickerScreen(attachmentsStore: conversation.attachmentsStore)
AttachmentPickerScreen()
.environmentObject(conversation)
.environmentObject(attachments)
}
}
TextField("", text: $messageStr, prompt: Text(L10n.Chat.textfieldPrompt).foregroundColor(.Material.Shape.separator))