From 33dcda5382cb477fe4dfad04367ad6045fc16ce8 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Tue, 5 May 2015 06:45:49 +0800 Subject: [PATCH] add PickLocationCell --- Yep.xcodeproj/project.pbxproj | 16 +++++ Yep/Base.lproj/Main.storyboard | 4 ++ .../Contents.json | 12 ++++ .../icon_current_location.pdf | Bin 0 -> 4242 bytes .../Contents.json | 12 ++++ .../icon_location_checkmark.pdf | Bin 0 -> 3910 bytes .../PickLocationViewController.swift | 21 ++++++ .../Cells/PickLocation/PickLocationCell.swift | 31 +++++++++ .../Cells/PickLocation/PickLocationCell.xib | 60 ++++++++++++++++++ 9 files changed, 156 insertions(+) create mode 100644 Yep/Images.xcassets/icon_current_location.imageset/Contents.json create mode 100644 Yep/Images.xcassets/icon_current_location.imageset/icon_current_location.pdf create mode 100644 Yep/Images.xcassets/icon_location_checkmark.imageset/Contents.json create mode 100644 Yep/Images.xcassets/icon_location_checkmark.imageset/icon_location_checkmark.pdf create mode 100644 Yep/Views/Cells/PickLocation/PickLocationCell.swift create mode 100644 Yep/Views/Cells/PickLocation/PickLocationCell.xib diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 9c924553..101541ce 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -80,6 +80,8 @@ 504F415B1AD5028200FBB19A /* SkillCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 504F41591AD5028200FBB19A /* SkillCell.xib */; }; 5053AD4A1AF772C500B3CBFA /* PickLocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5053AD491AF772C500B3CBFA /* PickLocationViewController.swift */; }; 5053AD4D1AF79EEA00B3CBFA /* UserPickedLocationPin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5053AD4C1AF79EEA00B3CBFA /* UserPickedLocationPin.swift */; }; + 5053AD501AF82A1700B3CBFA /* PickLocationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5053AD4E1AF82A1700B3CBFA /* PickLocationCell.swift */; }; + 5053AD511AF82A1700B3CBFA /* PickLocationCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5053AD4F1AF82A1700B3CBFA /* PickLocationCell.xib */; }; 50553F8F1ADB8BA200F80B59 /* ChatSectionDateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50553F8D1ADB8BA200F80B59 /* ChatSectionDateCell.swift */; }; 50553F901ADB8BA200F80B59 /* ChatSectionDateCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 50553F8E1ADB8BA200F80B59 /* ChatSectionDateCell.xib */; }; 50553F931ADBA50600F80B59 /* NSDate+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50553F921ADBA50600F80B59 /* NSDate+Yep.swift */; }; @@ -244,6 +246,8 @@ 504F41591AD5028200FBB19A /* SkillCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = SkillCell.xib; path = Views/Cells/Skill/SkillCell.xib; sourceTree = ""; }; 5053AD491AF772C500B3CBFA /* PickLocationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PickLocationViewController.swift; path = ViewControllers/PickLocation/PickLocationViewController.swift; sourceTree = ""; }; 5053AD4C1AF79EEA00B3CBFA /* UserPickedLocationPin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserPickedLocationPin.swift; path = ViewControllers/PickLocation/UserPickedLocationPin.swift; sourceTree = ""; }; + 5053AD4E1AF82A1700B3CBFA /* PickLocationCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PickLocationCell.swift; path = Views/Cells/PickLocation/PickLocationCell.swift; sourceTree = ""; }; + 5053AD4F1AF82A1700B3CBFA /* PickLocationCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = PickLocationCell.xib; path = Views/Cells/PickLocation/PickLocationCell.xib; sourceTree = ""; }; 50553F8D1ADB8BA200F80B59 /* ChatSectionDateCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChatSectionDateCell.swift; path = Views/Cells/ChatSectionDate/ChatSectionDateCell.swift; sourceTree = ""; }; 50553F8E1ADB8BA200F80B59 /* ChatSectionDateCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ChatSectionDateCell.xib; path = Views/Cells/ChatSectionDate/ChatSectionDateCell.xib; sourceTree = ""; }; 50553F921ADBA50600F80B59 /* NSDate+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "NSDate+Yep.swift"; path = "Extensions/NSDate+Yep.swift"; sourceTree = ""; }; @@ -567,6 +571,7 @@ 50894D041AEA6439000981AF /* EditProfileLessInfo */, 50894D091AEDFDA6000981AF /* EditProfileMoreInfo */, 50894D0E1AEE017B000981AF /* EditProfileColoredTitle */, + 5053AD521AF82A1E00B3CBFA /* PickLocation */, ); name = Cells; sourceTree = ""; @@ -776,6 +781,15 @@ name = PickLocation; sourceTree = ""; }; + 5053AD521AF82A1E00B3CBFA /* PickLocation */ = { + isa = PBXGroup; + children = ( + 5053AD4E1AF82A1700B3CBFA /* PickLocationCell.swift */, + 5053AD4F1AF82A1700B3CBFA /* PickLocationCell.xib */, + ); + name = PickLocation; + sourceTree = ""; + }; 50553F911ADB8BA600F80B59 /* ChatSectionDate */ = { isa = PBXGroup; children = ( @@ -1174,6 +1188,7 @@ 50E114FD1ABC549300F13000 /* ContactsCell.xib in Resources */, 502AE54F1AB93175005BD199 /* ProfileHeaderCell.xib in Resources */, 0A8F54BB1AB67D11004AD60E /* LaunchScreen.xib in Resources */, + 5053AD511AF82A1700B3CBFA /* PickLocationCell.xib in Resources */, 0A8F54B81AB67D11004AD60E /* Images.xcassets in Resources */, 50EB8CC51AE89F12001AC1EE /* ChatRightVideoCell.xib in Resources */, 502AE5191AB70D72005BD199 /* Intro.storyboard in Resources */, @@ -1355,6 +1370,7 @@ 50894CF51AEA4A01000981AF /* SettingsUserCell.swift in Sources */, 504F415A1AD5028200FBB19A /* SkillCell.swift in Sources */, 50894D0C1AEE0177000981AF /* EditProfileColoredTitleCell.swift in Sources */, + 5053AD501AF82A1700B3CBFA /* PickLocationCell.swift in Sources */, 5023DE521AB6C51300B3EE96 /* CGRect+Yep.swift in Sources */, 5053AD4A1AF772C500B3CBFA /* PickLocationViewController.swift in Sources */, ); diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index bac38637..a1486c2a 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -182,6 +182,10 @@ + + + + diff --git a/Yep/Images.xcassets/icon_current_location.imageset/Contents.json b/Yep/Images.xcassets/icon_current_location.imageset/Contents.json new file mode 100644 index 00000000..f23a51d2 --- /dev/null +++ b/Yep/Images.xcassets/icon_current_location.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "icon_current_location.pdf" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Yep/Images.xcassets/icon_current_location.imageset/icon_current_location.pdf b/Yep/Images.xcassets/icon_current_location.imageset/icon_current_location.pdf new file mode 100644 index 0000000000000000000000000000000000000000..423bc7a475058ffde02f2495f01fd9e7ab685079 GIT binary patch literal 4242 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 literal 0 HcmV?d00001 diff --git a/Yep/ViewControllers/PickLocation/PickLocationViewController.swift b/Yep/ViewControllers/PickLocation/PickLocationViewController.swift index 63c0b30f..6d6e5056 100644 --- a/Yep/ViewControllers/PickLocation/PickLocationViewController.swift +++ b/Yep/ViewControllers/PickLocation/PickLocationViewController.swift @@ -22,9 +22,14 @@ class PickLocationViewController: UIViewController { var userPickedLocationPin: UserPickedLocationPin? + let pickLocationCellIdentifier = "PickLocationCell" + override func viewDidLoad() { super.viewDidLoad() + tableView.registerNib(UINib(nibName: pickLocationCellIdentifier, bundle: nil), forCellReuseIdentifier: pickLocationCellIdentifier) + tableView.rowHeight = 50 + sendButton.enabled = false mapView.showsUserLocation = true @@ -138,3 +143,19 @@ extension PickLocationViewController: UISearchBarDelegate { }) } } + +extension PickLocationViewController: UITableViewDataSource, UITableViewDelegate { + func numberOfSectionsInTableView(tableView: UITableView) -> Int { + return 1 + } + + func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return 4 + } + + func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell { + let cell = tableView.dequeueReusableCellWithIdentifier(pickLocationCellIdentifier) as! PickLocationCell + return cell + } +} + diff --git a/Yep/Views/Cells/PickLocation/PickLocationCell.swift b/Yep/Views/Cells/PickLocation/PickLocationCell.swift new file mode 100644 index 00000000..abd5d891 --- /dev/null +++ b/Yep/Views/Cells/PickLocation/PickLocationCell.swift @@ -0,0 +1,31 @@ +// +// PickLocationCell.swift +// Yep +// +// Created by NIX on 15/5/5. +// Copyright (c) 2015年 Catch Inc. All rights reserved. +// + +import UIKit + +class PickLocationCell: UITableViewCell { + + @IBOutlet weak var iconImageView: UIImageView! + + @IBOutlet weak var locationLabel: UILabel! + + @IBOutlet weak var checkImageView: UIImageView! + + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Yep/Views/Cells/PickLocation/PickLocationCell.xib b/Yep/Views/Cells/PickLocation/PickLocationCell.xib new file mode 100644 index 00000000..e2bfe204 --- /dev/null +++ b/Yep/Views/Cells/PickLocation/PickLocationCell.xib @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +