From 8bd4b344f601f26b4b7b0b1cffb50401fd9e9206 Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Wed, 15 Apr 2020 10:47:21 +0200
Subject: [PATCH] link new read view with other views
---
enzevalos_iphone/FolderViewController.swift | 7 ++++++-
enzevalos_iphone/KeyViewController.swift | 4 ++++
enzevalos_iphone/ListViewController.swift | 4 ++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/enzevalos_iphone/FolderViewController.swift b/enzevalos_iphone/FolderViewController.swift
index ac0e659c..c62c58db 100644
--- a/enzevalos_iphone/FolderViewController.swift
+++ b/enzevalos_iphone/FolderViewController.swift
@@ -202,7 +202,12 @@ class FolderViewController: UITableViewController {
performSegue(withIdentifier: "showInboxSegue", sender: nil)
}
} else if sectionType(indexPath) == .mails {
- performSegue(withIdentifier: "readFolderMailSegue", sender: getMails()[indexPath.row])
+ let mail = getMails()[indexPath.row]
+ if AppDelegate.getAppDelegate().newReadView, let coord = AppDelegate.getAppDelegate().readViewCoordinator {
+ coord.pushReadView(mail: mail)
+ return
+ }
+ performSegue(withIdentifier: "readFolderMailSegue", sender: mail)
} else {
let vc = storyboard?.instantiateViewController(withIdentifier: "folderViewController") as! FolderViewController
vc.folders = []
diff --git a/enzevalos_iphone/KeyViewController.swift b/enzevalos_iphone/KeyViewController.swift
index b789c227..f4301b2d 100644
--- a/enzevalos_iphone/KeyViewController.swift
+++ b/enzevalos_iphone/KeyViewController.swift
@@ -316,6 +316,10 @@ extension KeyViewController: UITableViewDataSource {
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if segue.identifier == "firstMail" {
if let mail = record?.key?.firstMail {
+ if AppDelegate.getAppDelegate().newReadView, let coord = AppDelegate.getAppDelegate().readViewCoordinator {
+ coord.pushReadView(mail: mail)
+ return
+ }
let DestinationViewController: ReadViewController = segue.destination as! ReadViewController
DestinationViewController.mail = mail
}
diff --git a/enzevalos_iphone/ListViewController.swift b/enzevalos_iphone/ListViewController.swift
index 4983b0bc..f77dd228 100644
--- a/enzevalos_iphone/ListViewController.swift
+++ b/enzevalos_iphone/ListViewController.swift
@@ -242,6 +242,10 @@ class ListViewController: UITableViewController {
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if segue.identifier == "readMailSegue" {
if let mail = sender as? PersistentMail {
+ if AppDelegate.getAppDelegate().newReadView, let coord = AppDelegate.getAppDelegate().readViewCoordinator {
+ coord.pushReadView(mail: mail)
+ return
+ }
let DestinationViewController: ReadViewController = segue.destination as! ReadViewController
DestinationViewController.mail = mail
}
--
GitLab