From be8cf8550d4c2636974f7d5d168eea69f96bc2ff Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Thu, 2 Jul 2015 14:16:41 +0800
Subject: [PATCH] add EditNicknameAndBadgeViewController

---
 Yep.xcodeproj/project.pbxproj                 | 12 ++++++++++
 Yep/Base.lproj/Main.storyboard                | 22 ++++++++++++++++++-
 .../EditNicknameAndBadgeViewController.swift  | 13 +++++++++++
 .../EditProfileViewController.swift           |  4 ++++
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 Yep/ViewControllers/EditNicknameAndBadge/EditNicknameAndBadgeViewController.swift

diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj
index 9d6fdb52..5393b6cc 100644
--- a/Yep.xcodeproj/project.pbxproj
+++ b/Yep.xcodeproj/project.pbxproj
@@ -49,6 +49,7 @@
 		0AEB1CC41B0E6A4B00178C9C /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AEB1CC31B0E6A4B00178C9C /* Crashlytics.framework */; };
 		0AEB1CC61B0E742400178C9C /* Double+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AEB1CC51B0E742400178C9C /* Double+Yep.swift */; };
 		15606C18E1487982869C0A42 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD88F6095DB46DFAD41AB5DB /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
+		500A0B1C1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 500A0B1B1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift */; };
 		501560D71B427FD6000933F0 /* Results+Yep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 501560D61B427FD6000933F0 /* Results+Yep.swift */; };
 		50165C451AC2860900C7AEBE /* ConversationLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50165C441AC2860900C7AEBE /* ConversationLayout.swift */; };
 		5019F6311B39BFE00000D993 /* ConversationMoreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5019F6301B39BFE00000D993 /* ConversationMoreView.swift */; };
