diff --git a/enzevalos_iphone.xcodeproj/project.pbxproj b/enzevalos_iphone.xcodeproj/project.pbxproj
index 52cb487acb487e855e199a7032e2d69a6ed3407e..9ae75f3d542db1e878b8afac66f0ff603b68d953 100644
--- a/enzevalos_iphone.xcodeproj/project.pbxproj
+++ b/enzevalos_iphone.xcodeproj/project.pbxproj
@@ -225,6 +225,7 @@
A1EB05A01D95696C008659C1 /* MessageBodyTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1EB059F1D95696C008659C1 /* MessageBodyTableViewCell.swift */; };
A1EB05A41D956E32008659C1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A1EB05A31D956E32008659C1 /* Assets.xcassets */; };
A1ECE54B1EFBE7ED0009349F /* FolderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1ECE54A1EFBE7ED0009349F /* FolderCell.swift */; };
+ A1EFF93321E6655C003BB240 /* IntroTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1EFF93221E6655C003BB240 /* IntroTableView.swift */; };
A1F992291DA7C9100073BF1B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A1F9922B1DA7C9100073BF1B /* Main.storyboard */; };
A1F992391DA7DD2E0073BF1B /* InboxTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A1F9923B1DA7DD2E0073BF1B /* InboxTableViewCell.xib */; };
A1FA44A721E10E1400DB02AC /* Travel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1FA44A621E10E1400DB02AC /* Travel.swift */; };
@@ -421,6 +422,7 @@
A1EB059F1D95696C008659C1 /* MessageBodyTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageBodyTableViewCell.swift; sourceTree = "<group>"; };
A1EB05A31D956E32008659C1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
A1ECE54A1EFBE7ED0009349F /* FolderCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderCell.swift; sourceTree = "<group>"; };
+ A1EFF93221E6655C003BB240 /* IntroTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntroTableView.swift; sourceTree = "<group>"; };
A1F992301DA7D22D0073BF1B /* de */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = de; path = de.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
A1F992321DA7D2360073BF1B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
A1F992341DA7DA570073BF1B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -812,6 +814,7 @@
A182183321E51DD200918A29 /* IntroContactCell.swift */,
A1B49E5C21E54CBF00ED86FC /* IntroContactTableViewController.swift */,
A1B49E6321E55ECD00ED86FC /* IntroPageViewController.swift */,
+ A1EFF93221E6655C003BB240 /* IntroTableView.swift */,
);
name = controller;
sourceTree = "<group>";
@@ -1456,6 +1459,7 @@
472F39861E1FA34E009260FB /* Record.swift in Sources */,
A1C3270E1DB907D900CE2ED5 /* TextFormatter.swift in Sources */,
F12041FD1DA409A5002E4940 /* ListViewCell.swift in Sources */,
+ A1EFF93321E6655C003BB240 /* IntroTableView.swift in Sources */,
A1E2324E1F0FA41A00DC9D40 /* FolderListCell.swift in Sources */,
476916A0216B86A100491527 /* PersistentMail +CoreDataClass.swift in Sources */,
A1EB05941D956931008659C1 /* InboxCellDelegator.swift in Sources */,
diff --git a/enzevalos_iphone/Intro.storyboard b/enzevalos_iphone/Intro.storyboard
index c30b4df5983969d975a4c767952b1a3abcb93488..ba5cc332104dc3687c6d45ddcc06a12fe73e17f7 100644
--- a/enzevalos_iphone/Intro.storyboard
+++ b/enzevalos_iphone/Intro.storyboard
@@ -30,30 +30,42 @@
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" bounces="NO" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" editable="NO" textAlignment="center" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lr2-gv-nYg">
<rect key="frame" x="18.5" y="75.5" width="337.5" height="467"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+ <mutableString key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</mutableString>
<fontDescription key="fontDescription" type="system" pointSize="22"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xg2-Io-1am">
- <rect key="frame" x="249" y="586" width="107" height="30"/>
+ <rect key="frame" x="220" y="549" width="136" height="36"/>
+ <fontDescription key="fontDescription" type="system" pointSize="20"/>
<state key="normal" title="Überspringen >"/>
<connections>
<action selector="skipTapped:" destination="wOD-s1-IJ4" eventType="primaryActionTriggered" id="rb0-PN-qlJ"/>
</connections>
</button>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="descriptionText" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xp6-80-Ox9">
+ <rect key="frame" x="18.5" y="75.5" width="337.5" height="467"/>
+ <fontDescription key="fontDescription" type="system" pointSize="22"/>
+ <nil key="textColor"/>
+ <nil key="highlightedColor"/>
+ </label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
+ <constraint firstItem="Xp6-80-Ox9" firstAttribute="width" secondItem="Lr2-gv-nYg" secondAttribute="width" id="0LH-in-azN"/>
<constraint firstItem="xg2-Io-1am" firstAttribute="trailing" secondItem="Lr2-gv-nYg" secondAttribute="trailing" id="55n-iX-qiD"/>
<constraint firstItem="Lr2-gv-nYg" firstAttribute="centerY" secondItem="yyZ-M9-ySc" secondAttribute="centerY" multiplier="0.9" id="GPb-gX-oAl"/>
- <constraint firstItem="xg2-Io-1am" firstAttribute="centerY" secondItem="yyZ-M9-ySc" secondAttribute="centerY" multiplier="1.75" id="Udc-pP-Un0"/>
+ <constraint firstItem="xg2-Io-1am" firstAttribute="centerY" secondItem="yyZ-M9-ySc" secondAttribute="centerY" multiplier="1.65" id="Udc-pP-Un0"/>
<constraint firstItem="Lr2-gv-nYg" firstAttribute="centerX" secondItem="yyZ-M9-ySc" secondAttribute="centerX" id="WwF-Zk-wVc"/>
+ <constraint firstItem="Xp6-80-Ox9" firstAttribute="centerX" secondItem="yyZ-M9-ySc" secondAttribute="centerX" id="ifI-fz-N6c"/>
<constraint firstItem="Lr2-gv-nYg" firstAttribute="width" secondItem="k4f-8h-7kZ" secondAttribute="width" multiplier="90:100" id="krc-s0-OdQ"/>
+ <constraint firstItem="Xp6-80-Ox9" firstAttribute="height" secondItem="Lr2-gv-nYg" secondAttribute="height" id="lGy-qx-rlZ"/>
<constraint firstItem="Lr2-gv-nYg" firstAttribute="height" secondItem="k4f-8h-7kZ" secondAttribute="height" multiplier="0.7" id="mJK-OO-ikJ"/>
+ <constraint firstItem="Xp6-80-Ox9" firstAttribute="centerY" secondItem="yyZ-M9-ySc" secondAttribute="centerY" multiplier="0.9" id="yHK-d0-RD5"/>
</constraints>
<viewLayoutGuide key="safeArea" id="yyZ-M9-ySc"/>
</view>
<connections>
+ <outlet property="descriptionLabel" destination="Xp6-80-Ox9" id="WU3-BY-jTt"/>
<outlet property="descriptionView" destination="Lr2-gv-nYg" id="dPK-wM-Vo3"/>
<outlet property="skipButton" destination="xg2-Io-1am" id="oDB-PV-d19"/>
</connections>
@@ -118,29 +130,21 @@
</objects>
<point key="canvasLocation" x="1342" y="-224"/>
</scene>
- <!--Table View Controller-->
+ <!--Intro Contact Table View Controller-->
<scene sceneID="frP-4c-Od9">
<objects>
- <tableViewController id="QVX-gn-Y6B" sceneMemberID="viewController">
- <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Xa1-zU-SNj">
+ <tableViewController storyboardIdentifier="contactTableViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="QVX-gn-Y6B" customClass="IntroContactTableViewController" customModule="enzevalos_iphone" customModuleProvider="target" sceneMemberID="viewController">
+ <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="onDrag" dataMode="prototypes" style="grouped" allowsSelectionDuringEditing="YES" allowsMultipleSelection="YES" allowsMultipleSelectionDuringEditing="YES" rowHeight="63" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Xa1-zU-SNj" customClass="IntroTableView" customModule="enzevalos_iphone" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<color key="sectionIndexColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- <searchBar key="tableHeaderView" contentMode="redraw" id="RFq-qW-4EB">
- <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
- <textInputTraits key="textInputTraits"/>
- <connections>
- <outlet property="delegate" destination="QVX-gn-Y6B" id="S7x-fj-FvH"/>
- </connections>
- </searchBar>
<prototypes>
- <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="introContactCell" id="897-2G-qEv" customClass="IntroContactCell" customModule="enzevalos_iphone" customModuleProvider="target">
- <rect key="frame" x="0.0" y="72" width="375" height="44"/>
+ <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="897-2G-qEv" customClass="IntroContactCell" customModule="enzevalos_iphone" customModuleProvider="target">
+ <rect key="frame" x="0.0" y="55.5" width="375" height="63"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="897-2G-qEv" id="eCR-Ww-Y6H">
- <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="375" height="62.5"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
</tableViewCell>
@@ -151,20 +155,18 @@
<outlet property="delegate" destination="QVX-gn-Y6B" id="lUj-OS-CPc"/>
</connections>
</tableView>
+ <simulatedNavigationBarMetrics key="simulatedTopBarMetrics"/>
<connections>
- <outlet property="searchDisplayController" destination="4nE-2z-WCK" id="5h5-F5-Bb1"/>
+ <outlet property="doubleTapRecognizer" destination="EJr-Kc-9MN" id="51d-fg-3bM"/>
</connections>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="8GW-9X-WHB" userLabel="First Responder" sceneMemberID="firstResponder"/>
- <searchDisplayController id="4nE-2z-WCK">
+ <tapGestureRecognizer id="2yG-Ee-Lqr"/>
+ <tapGestureRecognizer numberOfTapsRequired="2" id="EJr-Kc-9MN">
<connections>
- <outlet property="delegate" destination="QVX-gn-Y6B" id="QjF-ZT-TKE"/>
- <outlet property="searchBar" destination="RFq-qW-4EB" id="DXh-Ev-6em"/>
- <outlet property="searchContentsController" destination="QVX-gn-Y6B" id="71u-c4-t6p"/>
- <outlet property="searchResultsDataSource" destination="QVX-gn-Y6B" id="ErX-rV-9x6"/>
- <outlet property="searchResultsDelegate" destination="QVX-gn-Y6B" id="rih-iX-dEg"/>
+ <action selector="doubleTap:" destination="QVX-gn-Y6B" id="asu-ot-QnX"/>
</connections>
- </searchDisplayController>
+ </tapGestureRecognizer>
</objects>
<point key="canvasLocation" x="2111" y="-224"/>
</scene>
diff --git a/enzevalos_iphone/IntroContactCell.swift b/enzevalos_iphone/IntroContactCell.swift
index 3084aca955be70dfbee3dc328b9d6062adfc74e6..670aecd3461f53d0bd58c1000ef68a2e3087dc02 100644
--- a/enzevalos_iphone/IntroContactCell.swift
+++ b/enzevalos_iphone/IntroContactCell.swift
@@ -29,4 +29,9 @@ class IntroContactCell: UITableViewCell {
}
}
}
+
+// override func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+// return
+// }
}
+
diff --git a/enzevalos_iphone/IntroContactCell.xib b/enzevalos_iphone/IntroContactCell.xib
index c1a4beba64c3913d2897bfa532ba01a59b1f2bef..7043ec28fcd6c2d53bd843e8b2656ce438197b1e 100644
--- a/enzevalos_iphone/IntroContactCell.xib
+++ b/enzevalos_iphone/IntroContactCell.xib
@@ -14,40 +14,40 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="introContactCell" rowHeight="63" id="oVz-9n-10C" customClass="IntroContactCell" customModule="enzevalos_iphone" customModuleProvider="target">
- <rect key="frame" x="0.0" y="0.0" width="329" height="63"/>
+ <rect key="frame" x="0.0" y="0.0" width="329" height="68"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="oVz-9n-10C" id="ZGb-xC-czX">
- <rect key="frame" x="0.0" y="0.0" width="329" height="62.5"/>
+ <rect key="frame" x="0.0" y="0.0" width="329" height="67.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b80-o2-POc" userLabel="seperator1">
- <rect key="frame" x="0.0" y="30" width="6.5" height="1"/>
+ <rect key="frame" x="0.0" y="33.5" width="6.5" height="1"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="eyy-YM-FiX"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ldq-6Z-akT">
- <rect key="frame" x="6.5" y="3" width="56" height="56"/>
+ <rect key="frame" x="6.5" y="3.5" width="61" height="60.5"/>
<constraints>
<constraint firstAttribute="width" secondItem="Ldq-6Z-akT" secondAttribute="height" multiplier="1:1" id="YAW-Gn-LjT"/>
</constraints>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NXt-pv-S05" userLabel="seperator2">
- <rect key="frame" x="62.5" y="31" width="19.5" height="1"/>
+ <rect key="frame" x="67.5" y="33.5" width="19.5" height="1"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="smt-kd-GRg">
- <rect key="frame" x="82" y="19.5" width="51.5" height="24"/>
+ <rect key="frame" x="87" y="22" width="51.5" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="plane" translatesAutoresizingMaskIntoConstraints="NO" id="UMj-eG-5W1" userLabel="plane Image">
- <rect key="frame" x="266" y="3.5" width="56" height="56"/>
+ <rect key="frame" x="285.5" y="15.5" width="36.5" height="36.5"/>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QcO-bH-nZt" userLabel="seperator3">
- <rect key="frame" x="322" y="30.5" width="6.5" height="1"/>
+ <rect key="frame" x="322" y="33.5" width="6.5" height="1"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
</subviews>
@@ -63,23 +63,24 @@
<constraint firstItem="b80-o2-POc" firstAttribute="width" secondItem="ZGb-xC-czX" secondAttribute="height" multiplier="1:10" id="KDR-QL-LDY"/>
<constraint firstItem="NXt-pv-S05" firstAttribute="height" secondItem="b80-o2-POc" secondAttribute="height" id="RjL-9E-of3"/>
<constraint firstItem="NXt-pv-S05" firstAttribute="width" secondItem="b80-o2-POc" secondAttribute="width" multiplier="3" id="S2U-mP-JoH"/>
- <constraint firstItem="UMj-eG-5W1" firstAttribute="width" secondItem="Ldq-6Z-akT" secondAttribute="width" id="SXh-TJ-myV"/>
+ <constraint firstItem="UMj-eG-5W1" firstAttribute="width" secondItem="Ldq-6Z-akT" secondAttribute="width" multiplier="0.6" id="SXh-TJ-myV"/>
<constraint firstItem="Ldq-6Z-akT" firstAttribute="centerY" secondItem="ZGb-xC-czX" secondAttribute="centerY" id="Tic-GR-fXb"/>
<constraint firstItem="QcO-bH-nZt" firstAttribute="height" secondItem="b80-o2-POc" secondAttribute="height" id="bge-IY-X40"/>
<constraint firstItem="Ldq-6Z-akT" firstAttribute="leading" secondItem="b80-o2-POc" secondAttribute="trailing" id="hpr-Bk-qdb"/>
<constraint firstItem="UMj-eG-5W1" firstAttribute="centerY" secondItem="ZGb-xC-czX" secondAttribute="centerY" id="i6W-Kq-yDl"/>
<constraint firstItem="NXt-pv-S05" firstAttribute="leading" secondItem="Ldq-6Z-akT" secondAttribute="trailing" id="mex-fI-Jkc"/>
- <constraint firstItem="UMj-eG-5W1" firstAttribute="height" secondItem="Ldq-6Z-akT" secondAttribute="height" id="qy8-hD-c5p"/>
+ <constraint firstItem="UMj-eG-5W1" firstAttribute="height" secondItem="Ldq-6Z-akT" secondAttribute="height" multiplier="0.6" id="qy8-hD-c5p"/>
<constraint firstItem="QcO-bH-nZt" firstAttribute="width" secondItem="b80-o2-POc" secondAttribute="width" id="uXa-j7-4FF"/>
<constraint firstItem="smt-kd-GRg" firstAttribute="leading" secondItem="NXt-pv-S05" secondAttribute="trailing" id="uk9-iN-MMY"/>
</constraints>
</tableViewCellContentView>
+ <gestureRecognizers/>
<connections>
<outlet property="contactImage" destination="Ldq-6Z-akT" id="OtD-VW-6U1"/>
<outlet property="nameLabel" destination="smt-kd-GRg" id="XdG-zR-ngC"/>
<outlet property="planeImage" destination="UMj-eG-5W1" id="kHm-EC-wmL"/>
</connections>
- <point key="canvasLocation" x="-169.5" y="-199.5"/>
+ <point key="canvasLocation" x="-169.5" y="-197"/>
</tableViewCell>
</objects>
<resources>
diff --git a/enzevalos_iphone/IntroContactTableViewController.swift b/enzevalos_iphone/IntroContactTableViewController.swift
index 017d7ad04ac9c97950faf64cbdf456a54d19ce13..d3e6dcc0f63c9552c73451af77ff728e4294bf77 100644
--- a/enzevalos_iphone/IntroContactTableViewController.swift
+++ b/enzevalos_iphone/IntroContactTableViewController.swift
@@ -9,9 +9,123 @@
import Foundation
class IntroContactTableViewController: UITableViewController {
+ //var contacts: [String: [EnzevalosContact]] = [:]
+ var contacts: [String: [String]] = [:]
+ @IBOutlet var doubleTapRecognizer: UITapGestureRecognizer!
+ static let storyboardID = "contactTableViewController"
+
+ static func storyboardInstance(contacts: [String: [String]]) -> IntroContactTableViewController? {
+ let storyboard = UIStoryboard(name:
+ "Intro", bundle: nil)
+ if let controller = storyboard.instantiateViewController(withIdentifier: storyboardID) as? IntroContactTableViewController {
+ controller.contacts = contacts
+ return controller
+ }
+ return nil
+ }
+
+ override func viewDidLoad() {
+ tableView.addGestureRecognizer(doubleTapRecognizer)
+ }
+
+ override func viewDidAppear(_ animated: Bool) {
+ super.viewDidAppear(animated)
+ tableView.reloadData()
+ }
+
+ override func numberOfSections(in tableView: UITableView) -> Int {
+ return 27
+ }
+
+ override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+ if let rows = contacts[intToAlphabet(value: section)] {
+ return rows.count
+ }
+ return 0
+ }
+
+ override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+ return 44
+ }
+
+ override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+ var cell: IntroContactCell
+
+ if let tmpCell = tableView.dequeueReusableCell(withIdentifier: "introContactCell") as? IntroContactCell {
+ cell = tmpCell
+ } else {
+ tableView.register(UINib.init(nibName: "IntroContactCell", bundle: nil), forCellReuseIdentifier: "introContactCell")
+ cell = tableView.dequeueReusableCell(withIdentifier: "introContactCell") as! IntroContactCell
+ }
+
+ if let rows = contacts[intToAlphabet(value: indexPath.section)] {
+ cell.nameLabel.text = rows[indexPath.row]
+ }
+ return cell
+ }
+
+ override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+ let cell = tableView.cellForRow(at: indexPath)! as! IntroContactCell
+ cell.planeImage.isHidden = false
+ }
+
+ override func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) {
+ let cell = tableView.cellForRow(at: indexPath)! as! IntroContactCell
+ cell.planeImage.isHidden = true
+ }
+
+ override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+ if self.tableView(tableView, numberOfRowsInSection: section) == 0 {
+ return CGFloat.leastNonzeroMagnitude
+ }
+ return 40//super.tableView(tableView, heightForHeaderInSection: section)
+ }
+
+ override func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+ if self.tableView(tableView, numberOfRowsInSection: section) == 0 {
+ return CGFloat.leastNonzeroMagnitude
+ }
+ return CGFloat.leastNonzeroMagnitude//super.tableView(tableView, heightForFooterInSection: section)
+ }
+
+ override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+ if self.tableView(tableView, numberOfRowsInSection: section) == 0 {
+ return nil
+ }
+ return intToAlphabet(value: section)
+ }
+
+ override func sectionIndexTitles(for tableView: UITableView) -> [String]? {
+ var titles: [String] = []
+ for i in 0...26 {
+ titles.append(intToAlphabet(value: i))
+ }
+ return titles
+ }
+
+ @IBAction func doubleTap(_ sender: Any) {
+// if let sender = sender as? UITapGestureRecognizer {
+// sender.location(in: <#T##UIView?#>)
+// }
+// if let cell = UIScreen.main.focusedView as? IntroContactCell {
+// print(cell.nameLabel.text)
+// }
+ }
+
+ func intToAlphabet(value: Int) -> String {
+ if value >= 0 && value < 26, let myUnicodeScalar = UnicodeScalar(Int(UnicodeScalar("A").value)+value) {
+ let myCharacter = String(myUnicodeScalar)
+ return myCharacter
+ }
+ return "#"
+ }
}
+//extension IntroContactTableViewController: UIGestureRecognizerDelegate {
+//
+//}
+
//extension IntroContactTableViewController: UIViewControllerPreviewingDelegate {
//
// func previewingContext(_ previewingContext: UIViewControllerPreviewing, viewControllerForLocation location: CGPoint) -> UIViewController? {
diff --git a/enzevalos_iphone/IntroTableView.swift b/enzevalos_iphone/IntroTableView.swift
new file mode 100644
index 0000000000000000000000000000000000000000..349e70c64457dc5749be16e69cab0ff10726c97e
--- /dev/null
+++ b/enzevalos_iphone/IntroTableView.swift
@@ -0,0 +1,24 @@
+//
+// IntroTableView.swift
+// enzevalos_iphone
+//
+// Created by jakobsbode on 09.01.19.
+// Copyright © 2019 fu-berlin. All rights reserved.
+//
+
+import Foundation
+
+class IntroTableView: UITableView {
+ override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
+ for touch in touches {
+ if touch.tapCount == 2 {
+ let point = touch.location(in: self)
+ let index = indexPathForRow(at: point)
+ if let index = index {
+ print(index.section, " ", index.row)
+ }
+ }
+ }
+ super.touchesEnded(touches, with: event)
+ }
+}
diff --git a/enzevalos_iphone/TravelIntroCoordinator.swift b/enzevalos_iphone/TravelIntroCoordinator.swift
index cbb58e21442c46ed3b17ec39d7b0dd039244fb9a..c9288e8eb5f7b8c2db0633675c53cf96bbe5e8e7 100644
--- a/enzevalos_iphone/TravelIntroCoordinator.swift
+++ b/enzevalos_iphone/TravelIntroCoordinator.swift
@@ -11,15 +11,28 @@ class TravelIntroCoordinator {
static func getTravelIntro(current viewController: UIViewController) -> UIViewController {
var controllers: [UIViewController] = []
- let descriptionViewController = IntroDescriptionViewController.storyboardInstance(description: "hallo", skipButtonAction: {_ in })!
- controllers.append(descriptionViewController)
+ let description1 = IntroDescriptionViewController.storyboardInstance(description: "hallo", skipButtonAction: {_ in })!
+ controllers.append(description1)
let descriptionViewController2 = IntroDescriptionViewController.storyboardInstance(description: "hallo2")!
controllers.append(descriptionViewController2)
let backupController = IntroButtonViewController.storyboardInstance(description: "Um alle vorangangenen Nachrichten nach deiner Reise wieder lesen zu können, solltest du vor deiner Reise ein Backup erstellen. Wenn du noch keines erstellt hast, solltest du es jetzt tun.\n\nBeachte, dass wir zum Schutz deiner Geheimnisse während der Reise alle Backup-Codes löschen. Du solltest bestehende Codes jetzt notieren und zuhause lassen.", buttonAction: {_ in viewController.navigationController?.pushViewController(ExportInfoViewController.storyboardInstance(travelCall: true)!, animated: true)})!
-
controllers.append(backupController)
-
+ let describeContactsController = IntroButtonViewController.storyboardInstance(description: "W", buttonText: "Kontakte auswählen")!
+ controllers.append(describeContactsController)
+ var contacts: [String: [String]] = [:]
+ contacts["A"] = ["Adam", "Alfred", "Anna"]
+ contacts["B"] = ["Bob"]
+ contacts["D"] = []
+ contacts["X"] = ["Xenia", "X"]
+ let contactViewController = IntroContactTableViewController.storyboardInstance(contacts: contacts)!
+ controllers.append(contactViewController)
let pageViewController = IntroPageViewController.storyboardInstance(orderedViewControllers: controllers)
+ pageViewController?.title = "Erklärung"
+
+ description1.skipAction = {_ in pageViewController?.setViewControllers([describeContactsController], direction: .forward, animated: true, completion: nil)}
+ describeContactsController.buttonAction = {_ in describeContactsController.navigationController?.pushViewController(contactViewController, animated: true)}
+
+ contactViewController.title = "Kontakte auswählen"
return pageViewController!
}