Storyboard files grouped in a folder
authorXavier Algarra <xavier@pep-project.org>
Thu, 20 Apr 2017 12:40:45 +0200
changeset 2036a457601d646a
parent 2035 bfeb21a80800
child 2037 6629e06a6650
Storyboard files grouped in a folder
pEpForiOS.xcodeproj/project.pbxproj
pEpForiOS/Base.lproj/Main.storyboard
pEpForiOS/UI/EmailDisplay/EmailListViewController.swift
pEpForiOS/UI/FolderViews.storyboard
     1.1 --- a/pEpForiOS.xcodeproj/project.pbxproj	Thu Apr 20 11:55:49 2017 +0200
     1.2 +++ b/pEpForiOS.xcodeproj/project.pbxproj	Thu Apr 20 12:40:45 2017 +0200
     1.3 @@ -452,7 +452,7 @@
     1.4  		B729BEC51E7C35E200793110 /* FilterUpdateProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FilterUpdateProtocol.swift; path = Filter/ViewModel/FilterUpdateProtocol.swift; sourceTree = "<group>"; };
     1.5  		B740B75C1E4B1C2D002585E1 /* jsonMimeType.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = jsonMimeType.txt; sourceTree = "<group>"; };
     1.6  		B740B75E1E4B1C46002585E1 /* MimeTypeUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MimeTypeUtil.swift; sourceTree = "<group>"; };
     1.7 -		B783C1511E82BBE20093128C /* FolderViews.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = FolderViews.storyboard; sourceTree = "<group>"; };
     1.8 +		B783C1511E82BBE20093128C /* FolderViews.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = FolderViews.storyboard; path = UI/FolderViews.storyboard; sourceTree = "<group>"; };
     1.9  		B78CF8241E76D706008C1739 /* FilterTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FilterTableViewController.swift; path = Filter/FilterTableViewController.swift; sourceTree = "<group>"; };
    1.10  		B78CF8281E76E0F1008C1739 /* FilterViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FilterViewModel.swift; path = Filter/ViewModel/FilterViewModel.swift; sourceTree = "<group>"; };
    1.11  		B78CF82A1E76E146008C1739 /* FilterCellViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FilterCellViewModel.swift; path = Filter/ViewModel/FilterCellViewModel.swift; sourceTree = "<group>"; };
    1.12 @@ -715,6 +715,7 @@
    1.13  		43980E251CBD0BC900A7FC3C /* pEpForiOS */ = {
    1.14  			isa = PBXGroup;
    1.15  			children = (
    1.16 +				B706C0EF1EA8C378006B2F6C /* Storyboardfiles */,
    1.17  				43800D8C1D112A0800821E34 /* HTMLParser */,
    1.18  				431144A61CC0CB0A0007639D /* Background */,
    1.19  				43E58EB21CBF8301008AA7A7 /* Models */,
    1.20 @@ -725,9 +726,6 @@
    1.21  				43980E261CBD0BC900A7FC3C /* AppDelegate.swift */,
    1.22  				431394C01E4B11CF00D92F33 /* AppSettings.swift */,
    1.23  				43980E301CBD0BCA00A7FC3C /* Assets.xcassets */,
    1.24 -				43980E2A1CBD0BC900A7FC3C /* Main.storyboard */,
    1.25 -				438D5A721EA77E45001A37E1 /* Handshake.storyboard */,
    1.26 -				43980E321CBD0BCA00A7FC3C /* LaunchScreen.storyboard */,
    1.27  				43980EEA1CBD24F100A7FC3C /* pEpForiOS-Bridging-Header.h */,
    1.28  				43980E351CBD0BCA00A7FC3C /* Info.plist */,
    1.29  				433724FC1DA2C2B1005E8DF5 /* pEp.entitlements */,
    1.30 @@ -941,6 +939,17 @@
    1.31  			name = Frameworks;
    1.32  			sourceTree = "<group>";
    1.33  		};
    1.34 +		B706C0EF1EA8C378006B2F6C /* Storyboardfiles */ = {
    1.35 +			isa = PBXGroup;
    1.36 +			children = (
    1.37 +				43980E2A1CBD0BC900A7FC3C /* Main.storyboard */,
    1.38 +				438D5A721EA77E45001A37E1 /* Handshake.storyboard */,
    1.39 +				43980E321CBD0BCA00A7FC3C /* LaunchScreen.storyboard */,
    1.40 +				B783C1511E82BBE20093128C /* FolderViews.storyboard */,
    1.41 +			);
    1.42 +			name = Storyboardfiles;
    1.43 +			sourceTree = "<group>";
    1.44 +		};
    1.45  		B71EBBB41E55E43100150177 /* Folder */ = {
    1.46  			isa = PBXGroup;
    1.47  			children = (
    1.48 @@ -994,7 +1003,6 @@
    1.49  		B783C14D1E82A5230093128C /* View */ = {
    1.50  			isa = PBXGroup;
    1.51  			children = (
    1.52 -				B783C1511E82BBE20093128C /* FolderViews.storyboard */,
    1.53  			);
    1.54  			name = View;
    1.55  			sourceTree = "<group>";
    1.56 @@ -1547,7 +1555,7 @@
    1.57  				CODE_SIGN_ENTITLEMENTS = pEp.entitlements;
    1.58  				CODE_SIGN_IDENTITY = "iPhone Developer";
    1.59  				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
    1.60 -				DEVELOPMENT_TEAM = "";
    1.61 +				DEVELOPMENT_TEAM = SBPJ2E4G5X;
    1.62  				INFOPLIST_FILE = pEpForiOS/Info.plist;
    1.63  				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
    1.64  				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
    1.65 @@ -1570,7 +1578,7 @@
    1.66  				CODE_SIGN_ENTITLEMENTS = pEp.entitlements;
    1.67  				CODE_SIGN_IDENTITY = "iPhone Developer";
    1.68  				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
    1.69 -				DEVELOPMENT_TEAM = "";
    1.70 +				DEVELOPMENT_TEAM = SBPJ2E4G5X;
    1.71  				INFOPLIST_FILE = pEpForiOS/Info.plist;
    1.72  				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
    1.73  				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
     2.1 --- a/pEpForiOS/Base.lproj/Main.storyboard	Thu Apr 20 11:55:49 2017 +0200
     2.2 +++ b/pEpForiOS/Base.lproj/Main.storyboard	Thu Apr 20 12:40:45 2017 +0200
     2.3 @@ -152,7 +152,7 @@
     2.4                      <navigationItem key="navigationItem" title="Inbox" id="bgm-ua-A0f">
     2.5                          <barButtonItem key="leftBarButtonItem" title="Folders" id="QCE-EG-qmM">
     2.6                              <connections>
     2.7 -                                <action selector="folderButtonPressed:" destination="kcA-RK-9Xg" id="WPO-fq-4t6"/>
     2.8 +                                <segue destination="zK6-Pe-MeR" kind="show" id="Jql-JI-Dwo"/>
     2.9                              </connections>
    2.10                          </barButtonItem>
    2.11                          <barButtonItem key="rightBarButtonItem" title="Accounts" id="1rc-mQ-T0F">
    2.12 @@ -1477,6 +1477,14 @@
    2.13              </objects>
    2.14              <point key="canvasLocation" x="5991" y="-1163"/>
    2.15          </scene>
    2.16 +        <!--FolderViews-->
    2.17 +        <scene sceneID="9j8-vu-u1w">
    2.18 +            <objects>
    2.19 +                <viewControllerPlaceholder storyboardName="FolderViews" id="zK6-Pe-MeR" sceneMemberID="viewController"/>
    2.20 +                <placeholder placeholderIdentifier="IBFirstResponder" id="fCg-fB-8wj" userLabel="First Responder" sceneMemberID="firstResponder"/>
    2.21 +            </objects>
    2.22 +            <point key="canvasLocation" x="6753" y="-999"/>
    2.23 +        </scene>
    2.24          <!--Navigation Controller-->
    2.25          <scene sceneID="lah-4i-EpU">
    2.26              <objects>
    2.27 @@ -2028,8 +2036,8 @@
    2.28          <image name="unread-icon" width="22" height="22"/>
    2.29      </resources>
    2.30      <inferredMetricsTieBreakers>
    2.31 +        <segue reference="ohe-5h-dsJ"/>
    2.32          <segue reference="Na7-CM-lbe"/>
    2.33 -        <segue reference="70T-Gu-VTr"/>
    2.34 -        <segue reference="ohe-5h-dsJ"/>
    2.35 +        <segue reference="xmi-xn-p8T"/>
    2.36      </inferredMetricsTieBreakers>
    2.37  </document>
     3.1 --- a/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Thu Apr 20 11:55:49 2017 +0200
     3.2 +++ b/pEpForiOS/UI/EmailDisplay/EmailListViewController.swift	Thu Apr 20 12:40:45 2017 +0200
     3.3 @@ -61,14 +61,6 @@
     3.4      }
     3.5  
     3.6  
     3.7 -    @IBAction func folderButtonPressed(_ sender: Any) {
     3.8 -        var folderStoryboard: UIStoryboard!
     3.9 -        folderStoryboard = UIStoryboard(name: "FolderViews", bundle: nil)
    3.10 -        let viewController : UIViewController = folderStoryboard.instantiateViewController(withIdentifier: "Folders") as! FolderTableViewController
    3.11 -        self.navigationController?.pushViewController(viewController , animated: true)
    3.12 -        //self.window!.rootViewController = viewcontroller
    3.13 -    }
    3.14 -
    3.15      override func viewWillDisappear(_ animated: Bool) {
    3.16          super.viewWillDisappear(animated)
    3.17          MessageModelConfig.messageFolderDelegate = nil
     4.1 --- a/pEpForiOS/UI/FolderViews.storyboard	Thu Apr 20 11:55:49 2017 +0200
     4.2 +++ b/pEpForiOS/UI/FolderViews.storyboard	Thu Apr 20 12:40:45 2017 +0200
     4.3 @@ -1,10 +1,10 @@
     4.4  <?xml version="1.0" encoding="UTF-8"?>
     4.5 -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     4.6 +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="6ra-tc-Aiv">
     4.7      <device id="retina4_7" orientation="portrait">
     4.8          <adaptation id="fullscreen"/>
     4.9      </device>
    4.10      <dependencies>
    4.11 -        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
    4.12 +        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
    4.13          <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    4.14      </dependencies>
    4.15      <scenes>