Skip to content

Commit

Permalink
Aiding collaboration
Browse files Browse the repository at this point in the history
  • Loading branch information
@coryalder
coryalder committed Jul 3, 2015
1 parent 5cc5f0d commit 06c30d5
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 83 deletions.
6 changes: 6 additions & 0 deletions Conflicts.xcodeproj/project.pbxproj
View file
Expand Up @@ -15,6 +15,7 @@
8B5939591B46F955005480E4 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8B5939581B46F955005480E4 /* Images.xcassets */; };
8B59395C1B46F955005480E4 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8B59395A1B46F955005480E4 /* LaunchScreen.xib */; };
8B5939681B46F956005480E4 /* ConflictsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B5939671B46F956005480E4 /* ConflictsTests.m */; };
8BC83D681B4726660071983A /* SecondStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8BC83D671B4726660071983A /* SecondStoryboard.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -43,6 +44,7 @@
8B5939611B46F956005480E4 /* ConflictsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ConflictsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8B5939661B46F956005480E4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8B5939671B46F956005480E4 /* ConflictsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ConflictsTests.m; sourceTree = "<group>"; };
8BC83D671B4726660071983A /* SecondStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SecondStoryboard.storyboard; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -91,6 +93,7 @@
8B5939521B46F955005480E4 /* DetailViewController.h */,
8B5939531B46F955005480E4 /* DetailViewController.m */,
8B5939551B46F955005480E4 /* Main.storyboard */,
8BC83D671B4726660071983A /* SecondStoryboard.storyboard */,
8B5939581B46F955005480E4 /* Images.xcassets */,
8B59395A1B46F955005480E4 /* LaunchScreen.xib */,
8B5939481B46F955005480E4 /* Supporting Files */,
Expand Down Expand Up @@ -207,6 +210,7 @@
8B5939571B46F955005480E4 /* Main.storyboard in Resources */,
8B59395C1B46F955005480E4 /* LaunchScreen.xib in Resources */,
8B5939591B46F955005480E4 /* Images.xcassets in Resources */,
8BC83D681B4726660071983A /* SecondStoryboard.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -422,6 +426,7 @@
8B59396D1B46F956005480E4 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8B59396E1B46F956005480E4 /* Build configuration list for PBXNativeTarget "ConflictsTests" */ = {
isa = XCConfigurationList;
Expand All @@ -430,6 +435,7 @@
8B5939701B46F956005480E4 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
85 changes: 2 additions & 83 deletions Conflicts/Base.lproj/Main.storyboard
View file
Expand Up @@ -88,7 +88,7 @@
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<segue destination="Jvb-tp-Vqw" kind="presentation" id="aiz-OS-6q3"/>
<action selector="showNextSection:" destination="Ah7-4n-0Wa" eventType="touchUpInside" id="ol7-9R-eX4"/>
</connections>
</button>
</subviews>
Expand All @@ -108,88 +108,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="lrm-kH-fPn" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1343" y="64"/>
</scene>
<!--Root View Controller-->
<scene sceneID="1BK-iP-pBj">
<objects>
<tableViewController id="rR0-uo-b7O" customClass="MasterViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="0Tq-kD-UDr">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="vRP-vh-KaT">
<rect key="frame" x="0.0" y="86" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vRP-vh-KaT" id="Gw5-db-UBQ">
<rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
<autoresizingMask key="autoresizingMask"/>
</tableViewCellContentView>
<connections>
<segue destination="bxa-OV-WSV" kind="show" identifier="showDetail" id="aLh-YW-IMD"/>
</connections>
</tableViewCell>
</prototypes>
<connections>
<outlet property="dataSource" destination="rR0-uo-b7O" id="GsL-Y4-rLr"/>
<outlet property="delegate" destination="rR0-uo-b7O" id="CAM-jX-AyR"/>
</connections>
</tableView>
<navigationItem key="navigationItem" title="Root View Controller" id="Jdt-by-lFj"/>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dat-rr-2TW" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2798" y="-522"/>
</scene>
<!--Detail View Controller-->
<scene sceneID="Wxi-AJ-awe">
<objects>
<viewController id="bxa-OV-WSV" customClass="DetailViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="jc4-ia-5bp"/>
<viewControllerLayoutGuide type="bottom" id="iqq-OQ-ZQa"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="hWa-lg-KeY">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mBK-gY-ekK">
<rect key="frame" x="279" y="289" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="centerY" secondItem="mBK-gY-ekK" secondAttribute="centerY" constant="1" id="Gzo-Tb-XHE"/>
<constraint firstAttribute="centerX" secondItem="mBK-gY-ekK" secondAttribute="centerX" id="vQg-yi-T4q"/>
</constraints>
</view>
<connections>
<outlet property="detailDescriptionLabel" destination="mBK-gY-ekK" id="SjS-a5-Lcu"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="5DS-z2-C8k" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="3568" y="-522"/>
</scene>
<!--Navigation Controller-->
<scene sceneID="uay-bP-aku">
<objects>
<navigationController id="Jvb-tp-Vqw" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" id="HKq-tP-BkU">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
</navigationBar>
<connections>
<segue destination="rR0-uo-b7O" kind="relationship" relationship="rootViewController" id="REu-h6-EsV"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="b2V-Sb-RC2" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2092" y="-516"/>
<point key="canvasLocation" x="1561" y="-26"/>
</scene>
</scenes>
</document>
12 changes: 12 additions & 0 deletions Conflicts/DetailViewController.m
View file
Expand Up @@ -15,6 +15,18 @@ @interface DetailViewController ()
@implementation DetailViewController

#pragma mark - Managing the detail item
- (IBAction)showNextSection:(id)sender {

UIStoryboard *storyboardTwo = [UIStoryboard storyboardWithName:@"SecondStoryboard" bundle:nil];

// [storyboardTwo instantiateViewControllerWithIdentifier:<#(nonnull NSString *)#>]

UIViewController *vc = [storyboardTwo instantiateInitialViewController];

[self presentViewController:vc animated:YES completion:nil];


}

- (void)setDetailItem:(id)newDetailItem {
if (_detailItem != newDetailItem) {
Expand Down
8 changes: 8 additions & 0 deletions Conflicts/MasterViewController.m
View file
Expand Up @@ -83,6 +83,14 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
} else if (editingStyle == UITableViewCellEditingStyleInsert) {
// Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view.
}
}


-(void)tableView:(nonnull UITableView *)tableView didSelectRowAtIndexPath:(nonnull NSIndexPath *)indexPath {




}

@end
7 changes: 7 additions & 0 deletions Conflicts/SecondStoryboard.storyboard
View file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
</dependencies>
<scenes/>
</document>

0 comments on commit 06c30d5

Please sign in to comment.