From 90ddd166e6f145d34e73644076ceede36a89f96c Mon Sep 17 00:00:00 2001
From: jakobsbode <jakobsbode@mi.fu-berlin.de>
Date: Wed, 12 Jul 2017 15:49:26 +0200
Subject: [PATCH] added read segue
---
enzevalos_iphone/Base.lproj/Main.storyboard | 21 +++++++++++----------
enzevalos_iphone/FolderViewController.swift | 11 +++++++++++
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/enzevalos_iphone/Base.lproj/Main.storyboard b/enzevalos_iphone/Base.lproj/Main.storyboard
index bd5a84bb..a96ac6f6 100644
--- a/enzevalos_iphone/Base.lproj/Main.storyboard
+++ b/enzevalos_iphone/Base.lproj/Main.storyboard
@@ -617,11 +617,12 @@
<connections>
<segue destination="X5Y-Rf-Qzd" kind="show" identifier="showInboxSegue" id="Qjs-MH-bHU"/>
<segue destination="ybw-P8-hJp" kind="show" identifier="showFolderListSegue" id="ShI-ar-nOg"/>
+ <segue destination="Ouw-WD-EV6" kind="show" identifier="readFolderMailSegue" id="6Ug-AV-lba"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="cjd-cY-a5S" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="645.60000000000002" y="-949.47526236881572"/>
+ <point key="canvasLocation" x="655" y="-949"/>
</scene>
<!--Folder List View Controller-->
<scene sceneID="ZuS-nF-avs">
@@ -990,11 +991,11 @@
<rect key="frame" x="0.0" y="252" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dM9-jb-EcN" id="tvN-re-z1Z">
- <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="VTZ-4w-fot">
- <rect key="frame" x="15" y="0.0" width="325" height="43.5"/>
+ <rect key="frame" x="16" y="0.0" width="324" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
@@ -1101,7 +1102,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Z5E-3a-5Ef">
- <rect key="frame" x="15" y="12" width="33.5" height="20.5"/>
+ <rect key="frame" x="16" y="12" width="33.5" height="20.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
@@ -1125,7 +1126,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xLe-fn-BGo">
- <rect key="frame" x="15" y="12" width="33.5" height="20.5"/>
+ <rect key="frame" x="16" y="12" width="33.5" height="20.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
@@ -1149,7 +1150,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SsF-tc-fh9">
- <rect key="frame" x="15" y="12" width="33.5" height="20.5"/>
+ <rect key="frame" x="16" y="12" width="33.5" height="20.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
@@ -1173,7 +1174,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="xHD-7H-RVy">
- <rect key="frame" x="15" y="12" width="33.5" height="20.5"/>
+ <rect key="frame" x="16" y="12" width="33.5" height="20.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
@@ -1577,10 +1578,10 @@
</scene>
</scenes>
<inferredMetricsTieBreakers>
+ <segue reference="6Ug-AV-lba"/>
<segue reference="TgN-rB-esa"/>
- <segue reference="kND-73-kqr"/>
- <segue reference="bUY-Me-dje"/>
<segue reference="j4Q-k1-ud3"/>
- <segue reference="1Uz-Iv-Fbe"/>
+ <segue reference="bUY-Me-dje"/>
+ <segue reference="kND-73-kqr"/>
</inferredMetricsTieBreakers>
</document>
diff --git a/enzevalos_iphone/FolderViewController.swift b/enzevalos_iphone/FolderViewController.swift
index af96ed90..6a778426 100644
--- a/enzevalos_iphone/FolderViewController.swift
+++ b/enzevalos_iphone/FolderViewController.swift
@@ -106,6 +106,9 @@ class FolderViewController: UITableViewController {
if indexPath.section == 0 {
performSegue(withIdentifier: "showInboxSegue", sender: nil)
}
+ else if indexPath.section == 2 {
+ performSegue(withIdentifier: "readFolderMailSegue", sender: DataHandler.handler.contacts[0].records[0].mails[0])
+ }
else {
if indexPath.row == 0 {
let vc = storyboard?.instantiateViewController(withIdentifier: "folderViewController") as! FolderViewController
@@ -117,6 +120,14 @@ class FolderViewController: UITableViewController {
}
}
}
+ override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+ if segue.identifier == "readFolderMailSegue" {
+ let destinationVC = segue.destination as! ReadViewController
+ if let mail = sender as? PersistentMail {
+ destinationVC.mail = mail
+ }
+ }
+ }
func refresh() {
self.refreshControl?.endRefreshing()
--
GitLab