From 83e903088c59c7db713087029a053548cd1d699d Mon Sep 17 00:00:00 2001 From: nixzhu Date: Thu, 2 Jul 2015 14:00:08 +0800 Subject: [PATCH 01/26] add badge to User --- Yep/AppDelegate.swift | 4 ++-- Yep/Realm/Models.swift | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Yep/AppDelegate.swift b/Yep/AppDelegate.swift index 2be56c39..a2107c31 100644 --- a/Yep/AppDelegate.swift +++ b/Yep/AppDelegate.swift @@ -23,7 +23,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool { - setSchemaVersion(12, Realm.defaultPath, { migration, oldSchemaVersion in + setSchemaVersion(13, Realm.defaultPath, { migration, oldSchemaVersion in // We haven’t migrated anything yet, so oldSchemaVersion == 0 if oldSchemaVersion < 1 { // Nothing to do! @@ -63,7 +63,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { } } - if oldSchemaVersion < 12 { + if oldSchemaVersion < 13 { } }) diff --git a/Yep/Realm/Models.swift b/Yep/Realm/Models.swift index fe7e666f..1a8b338c 100644 --- a/Yep/Realm/Models.swift +++ b/Yep/Realm/Models.swift @@ -73,6 +73,7 @@ class User: Object { dynamic var introduction: String = "" dynamic var avatarURLString: String = "" dynamic var avatar: Avatar? + dynamic var badge: String = "" dynamic var createdUnixTime: NSTimeInterval = NSDate().timeIntervalSince1970 dynamic var lastSignInUnixTime: NSTimeInterval = NSDate().timeIntervalSince1970 From be8cf8550d4c2636974f7d5d168eea69f96bc2ff Mon Sep 17 00:00:00 2001 From: nixzhu Date: Thu, 2 Jul 2015 14:16:41 +0800 Subject: [PATCH 02/26] 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 = ""; }; 0AEB1CC51B0E742400178C9C /* Double+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Double+Yep.swift"; path = "Extensions/Double+Yep.swift"; sourceTree = ""; }; 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 = ""; }; + 500A0B1B1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EditNicknameAndBadgeViewController.swift; path = ViewControllers/EditNicknameAndBadge/EditNicknameAndBadgeViewController.swift; sourceTree = ""; }; 501560D61B427FD6000933F0 /* Results+Yep.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "Results+Yep.swift"; path = "Extensions/Results+Yep.swift"; sourceTree = ""; }; 50165C441AC2860900C7AEBE /* ConversationLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ConversationLayout.swift; path = ViewControllers/Conversation/ConversationLayout.swift; sourceTree = ""; }; 5019F6301B39BFE00000D993 /* ConversationMoreView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ConversationMoreView.swift; path = Views/ConversationMore/ConversationMoreView.swift; sourceTree = ""; }; @@ -651,6 +653,14 @@ name = JPush; sourceTree = ""; }; + 500A0B1D1B450C2F00D49358 /* EditNicknameAndBadge */ = { + isa = PBXGroup; + children = ( + 500A0B1B1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift */, + ); + name = EditNicknameAndBadge; + sourceTree = ""; + }; 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 @@ -