Skip to content

Commit

Permalink
Change Interface Controller Design.
Browse files Browse the repository at this point in the history
  • Loading branch information
André Schneider committed Jul 13, 2015
1 parent f258f7f commit 4ca3035
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 73 deletions.
49 changes: 18 additions & 31 deletions Designer News WatchKit App/Base.lproj/Interface.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<table alignment="left" id="ilo-Ad-4YG">
<items>
<tableRow identifier="StoryRowController" id="epb-uf-1UQ" customClass="StoryRowController" customModule="Designer_News_WatchKit_Extension">
<group key="rootItem" width="1" height="0.0" alignment="left" layout="vertical" id="iRd-E0-dHv">
<group key="rootItem" width="1" height="0.0" alignment="left" layout="vertical" spacing="6" id="iRd-E0-dHv">
<items>
<group width="1" alignment="left" spacing="6" id="UE9-bb-ueW">
<items>
Expand All @@ -36,22 +36,24 @@
<label alignment="left" text="Title" numberOfLines="0" id="xe6-H2-mXy"/>
</items>
</group>
<group width="1" alignment="left" id="7gP-2U-3pJ">
<group width="1" alignment="left" id="QWj-Sf-X5J">
<items>
<label alignment="left" verticalAlignment="center" text="upvotes:" id="2Ao-wK-dxO">
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="font" style="UICTFontTextStyleSubhead"/>
</label>
<label alignment="left" verticalAlignment="center" text="12" id="zkD-dF-iMl"/>
</items>
</group>
<group width="1" alignment="left" id="UmV-ue-JiC">
<items>
<label alignment="left" verticalAlignment="center" text="comments:" id="hDJ-Hu-Anb">
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="font" style="UICTFontTextStyleSubhead"/>
</label>
<label alignment="left" verticalAlignment="center" text="2" id="VgZ-ce-qqE"/>
<button alignment="left" id="hKb-4C-SYb">
<group key="contentGroup" width="0.5" alignment="left" id="5Vr-qg-zdn">
<items>
<imageView width="24" height="24" alignment="left" verticalAlignment="center" id="FQa-Kq-11f"/>
<label alignment="left" verticalAlignment="center" text="12" id="zkD-dF-iMl"/>
</items>
</group>
</button>
<button alignment="left" id="AKR-pv-FrQ">
<group key="contentGroup" width="0.5" alignment="left" id="LYg-3l-D8U">
<items>
<imageView width="24" height="24" alignment="left" verticalAlignment="center" id="Ugb-EV-kdw"/>
<label alignment="left" verticalAlignment="center" text="2" id="VgZ-ce-qqE"/>
</items>
</group>
</button>
</items>
</group>
</items>
Expand All @@ -63,7 +65,6 @@
<outlet property="commentCountLabel" destination="VgZ-ce-qqE" id="b4n-WB-sLD"/>
<outlet property="titleLabel" destination="xe6-H2-mXy" id="2Ab-iP-hRq"/>
<outlet property="upvoteCountLabel" destination="zkD-dF-iMl" id="cYk-nK-Hh0"/>
<segue destination="cKl-bI-9tF" kind="modal" id="TfK-Z1-w97"/>
</connections>
</tableRow>
</items>
Expand All @@ -76,20 +77,6 @@
</objects>
<point key="canvasLocation" x="668" y="459"/>
</scene>
<!--StoryInterfaceController-->
<scene sceneID="GB5-QP-CjN">
<objects>
<controller identifier="StoryInterfaceController" id="cKl-bI-9tF" customClass="StoryInterfaceController" customModule="Designer_News_WatchKit_Extension">
<items>
<label alignment="left" text="Label" id="pZK-J7-pao"/>
</items>
<connections>
<outlet property="storyLabel" destination="pZK-J7-pao" id="Fhw-pD-PGG"/>
</connections>
</controller>
</objects>
<point key="canvasLocation" x="907" y="459"/>
</scene>
</scenes>
<color key="tintColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</document>
4 changes: 0 additions & 4 deletions Designer News WatchKit Extension/StoriesInterfaceController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ class StoriesInterfaceController: WKInterfaceController {
super.willActivate()
}

override func contextForSegueWithIdentifier(segueIdentifier: String, inTable table: WKInterfaceTable, rowIndex: Int) -> AnyObject? {
return stories[rowIndex]
}

private func configureRowAtIndex(index: Int, withStory story: Story) {
if let row = self.table.rowControllerAtIndex(index) as? StoryRowController {
row.titleLabel.setText(story.title)
Expand Down
32 changes: 0 additions & 32 deletions Designer News WatchKit Extension/StoryInterfaceController.swift
View file

This file was deleted.

4 changes: 0 additions & 4 deletions DesignerNewsApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
B7C1F7AD1B4EED170077D4B4 /* WKInterfaceTableExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7C1F7AC1B4EED170077D4B4 /* WKInterfaceTableExtension.swift */; };
B7C1F7AF1B4EFC070077D4B4 /* MainInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7C1F7AE1B4EFC070077D4B4 /* MainInterfaceController.swift */; };
B7E4D3371A719855001DC9B6 /* CommentTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7E4D3361A719855001DC9B6 /* CommentTableViewCell.swift */; };
B7E5718D1B5123F90097A9E6 /* StoryInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B7E5718C1B5123F90097A9E6 /* StoryInterfaceController.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -353,7 +352,6 @@
B7C1F7AC1B4EED170077D4B4 /* WKInterfaceTableExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WKInterfaceTableExtension.swift; sourceTree = "<group>"; };
B7C1F7AE1B4EFC070077D4B4 /* MainInterfaceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainInterfaceController.swift; sourceTree = "<group>"; };
B7E4D3361A719855001DC9B6 /* CommentTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommentTableViewCell.swift; sourceTree = "<group>"; };
B7E5718C1B5123F90097A9E6 /* StoryInterfaceController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryInterfaceController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -770,7 +768,6 @@
children = (
B78071B51B4D244D00A7F728 /* StoriesInterfaceController.swift */,
B7C1F7AE1B4EFC070077D4B4 /* MainInterfaceController.swift */,
B7E5718C1B5123F90097A9E6 /* StoryInterfaceController.swift */,
);
name = "Interface Controller";
sourceTree = "<group>";
Expand Down Expand Up @@ -1207,7 +1204,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B7E5718D1B5123F90097A9E6 /* StoryInterfaceController.swift in Sources */,
B7C1F7AF1B4EFC070077D4B4 /* MainInterfaceController.swift in Sources */,
B711C6881B4D5E0500CA8D28 /* StoryRowController.swift in Sources */,
B78071B61B4D244D00A7F728 /* StoriesInterfaceController.swift in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions DesignerNewsApp.xcodeproj/project.xcworkspace/xcshareddata/DesignerNewsApp.xccheckout
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>IDESourceControlProjectIdentifier</key>
<string>1EB55E8E-587E-4698-8839-EC213CD1E4ED</string>
<key>IDESourceControlProjectName</key>
<string>project</string>
<string>DesignerNewsApp</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>2CC69C7EFC439AC727F09E33B49EFBD1D2365CBA</key>
Expand All @@ -22,7 +22,7 @@
<string>https://github.com/Cocoanetics/DTFoundation.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>DesignerNewsApp.xcodeproj/project.xcworkspace</string>
<string>DesignerNewsApp.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>2CC69C7EFC439AC727F09E33B49EFBD1D2365CBA</key>
Expand Down

0 comments on commit 4ca3035

Please sign in to comment.