-
Notifications
You must be signed in to change notification settings - Fork 27
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
finished hw #26
Open
ddistant
wants to merge
1
commit into
accesscode-2-2:master
Choose a base branch
from
ddistant:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+687
−16
Open
finished hw #26
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+36.2 KB
...j/project.xcworkspace/xcuserdata/danieldistant.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
5 changes: 5 additions & 0 deletions
5
...rtTwo.xcodeproj/xcuserdata/danieldistant.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<Bucket | ||
type = "1" | ||
version = "2.0"> | ||
</Bucket> |
111 changes: 111 additions & 0 deletions
111
PartTwo/PartTwo.xcodeproj/xcuserdata/danieldistant.xcuserdatad/xcschemes/PartTwo.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,111 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<Scheme | ||
LastUpgradeVersion = "0700" | ||
version = "1.3"> | ||
<BuildAction | ||
parallelizeBuildables = "YES" | ||
buildImplicitDependencies = "YES"> | ||
<BuildActionEntries> | ||
<BuildActionEntry | ||
buildForTesting = "YES" | ||
buildForRunning = "YES" | ||
buildForProfiling = "YES" | ||
buildForArchiving = "YES" | ||
buildForAnalyzing = "YES"> | ||
<BuildableReference | ||
BuildableIdentifier = "primary" | ||
BlueprintIdentifier = "8DD103431BA66E0900CE483B" | ||
BuildableName = "PartTwo.app" | ||
BlueprintName = "PartTwo" | ||
ReferencedContainer = "container:PartTwo.xcodeproj"> | ||
</BuildableReference> | ||
</BuildActionEntry> | ||
</BuildActionEntries> | ||
</BuildAction> | ||
<TestAction | ||
buildConfiguration = "Debug" | ||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
shouldUseLaunchSchemeArgsEnv = "YES"> | ||
<Testables> | ||
<TestableReference | ||
skipped = "NO"> | ||
<BuildableReference | ||
BuildableIdentifier = "primary" | ||
BlueprintIdentifier = "8DD1035C1BA66E0900CE483B" | ||
BuildableName = "PartTwoTests.xctest" | ||
BlueprintName = "PartTwoTests" | ||
ReferencedContainer = "container:PartTwo.xcodeproj"> | ||
</BuildableReference> | ||
</TestableReference> | ||
<TestableReference | ||
skipped = "NO"> | ||
<BuildableReference | ||
BuildableIdentifier = "primary" | ||
BlueprintIdentifier = "8DD103671BA66E0900CE483B" | ||
BuildableName = "PartTwoUITests.xctest" | ||
BlueprintName = "PartTwoUITests" | ||
ReferencedContainer = "container:PartTwo.xcodeproj"> | ||
</BuildableReference> | ||
</TestableReference> | ||
</Testables> | ||
<MacroExpansion> | ||
<BuildableReference | ||
BuildableIdentifier = "primary" | ||
BlueprintIdentifier = "8DD103431BA66E0900CE483B" | ||
BuildableName = "PartTwo.app" | ||
BlueprintName = "PartTwo" | ||
ReferencedContainer = "container:PartTwo.xcodeproj"> | ||
</BuildableReference> | ||
</MacroExpansion> | ||
<AdditionalOptions> | ||
</AdditionalOptions> | ||
</TestAction> | ||
<LaunchAction | ||
buildConfiguration = "Debug" | ||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
launchStyle = "0" | ||
useCustomWorkingDirectory = "NO" | ||
ignoresPersistentStateOnLaunch = "NO" | ||
debugDocumentVersioning = "YES" | ||
debugServiceExtension = "internal" | ||
allowLocationSimulation = "YES"> | ||
<BuildableProductRunnable | ||
runnableDebuggingMode = "0"> | ||
<BuildableReference | ||
BuildableIdentifier = "primary" | ||
BlueprintIdentifier = "8DD103431BA66E0900CE483B" | ||
BuildableName = "PartTwo.app" | ||
BlueprintName = "PartTwo" | ||
ReferencedContainer = "container:PartTwo.xcodeproj"> | ||
</BuildableReference> | ||
</BuildableProductRunnable> | ||
<AdditionalOptions> | ||
</AdditionalOptions> | ||
</LaunchAction> | ||
<ProfileAction | ||
buildConfiguration = "Release" | ||
shouldUseLaunchSchemeArgsEnv = "YES" | ||
savedToolIdentifier = "" | ||
useCustomWorkingDirectory = "NO" | ||
debugDocumentVersioning = "YES"> | ||
<BuildableProductRunnable | ||
runnableDebuggingMode = "0"> | ||
<BuildableReference | ||
BuildableIdentifier = "primary" | ||
BlueprintIdentifier = "8DD103431BA66E0900CE483B" | ||
BuildableName = "PartTwo.app" | ||
BlueprintName = "PartTwo" | ||
ReferencedContainer = "container:PartTwo.xcodeproj"> | ||
</BuildableReference> | ||
</BuildableProductRunnable> | ||
</ProfileAction> | ||
<AnalyzeAction | ||
buildConfiguration = "Debug"> | ||
</AnalyzeAction> | ||
<ArchiveAction | ||
buildConfiguration = "Release" | ||
revealArchiveInOrganizer = "YES"> | ||
</ArchiveAction> | ||
</Scheme> |
32 changes: 32 additions & 0 deletions
32
...PartTwo.xcodeproj/xcuserdata/danieldistant.xcuserdatad/xcschemes/xcschememanagement.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
<plist version="1.0"> | ||
<dict> | ||
<key>SchemeUserState</key> | ||
<dict> | ||
<key>PartTwo.xcscheme</key> | ||
<dict> | ||
<key>orderHint</key> | ||
<integer>0</integer> | ||
</dict> | ||
</dict> | ||
<key>SuppressBuildableAutocreation</key> | ||
<dict> | ||
<key>8DD103431BA66E0900CE483B</key> | ||
<dict> | ||
<key>primary</key> | ||
<true/> | ||
</dict> | ||
<key>8DD1035C1BA66E0900CE483B</key> | ||
<dict> | ||
<key>primary</key> | ||
<true/> | ||
</dict> | ||
<key>8DD103671BA66E0900CE483B</key> | ||
<dict> | ||
<key>primary</key> | ||
<true/> | ||
</dict> | ||
</dict> | ||
</dict> | ||
</plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,44 @@ | ||
<?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" initialViewController="BYZ-38-t0r"> | ||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r"> | ||
<dependencies> | ||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/> | ||
<deployment identifier="iOS"/> | ||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/> | ||
</dependencies> | ||
<scenes> | ||
<!--View Controller--> | ||
<scene sceneID="tne-QT-ifu"> | ||
<objects> | ||
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController"> | ||
<viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController"> | ||
<layoutGuides> | ||
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/> | ||
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/> | ||
</layoutGuides> | ||
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC"> | ||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/> | ||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | ||
<subviews> | ||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Djj-nm-mNM"> | ||
<rect key="frame" x="200" y="175" width="200" height="250"/> | ||
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> | ||
<constraints> | ||
<constraint firstAttribute="height" constant="250" id="gxk-ak-DHC"/> | ||
<constraint firstAttribute="width" constant="200" id="kbP-2Y-sRG"/> | ||
</constraints> | ||
</view> | ||
</subviews> | ||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> | ||
<constraints> | ||
<constraint firstItem="Djj-nm-mNM" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="7VB-RS-mlL"/> | ||
<constraint firstItem="Djj-nm-mNM" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="pWU-yI-sVU"/> | ||
</constraints> | ||
</view> | ||
<connections> | ||
<outlet property="customViewContainer" destination="Djj-nm-mNM" id="uu6-5f-0au"/> | ||
</connections> | ||
</viewController> | ||
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/> | ||
</objects> | ||
<point key="canvasLocation" x="245" y="325"/> | ||
</scene> | ||
</scenes> | ||
</document> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// | ||
// CustomView.h | ||
// PartTwo | ||
// | ||
// Created by Daniel Distant on 9/18/15. | ||
// Copyright © 2015 Mike Kavouras. All rights reserved. | ||
// | ||
|
||
#import <UIKit/UIKit.h> | ||
#import "CustomViewDelegate.h" | ||
|
||
@interface CustomView : UIView | ||
|
||
@property (nonatomic, weak) id <CustomViewDelegate> delegate; | ||
|
||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
// | ||
// CustomView.m | ||
// PartTwo | ||
// | ||
// Created by Daniel Distant on 9/18/15. | ||
// Copyright © 2015 Mike Kavouras. All rights reserved. | ||
// | ||
|
||
#import "CustomView.h" | ||
|
||
@implementation CustomView | ||
|
||
-(void)socialMediaViewDidTapLikeButton:(CustomView *)view { | ||
[self.delegate socialMediaViewDidTapLikeButton:view]; | ||
} | ||
|
||
-(void)socialMediaViewDidTapCommentButton:(CustomView *)view { | ||
[self.delegate socialMediaViewDidTapCommentButton:view]; | ||
} | ||
|
||
-(void)socialMediaViewDidTapShareButton:(CustomView *)view { | ||
[self.delegate socialMediaViewDidTapShareButton:view]; | ||
} | ||
|
||
- (IBAction)likeButtonTapped:(id)sender { | ||
CustomView *view = [[CustomView alloc] init]; | ||
[self socialMediaViewDidTapLikeButton:view]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's no need call another method on self if that other method is only one line of code. You're not making it easier on yourself. Just go ahead and call the delegate directly in this method. |
||
} | ||
|
||
- (IBAction)commentButtonTapped:(id)sender { | ||
CustomView *view = [[CustomView alloc] init]; | ||
[self socialMediaViewDidTapCommentButton:view]; | ||
} | ||
|
||
- (IBAction)shareButtonTapped:(id)sender { | ||
CustomView *view = [[CustomView alloc] init]; | ||
[self socialMediaViewDidTapShareButton:view]; | ||
} | ||
|
||
|
||
|
||
@end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES"> | ||
<dependencies> | ||
<deployment identifier="iOS"/> | ||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/> | ||
</dependencies> | ||
<objects> | ||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> | ||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | ||
<view alpha="0.65000000000000002" contentMode="scaleToFill" id="iN0-l3-epB" customClass="CustomView"> | ||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/> | ||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | ||
<subviews> | ||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZbH-t4-lvi"> | ||
<rect key="frame" x="0.0" y="200" width="600" height="200"/> | ||
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> | ||
<state key="normal" title="Comment"/> | ||
<connections> | ||
<action selector="commentButtonTapped:" destination="iN0-l3-epB" eventType="touchUpInside" id="lxO-VQ-nCi"/> | ||
</connections> | ||
</button> | ||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0i6-8C-Ler"> | ||
<rect key="frame" x="0.0" y="0.0" width="600" height="200"/> | ||
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> | ||
<state key="normal" title="Like"/> | ||
<connections> | ||
<action selector="likeButtonTapped:" destination="iN0-l3-epB" eventType="touchUpInside" id="WCQ-Fr-ur9"/> | ||
</connections> | ||
</button> | ||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dzD-1F-WNZ"> | ||
<rect key="frame" x="0.0" y="400" width="600" height="200"/> | ||
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> | ||
<state key="normal" title="Share"/> | ||
<connections> | ||
<action selector="shareButtonTapped:" destination="iN0-l3-epB" eventType="touchUpInside" id="fAT-lv-LBw"/> | ||
</connections> | ||
</button> | ||
</subviews> | ||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> | ||
<constraints> | ||
<constraint firstItem="0i6-8C-Ler" firstAttribute="height" secondItem="ZbH-t4-lvi" secondAttribute="height" id="3P0-jV-Vrm"/> | ||
<constraint firstItem="ZbH-t4-lvi" firstAttribute="top" secondItem="0i6-8C-Ler" secondAttribute="bottom" id="5Y6-rO-883"/> | ||
<constraint firstAttribute="bottom" secondItem="dzD-1F-WNZ" secondAttribute="bottom" id="6ME-MZ-VlV"/> | ||
<constraint firstItem="dzD-1F-WNZ" firstAttribute="top" secondItem="ZbH-t4-lvi" secondAttribute="bottom" id="FSU-LK-Jxc"/> | ||
<constraint firstAttribute="trailing" secondItem="dzD-1F-WNZ" secondAttribute="trailing" id="L25-EF-NcI"/> | ||
<constraint firstAttribute="trailing" secondItem="0i6-8C-Ler" secondAttribute="trailing" id="PrO-2Y-0lW"/> | ||
<constraint firstItem="dzD-1F-WNZ" firstAttribute="top" secondItem="ZbH-t4-lvi" secondAttribute="bottom" id="ZCz-Pg-LGp"/> | ||
<constraint firstAttribute="trailing" secondItem="ZbH-t4-lvi" secondAttribute="trailing" id="eHP-Tu-A85"/> | ||
<constraint firstItem="dzD-1F-WNZ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="fh1-nJ-1cs"/> | ||
<constraint firstItem="ZbH-t4-lvi" firstAttribute="top" secondItem="0i6-8C-Ler" secondAttribute="bottom" id="gNI-er-jpf"/> | ||
<constraint firstItem="ZbH-t4-lvi" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="ofz-yg-1bt"/> | ||
<constraint firstItem="0i6-8C-Ler" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="pqo-6U-hIt"/> | ||
<constraint firstItem="0i6-8C-Ler" firstAttribute="width" secondItem="dzD-1F-WNZ" secondAttribute="width" id="r7u-mn-Mh0"/> | ||
<constraint firstItem="0i6-8C-Ler" firstAttribute="width" secondItem="ZbH-t4-lvi" secondAttribute="width" id="txA-Tv-X69"/> | ||
<constraint firstItem="0i6-8C-Ler" firstAttribute="height" secondItem="dzD-1F-WNZ" secondAttribute="height" id="vmo-Z1-bHe"/> | ||
<constraint firstItem="0i6-8C-Ler" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="xca-S9-HSO"/> | ||
</constraints> | ||
</view> | ||
</objects> | ||
</document> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure what you're trying to do by creating a new instance of
CustomView
. You should not do that and you should just passself
as the parameter insocialMediaViewDidTapLikeButton
.