@@ -272,6 +273,7 @@
 		0AEB1CC31B0E6A4B00178C9C /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
 		0AEB1CC51B0E742400178C9C /* Double+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Double+Yep.swift"; path = "Extensions/Double+Yep.swift"; sourceTree = "<group>"; };
 		2268251A75FF6766DC31CCFB /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
+		500A0B1B1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EditNicknameAndBadgeViewController.swift; path = ViewControllers/EditNicknameAndBadge/EditNicknameAndBadgeViewController.swift; sourceTree = "<group>"; };
 		501560D61B427FD6000933F0 /* Results+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Results+Yep.swift"; path = "Extensions/Results+Yep.swift"; sourceTree = "<group>"; };
 		50165C441AC2860900C7AEBE /* ConversationLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ConversationLayout.swift; path = ViewControllers/Conversation/ConversationLayout.swift; sourceTree = "<group>"; };
 		5019F6301B39BFE00000D993 /* ConversationMoreView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ConversationMoreView.swift; path = Views/ConversationMore/ConversationMoreView.swift; sourceTree = "<group>"; };
@@ -651,6 +653,14 @@
 			name = JPush;
 			sourceTree = "<group>";
 		};
+		500A0B1D1B450C2F00D49358 /* EditNicknameAndBadge */ = {
+			isa = PBXGroup;
+			children = (
+				500A0B1B1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift */,
+			);
+			name = EditNicknameAndBadge;
+			sourceTree = "<group>";
+		};
 		5019F62F1B39BFCB0000D993 /* ConversationMore */ = {
 			isa = PBXGroup;
 			children = (
@@ -692,6 +702,7 @@
 				0A5D83951AC5D3CD000045BF /* TabBar */,
 				50894CF21AEA472B000981AF /* Settings */,
 				50894CFF1AEA5A7E000981AF /* EditProfile */,
+				500A0B1D1B450C2F00D49358 /* EditNicknameAndBadge */,
 				0A1CAC6C1AFA3D8C00826B45 /* SkillHome */,
 				507CF1691AFC84AA00E261B4 /* CustomNavigationBar */,
 				0A9018831B0120A800AE4B7F /* OAuth */,
@@ -1716,6 +1727,7 @@
 				503315971AC1017E0008A209 /* ChatLeftTextCell.swift in Sources */,
 				0A8F54B11AB67D11004AD60E /* AppDelegate.swift in Sources */,
 				508F8FC81B0161EF00461B0B /* ProfileSeparationLineCell.swift in Sources */,
+				500A0B1C1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift in Sources */,
 				501560D71B427FD6000933F0 /* Results+Yep.swift in Sources */,
 				0AEB1CC61B0E742400178C9C /* Double+Yep.swift in Sources */,
 				508D174C1ACCF49B0092D666 /* ChatRightAudioCell.swift in Sources */,
diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard
index f817cd96..904723f9 100644
--- a/Yep/Base.lproj/Main.storyboard
+++ b/Yep/Base.lproj/Main.storyboard
@@ -125,7 +125,7 @@
                                             <userDefinedRuntimeAttribute type="string" keyPath="title" value="Choose photo"/>
                                         </userDefinedRuntimeAttributes>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HcA-7v-16m" userLabel="Take Photo Button" customClass="MessageTypeButton" customModule="Yep" customModuleProvider="target">
                                         <rect key="frame" x="213" y="20" width="174" height="260"/>
                                         <animations/>
                                         <state key="normal">
@@ -1006,6 +1006,7 @@
                         <outlet property="avatarImageViewWidthConstraint" destination="fy0-3p-Tx4" id="u5u-Us-aIh"/>
                         <outlet property="editProfileTableView" destination="obf-ax-Bn7" id="wPW-Jg-rwD"/>
                         <outlet property="mobileLabel" destination="bhV-NM-wXG" id="rUc-6h-9GQ"/>
+                        <segue destination="Qvk-OD-4nT" kind="show" identifier="showEditNicknameAndBadge" id="5UK-4O-uHu"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="u2y-XJ-4gR" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1017,6 +1018,25 @@
             </objects>
             <point key="canvasLocation" x="3586" y="717"/>
         </scene>
+        <!--Edit Nickname And Badge View Controller-->
+        <scene sceneID="Yuw-PA-8ae">
+            <objects>
+                <viewController storyboardIdentifier="EditNicknameAndBadgeViewController" id="Qvk-OD-4nT" customClass="EditNicknameAndBadgeViewController" customModule="Yep" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Qtg-cD-ChL"/>
+                        <viewControllerLayoutGuide type="bottom" id="UF2-dG-DVJ"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="ORd-Vt-Ajx">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <animations/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="OgW-zN-m0d" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="4287" y="717"/>
+        </scene>
         <!--Yep Tab Bar Controller-->
         <scene sceneID="vud-lc-IAG">
             <objects>
diff --git a/Yep/ViewControllers/EditNicknameAndBadge/EditNicknameAndBadgeViewController.swift b/Yep/ViewControllers/EditNicknameAndBadge/EditNicknameAndBadgeViewController.swift
new file mode 100644
index 00000000..b4142811
--- /dev/null
+++ b/Yep/ViewControllers/EditNicknameAndBadge/EditNicknameAndBadgeViewController.swift
@@ -0,0 +1,13 @@
+//
+//  EditNicknameAndBadgeViewController.swift
+//  Yep
+//
+//  Created by NIX on 15/7/2.
+//  Copyright (c) 2015年 Catch Inc. All rights reserved.
+//
+
+import UIKit
+
+class EditNicknameAndBadgeViewController: UIViewController {
+    
+}
\ No newline at end of file
diff --git a/Yep/ViewControllers/EditProfile/EditProfileViewController.swift b/Yep/ViewControllers/EditProfile/EditProfileViewController.swift
index 9e714bb2..dc9bb8eb 100644
--- a/Yep/ViewControllers/EditProfile/EditProfileViewController.swift
+++ b/Yep/ViewControllers/EditProfile/EditProfileViewController.swift
@@ -238,6 +238,9 @@ extension EditProfileViewController: UITableViewDataSource, UITableViewDelegate
 
             case InfoRow.Name.rawValue:
 
+                performSegueWithIdentifier("showEditNicknameAndBadge", sender: nil)
+
+                /*
                 YepAlert.textInput(title: NSLocalizedString("Change nickname", comment: ""), placeholder: YepUserDefaults.nickname.value, oldText: YepUserDefaults.nickname.value, confirmTitle: NSLocalizedString("OK", comment: ""), cancelTitle: NSLocalizedString("Cancel", comment: ""), inViewController: self, withConfirmAction: { newNickname in
 
                     if let oldNickname = YepUserDefaults.nickname.value {
@@ -262,6 +265,7 @@ extension EditProfileViewController: UITableViewDataSource, UITableViewDelegate
                     })
 
                 }, cancelAction: nil)
+                */
 
             case InfoRow.Intro.rawValue: