From e9996fa02c9a3ac13ef656089af26437620357da Mon Sep 17 00:00:00 2001 From: nixzhu Date: Thu, 9 Apr 2015 15:38:07 +0800 Subject: [PATCH] normal UINavigationBar & UITabBar --- Yep.xcodeproj/project.pbxproj | 16 +++++++ Yep/AppDelegate.swift | 8 ++-- Yep/Views/Cells/UserState/UserStateCell.swift | 24 +++++++++++ Yep/Views/Cells/UserState/UserStateCell.xib | 42 +++++++++++++++++++ 4 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 Yep/Views/Cells/UserState/UserStateCell.swift create mode 100644 Yep/Views/Cells/UserState/UserStateCell.xib diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 132e154d..4683b599 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -80,6 +80,8 @@ 506EC20A1AC95BFC00CE42B3 /* UIFont+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 506EC2091AC95BFC00CE42B3 /* UIFont+Yep.swift */; }; 5076C56A1AC46B9F00B22952 /* FayeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5076C5691AC46B9F00B22952 /* FayeService.swift */; }; 508C2AA01AD648B2002B8097 /* SearchUsersViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508C2A9F1AD648B2002B8097 /* SearchUsersViewController.swift */; }; + 508C2AA41AD661B3002B8097 /* UserStateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508C2AA21AD661B3002B8097 /* UserStateCell.swift */; }; + 508C2AA51AD661B3002B8097 /* UserStateCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 508C2AA31AD661B3002B8097 /* UserStateCell.xib */; }; 508D17401ACCD2740092D666 /* YepButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508D173F1ACCD2740092D666 /* YepButton.swift */; }; 508D17441ACCDC9F0092D666 /* VoiceRecordButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508D17431ACCDC9F0092D666 /* VoiceRecordButton.swift */; }; 508D17471ACCF4710092D666 /* ChatLeftAudioCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 508D17451ACCF4710092D666 /* ChatLeftAudioCell.swift */; }; @@ -197,6 +199,8 @@ 506EC2091AC95BFC00CE42B3 /* UIFont+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIFont+Yep.swift"; path = "Extensions/UIFont+Yep.swift"; sourceTree = ""; }; 5076C5691AC46B9F00B22952 /* FayeService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FayeService.swift; path = Services/FayeService.swift; sourceTree = ""; }; 508C2A9F1AD648B2002B8097 /* SearchUsersViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SearchUsersViewController.swift; path = ViewControllers/SearchUsers/SearchUsersViewController.swift; sourceTree = ""; }; + 508C2AA21AD661B3002B8097 /* UserStateCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserStateCell.swift; path = Views/Cells/UserState/UserStateCell.swift; sourceTree = ""; }; + 508C2AA31AD661B3002B8097 /* UserStateCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UserStateCell.xib; path = Views/Cells/UserState/UserStateCell.xib; sourceTree = ""; }; 508D173F1ACCD2740092D666 /* YepButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepButton.swift; path = Views/Buttons/YepButton.swift; sourceTree = ""; }; 508D17431ACCDC9F0092D666 /* VoiceRecordButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = VoiceRecordButton.swift; path = Views/MessageToolbar/VoiceRecordButton.swift; sourceTree = ""; }; 508D17451ACCF4710092D666 /* ChatLeftAudioCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ChatLeftAudioCell.swift; path = Views/Cells/ChatLeftAudio/ChatLeftAudioCell.swift; sourceTree = ""; }; @@ -454,6 +458,7 @@ 50CDBE441ACA9B4600459CE0 /* ChatRightImage */, 508D17491ACCF4740092D666 /* ChatLeftAudio */, 508D174E1ACCF49F0092D666 /* ChatRightAudio */, + 508C2AA61AD661B8002B8097 /* UserState */, ); name = Cells; sourceTree = ""; @@ -649,6 +654,15 @@ name = SearchUsers; sourceTree = ""; }; + 508C2AA61AD661B8002B8097 /* UserState */ = { + isa = PBXGroup; + children = ( + 508C2AA21AD661B3002B8097 /* UserStateCell.swift */, + 508C2AA31AD661B3002B8097 /* UserStateCell.xib */, + ); + name = UserState; + sourceTree = ""; + }; 508D17491ACCF4740092D666 /* ChatLeftAudio */ = { isa = PBXGroup; children = ( @@ -860,6 +874,7 @@ 0A8F54B61AB67D11004AD60E /* Main.storyboard in Resources */, 5033159D1AC101C80008A209 /* ChatRightTextCell.xib in Resources */, 50CDBE431ACA9B4200459CE0 /* ChatRightImageCell.xib in Resources */, + 508C2AA51AD661B3002B8097 /* UserStateCell.xib in Resources */, 50E114FD1ABC549300F13000 /* ContactsCell.xib in Resources */, 502AE54F1AB93175005BD199 /* ProfileHeaderCell.xib in Resources */, 0A8F54BB1AB67D11004AD60E /* LaunchScreen.xib in Resources */, @@ -967,6 +982,7 @@ 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */, 50A9D4571ACD393A000B2599 /* YepWaverView.swift in Sources */, 50165C451AC2860900C7AEBE /* ConversationLayout.swift in Sources */, + 508C2AA41AD661B3002B8097 /* UserStateCell.swift in Sources */, 0A5D83941AC5D3C8000045BF /* YepTabBarController.swift in Sources */, 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */, 50CDBE461ACA9F2200459CE0 /* ImageCache.swift in Sources */, diff --git a/Yep/AppDelegate.swift b/Yep/AppDelegate.swift index ce24963a..f304eb0e 100644 --- a/Yep/AppDelegate.swift +++ b/Yep/AppDelegate.swift @@ -206,15 +206,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate { UINavigationBar.appearance().titleTextAttributes = textAttributes - UINavigationBar.appearance().setBackgroundImage(UIImage(named:"white"), forBarMetrics: .Default) - UINavigationBar.appearance().shadowImage = UIImage() + //UINavigationBar.appearance().setBackgroundImage(UIImage(named:"white"), forBarMetrics: .Default) + //UINavigationBar.appearance().shadowImage = UIImage() //UINavigationBar.appearance().translucent = false // TabBar - UITabBar.appearance().backgroundImage = UIImage(named:"white") - UITabBar.appearance().shadowImage = UIImage() + //UITabBar.appearance().backgroundImage = UIImage(named:"white") + //UITabBar.appearance().shadowImage = UIImage() UITabBar.appearance().tintColor = UIColor.yepTintColor() //UITabBar.appearance().translucent = false } diff --git a/Yep/Views/Cells/UserState/UserStateCell.swift b/Yep/Views/Cells/UserState/UserStateCell.swift new file mode 100644 index 00000000..34cfbde1 --- /dev/null +++ b/Yep/Views/Cells/UserState/UserStateCell.swift @@ -0,0 +1,24 @@ +// +// UserStateCell.swift +// Yep +// +// Created by NIX on 15/4/9. +// Copyright (c) 2015年 Catch Inc. All rights reserved. +// + +import UIKit + +class UserStateCell: UITableViewCell { + + 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/UserState/UserStateCell.xib b/Yep/Views/Cells/UserState/UserStateCell.xib new file mode 100644 index 00000000..83edcc86 --- /dev/null +++ b/Yep/Views/Cells/UserState/UserStateCell.xib @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +