From d33ab21d0a868830bd5ff4109665be86a4b43dd4 Mon Sep 17 00:00:00 2001
From: hannes <hannes@gfzdfuz.de>
Date: Wed, 12 May 2021 15:58:01 +0200
Subject: [PATCH] composeview angepasst
---
.../Helpers/UI/SupportingViews/MailOptionsView.swift | 12 +++---------
.../Helpers/UI/SupportingViews/UnreadCountIcon.swift | 2 +-
enzevalos_iphone/SwiftUI/Read/ReadModel.swift | 10 +++++-----
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/MailOptionsView.swift b/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/MailOptionsView.swift
index b7d6ce8a..0c3c4bba 100644
--- a/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/MailOptionsView.swift
+++ b/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/MailOptionsView.swift
@@ -92,16 +92,10 @@ fileprivate struct MailOptionsWrapper<Content:View> : View {
@State private var opens : Bool = false
@State private var dst : AnyView = AnyView()
func newMail(to receivers : [AddressRecord?]){
- var receivers = receivers.compactMap{$0}
- let to = receivers.removeFirst()
+ let receivers = receivers.compactMap{$0}.map{$0.email}
setDst(
- ComposeView(model:
- ComposeModel(model:
- SelectReceiverModel(
- to: to,
- ccs: receivers
- )
- )
+ ComposeView(
+ preData: PreMailData(to: receivers)
)
)
open()
diff --git a/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/UnreadCountIcon.swift b/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/UnreadCountIcon.swift
index 0cdff4f9..72bf5070 100644
--- a/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/UnreadCountIcon.swift
+++ b/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/UnreadCountIcon.swift
@@ -25,7 +25,7 @@ struct UnreadCountIcon: View {
var body: some View {
FloatingActionButton(
radius:5,
- elevation:0,
+ //elevation:0,//now depricated
onShortPress: onPress
){
VStack{
diff --git a/enzevalos_iphone/SwiftUI/Read/ReadModel.swift b/enzevalos_iphone/SwiftUI/Read/ReadModel.swift
index 9ed72bff..fcc8bc8d 100644
--- a/enzevalos_iphone/SwiftUI/Read/ReadModel.swift
+++ b/enzevalos_iphone/SwiftUI/Read/ReadModel.swift
@@ -102,11 +102,11 @@ class ReadModel <M: DisplayMail>: ObservableObject {
struct PreMailData: Identifiable {
var id = UUID()
- var body: String
- var subject: String
- var to: [String]
- var cc: [String]
- var bcc: [String]
+ var body: String = ""
+ var subject: String = ""
+ var to: [String] = []
+ var cc: [String] = []
+ var bcc: [String] = []
// TODO: Consider message ids for response mail
static func invitePerson<M: DisplayMail> (mail: M) -> PreMailData? {
--
GitLab