home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-14 15:26:40 +10:00
Code Issues Packages Projects Releases Wiki Activity

add PickFeedSkillView

Browse Source
This commit is contained in:
nixzhu
2015-10-22 14:30:07 +08:00
committed by nixzhu
parent 2786def9e9
commit 512fe7df36
5 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Podfile.lock
+1 -1
View File
@@ -52,7 +52,7 @@ DEPENDENCIES:
EXTERNAL SOURCES:
MZFayeClient:
:path: "../CatchLib-iOS/MZFayeClient/"
:path: ../CatchLib-iOS/MZFayeClient/
SPEC CHECKSUMS:
1PasswordExtension: 676a216461ffa9189db66541b5a2465e10ae4743
Yep.xcodeproj/project.pbxproj
+12
View File
@@ -207,6 +207,7 @@
50A640EA1B6F45FA0050E4A3 /* DoNotDisturbPeriodCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 50A640E81B6F45FA0050E4A3 /* DoNotDisturbPeriodCell.xib */; };
50A640EC1B6F4E420050E4A3 /* DoNotDisturbPeriodViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A640EB1B6F4E420050E4A3 /* DoNotDisturbPeriodViewController.swift */; };
50A820241B969B0F007CD30E /* NSTimeZone+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A820231B969B0F007CD30E /* NSTimeZone+Yep.swift */; };
50A93A931BD8B883007005DB /* PickFeedSkillView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A93A921BD8B883007005DB /* PickFeedSkillView.swift */; settings = {ASSET_TAGS = (); }; };
50A9D44B1ACD37A8000B2599 /* NSFileManager+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A9D44A1ACD37A8000B2599 /* NSFileManager+Yep.swift */; };
50A9D44E1ACD382B000B2599 /* NSDateTimeAgo.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 50A9D44C1ACD382B000B2599 /* NSDateTimeAgo.bundle */; };
50A9D4511ACD383E000B2599 /* NSDate+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50A9D4501ACD383E000B2599 /* NSDate+Extension.swift */; };
@@ -510,6 +511,7 @@
50A640E81B6F45FA0050E4A3 /* DoNotDisturbPeriodCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = DoNotDisturbPeriodCell.xib; path = Views/Cells/DoNotDisturb/DoNotDisturbPeriodCell.xib; sourceTree = "<group>"; };
50A640EB1B6F4E420050E4A3 /* DoNotDisturbPeriodViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DoNotDisturbPeriodViewController.swift; path = ViewControllers/DoNotDisturbPeriod/DoNotDisturbPeriodViewController.swift; sourceTree = "<group>"; };
50A820231B969B0F007CD30E /* NSTimeZone+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "NSTimeZone+Yep.swift"; path = "Extensions/NSTimeZone+Yep.swift"; sourceTree = "<group>"; };
50A93A921BD8B883007005DB /* PickFeedSkillView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PickFeedSkillView.swift; path = Views/PickFeedSkill/PickFeedSkillView.swift; sourceTree = "<group>"; };
50A9D44A1ACD37A8000B2599 /* NSFileManager+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "NSFileManager+Yep.swift"; path = "Extensions/NSFileManager+Yep.swift"; sourceTree = "<group>"; };
50A9D44C1ACD382B000B2599 /* NSDateTimeAgo.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = NSDateTimeAgo.bundle; path = Extensions/NSDateTimeAgo.bundle; sourceTree = "<group>"; };
50A9D4501ACD383E000B2599 /* NSDate+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "NSDate+Extension.swift"; path = "Extensions/NSDate+Extension.swift"; sourceTree = "<group>"; };
@@ -994,6 +996,7 @@
50AACEC91BB54132004DD54B /* Feed */,
50F5AF891BBBB2B30033C9BC /* HorizontalLine */,
50535D1B1BCD19B4002FE1A4 /* TouchClosures */,
50A93A941BD8B887007005DB /* PickFeedSkill */,
);
name = Views;
sourceTree = "<group>";
@@ -1676,6 +1679,14 @@
name = DoNotDisturbPeriod;
sourceTree = "<group>";
};
50A93A941BD8B887007005DB /* PickFeedSkill */ = {
isa = PBXGroup;
children = (
50A93A921BD8B883007005DB /* PickFeedSkillView.swift */,
);
name = PickFeedSkill;
sourceTree = "<group>";
};
50A9D4581ACD3943000B2599 /* AudioWaves */ = {
isa = PBXGroup;
children = (
@@ -2311,6 +2322,7 @@
0A9018821B0120A500AE4B7F /* OAuthViewController.swift in Sources */,
508D17471ACCF4710092D666 /* ChatLeftAudioCell.swift in Sources */,
50894D021AEA6433000981AF /* EditProfileLessInfoCell.swift in Sources */,
50A93A931BD8B883007005DB /* PickFeedSkillView.swift in Sources */,
501138261BCB59120055A014 /* FeedConversationsViewController.swift in Sources */,
50894CFA1AEA54BA000981AF /* SettingsMoreCell.swift in Sources */,
50AFBF4B1BB2A44C007D19DA /* InfoView.swift in Sources */,
Yep/ViewControllers/NewFeed/NewFeed.storyboard
+12
View File
@@ -45,17 +45,27 @@
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gN5-mh-uoS" customClass="PickFeedSkillView" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="0.0" y="240" width="375" height="128"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="128" id="b0C-5k-AP6"/>
</constraints>
</view>
</subviews>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="nqc-gK-NZL" secondAttribute="trailing" id="9aV-hx-aoj"/>
<constraint firstItem="gN5-mh-uoS" firstAttribute="leading" secondItem="XTF-TD-X10" secondAttribute="leading" id="Dzf-eG-htD"/>
<constraint firstAttribute="trailing" secondItem="tdd-kc-O7L" secondAttribute="trailing" id="ET6-Wp-sPs"/>
<constraint firstItem="tdd-kc-O7L" firstAttribute="bottom" secondItem="nqc-gK-NZL" secondAttribute="bottom" constant="15" id="Euq-y9-NSv"/>
<constraint firstItem="tdd-kc-O7L" firstAttribute="top" secondItem="XTF-TD-X10" secondAttribute="top" id="HYS-Mm-PNs"/>
<constraint firstItem="nqc-gK-NZL" firstAttribute="leading" secondItem="XTF-TD-X10" secondAttribute="leading" id="be1-Wt-Njn"/>
<constraint firstItem="kWS-hy-hsK" firstAttribute="top" secondItem="P6L-c6-EtM" secondAttribute="bottom" constant="15" id="dKw-0O-6Mx"/>
<constraint firstItem="gN5-mh-uoS" firstAttribute="top" secondItem="tdd-kc-O7L" secondAttribute="bottom" constant="30" id="eBp-FG-Wcs"/>
<constraint firstItem="tdd-kc-O7L" firstAttribute="leading" secondItem="XTF-TD-X10" secondAttribute="leading" id="gkg-5n-b4m"/>
<constraint firstAttribute="trailing" secondItem="gN5-mh-uoS" secondAttribute="trailing" id="jGK-2s-FDF"/>
<constraint firstItem="nqc-gK-NZL" firstAttribute="top" secondItem="kWS-hy-hsK" secondAttribute="bottom" constant="20" id="lP3-le-51b"/>
<constraint firstItem="kWS-hy-hsK" firstAttribute="leading" secondItem="XTF-TD-X10" secondAttribute="leading" constant="15" id="mNE-5D-ygq"/>
<constraint firstAttribute="trailing" secondItem="kWS-hy-hsK" secondAttribute="trailing" constant="15" id="mgZ-OL-1ch"/>
@@ -66,6 +76,8 @@
<outlet property="feedWhiteBGView" destination="tdd-kc-O7L" id="32E-RO-YcU"/>
<outlet property="mediaCollectionView" destination="nqc-gK-NZL" id="vUb-KN-uL1"/>
<outlet property="messageTextView" destination="kWS-hy-hsK" id="r5G-r3-3P5"/>
<outlet property="pickFeedSkillView" destination="gN5-mh-uoS" id="tiD-Yy-d3l"/>
<outlet property="pickFeedSkillViewHeightConstraint" destination="b0C-5k-AP6" id="V1l-cm-HEz"/>
<segue destination="frk-9a-m7E" kind="show" identifier="showPickPhotos" id="Bg2-Jr-e9C"/>
</connections>
</viewController>
Yep/ViewControllers/NewFeed/NewFeedViewController.swift
+3 -1
View File
@@ -20,6 +20,8 @@ class NewFeedViewController: UIViewController {
@IBOutlet weak var messageTextView: UITextView!
@IBOutlet weak var mediaCollectionView: UICollectionView!
@IBOutlet weak var pickFeedSkillView: PickFeedSkillView!
@IBOutlet weak var pickFeedSkillViewHeightConstraint: NSLayoutConstraint!
var imageAssets: [PHAsset] = []
@@ -53,7 +55,7 @@ class NewFeedViewController: UIViewController {
messageTextView.text = ""
messageTextView.textContainer.lineFragmentPadding = 0
messageTextView.textContainerInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
messageTextView.becomeFirstResponder()
//messageTextView.becomeFirstResponder()
mediaCollectionView.backgroundColor = UIColor.clearColor()
Yep/Views/PickFeedSkill/PickFeedSkillView.swift
+50
View File
@@ -0,0 +1,50 @@
//
// PickFeedSkillView.swift
// Yep
//
// Created by nixzhu on 15/10/22.
// Copyright © 2015年 Catch Inc. All rights reserved.
//
import UIKit
class PickFeedSkillView: UIView {
lazy var skillsCollectionView: UICollectionView = {
let view = UICollectionView(frame: CGRectZero, collectionViewLayout: UICollectionViewFlowLayout())
view.backgroundColor = UIColor.redColor()
return view
}()
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
makeUI()
}
override init(frame: CGRect) {
super.init(frame: frame)
makeUI()
}
private func makeUI() {
backgroundColor = UIColor.lightGrayColor()
addSubview(skillsCollectionView)
skillsCollectionView.translatesAutoresizingMaskIntoConstraints = false
let views = [
"skillsCollectionView": skillsCollectionView,
]
let skillsCollectionViewConstraintsH = NSLayoutConstraint.constraintsWithVisualFormat("H:|[skillsCollectionView]|", options: NSLayoutFormatOptions(rawValue: 0), metrics: nil, views: views)
let skillsCollectionViewConstraintsV = NSLayoutConstraint.constraintsWithVisualFormat("V:|[skillsCollectionView]|", options: NSLayoutFormatOptions(rawValue: 0), metrics: nil, views: views)
NSLayoutConstraint.activateConstraints(skillsCollectionViewConstraintsH)
NSLayoutConstraint.activateConstraints(skillsCollectionViewConstraintsV)
}
}