From 3c12e8cd9a64ba1d816a4d4bf94dc2912e7cc950 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:09:59 +0800 Subject: [PATCH 01/16] split About --- Yep.xcodeproj/project.pbxproj | 4 ++++ Yep/Base.lproj/Main.storyboard | 18 +++++++++++++----- Yep/ViewControllers/About/About.storyboard | 7 +++++++ 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 Yep/ViewControllers/About/About.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index a152b7c2..913e185e 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -250,6 +250,7 @@ 50DEE03F1BE729FD00015741 /* PickLocation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE03E1BE729FD00015741 /* PickLocation.storyboard */; }; 50DEE0411BE7626100015741 /* YepHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50DEE0401BE7626100015741 /* YepHelpers.swift */; }; 50DEE0431BE8B3CD00015741 /* Feedback.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0421BE8B3CD00015741 /* Feedback.storyboard */; }; + 50DEE0451BEA025100015741 /* About.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0441BEA025100015741 /* About.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -571,6 +572,7 @@ 50DEE03E1BE729FD00015741 /* PickLocation.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = PickLocation.storyboard; path = ViewControllers/PickLocation/PickLocation.storyboard; sourceTree = ""; }; 50DEE0401BE7626100015741 /* YepHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepHelpers.swift; path = Helpers/YepHelpers.swift; sourceTree = ""; }; 50DEE0421BE8B3CD00015741 /* Feedback.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Feedback.storyboard; path = ViewControllers/Feedback/Feedback.storyboard; sourceTree = ""; }; + 50DEE0441BEA025100015741 /* About.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = About.storyboard; path = ViewControllers/About/About.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -1918,6 +1920,7 @@ isa = PBXGroup; children = ( 50E3488D1B905C0100A8E699 /* AboutViewController.swift */, + 50DEE0441BEA025100015741 /* About.storyboard */, ); name = About; sourceTree = ""; @@ -2268,6 +2271,7 @@ 50E1CE8F1BE0BFF00025B933 /* MediaViewCell.xib in Resources */, 505EC8181ADF8151001D27E0 /* SkillCategoryCell.xib in Resources */, 6A8215091BCBE8F10011F36C /* DiscoverSkillCell.xib in Resources */, + 50DEE0451BEA025100015741 /* About.storyboard in Resources */, 50DEE0371BE3720F00015741 /* LoadMoreCollectionViewCell.xib in Resources */, 505EC81D1ADFBE1B001D27E0 /* SkillSelectionCell.xib in Resources */, 50EB8CC01AE89ED8001AC1EE /* ChatLeftVideoCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index f36b6ac9..11362829 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -416,8 +416,8 @@ - + @@ -893,6 +893,14 @@ + + + + + + + + @@ -917,18 +925,18 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1820,7 +1697,6 @@ - diff --git a/Yep/ViewControllers/About/About.storyboard b/Yep/ViewControllers/About/About.storyboard index 673e0f7e..7af469cc 100644 --- a/Yep/ViewControllers/About/About.storyboard +++ b/Yep/ViewControllers/About/About.storyboard @@ -1,7 +1,96 @@ - + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Yep/ViewControllers/PodsHelpYep/PodsHelpYep.storyboard b/Yep/ViewControllers/PodsHelpYep/PodsHelpYep.storyboard new file mode 100644 index 00000000..2d12b9b5 --- /dev/null +++ b/Yep/ViewControllers/PodsHelpYep/PodsHelpYep.storyboard @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4bac83223060c00412a280adfd5013e213b8c3b3 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:26:31 +0800 Subject: [PATCH 03/16] split SocialWorks --- Yep.xcodeproj/project.pbxproj | 4 + Yep/Base.lproj/Main.storyboard | 230 ++---------------- .../SocialWorks/SocialWorks.storyboard | 210 ++++++++++++++++ 3 files changed, 235 insertions(+), 209 deletions(-) create mode 100644 Yep/ViewControllers/SocialWorks/SocialWorks.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index d67ca446..1945cdf0 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -252,6 +252,7 @@ 50DEE0431BE8B3CD00015741 /* Feedback.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0421BE8B3CD00015741 /* Feedback.storyboard */; }; 50DEE0451BEA025100015741 /* About.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0441BEA025100015741 /* About.storyboard */; }; 50DEE0471BEA030900015741 /* PodsHelpYep.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0461BEA030900015741 /* PodsHelpYep.storyboard */; }; + 50DEE0491BEA04CC00015741 /* SocialWorks.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0481BEA04CC00015741 /* SocialWorks.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -575,6 +576,7 @@ 50DEE0421BE8B3CD00015741 /* Feedback.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Feedback.storyboard; path = ViewControllers/Feedback/Feedback.storyboard; sourceTree = ""; }; 50DEE0441BEA025100015741 /* About.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = About.storyboard; path = ViewControllers/About/About.storyboard; sourceTree = ""; }; 50DEE0461BEA030900015741 /* PodsHelpYep.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = PodsHelpYep.storyboard; path = ViewControllers/PodsHelpYep/PodsHelpYep.storyboard; sourceTree = ""; }; + 50DEE0481BEA04CC00015741 /* SocialWorks.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SocialWorks.storyboard; path = ViewControllers/SocialWorks/SocialWorks.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -1662,6 +1664,7 @@ 508F8FCB1B01C7FC00461B0B /* SocialWorkGithubViewController.swift */, 508F8FD31B01E3D100461B0B /* SocialWorkDribbbleViewController.swift */, 508F8FDA1B0479E700461B0B /* SocialWorkInstagramViewController.swift */, + 50DEE0481BEA04CC00015741 /* SocialWorks.storyboard */, ); name = SocialWorks; sourceTree = ""; @@ -2249,6 +2252,7 @@ 50DEE02D1BE209FF00015741 /* DeletedFeedConversationCell.xib in Resources */, 5053AD561AF83B0F00B3CBFA /* ChatRightLocationCell.xib in Resources */, 50553F901ADB8BA200F80B59 /* ChatSectionDateCell.xib in Resources */, + 50DEE0491BEA04CC00015741 /* SocialWorks.storyboard in Resources */, 501813261BA07CED0025873C /* Activities.xcassets in Resources */, 502AE5411AB88862005BD199 /* SkillRankCell.xib in Resources */, 508F8FD11B01D04400461B0B /* GithubRepoCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index 6ec4d171..d4f6bd3d 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -3,7 +3,6 @@ - @@ -370,11 +369,11 @@ - - - + + + @@ -1392,6 +1391,14 @@ + + + + + + + + @@ -1446,215 +1453,21 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1678,7 +1491,6 @@ - diff --git a/Yep/ViewControllers/SocialWorks/SocialWorks.storyboard b/Yep/ViewControllers/SocialWorks/SocialWorks.storyboard new file mode 100644 index 00000000..a27b104c --- /dev/null +++ b/Yep/ViewControllers/SocialWorks/SocialWorks.storyboard @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From dad91ba9c5ceeafe5ab42aeb942ead797796110d Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:31:23 +0800 Subject: [PATCH 04/16] split OAuth --- Yep.xcodeproj/project.pbxproj | 4 + Yep/Base.lproj/Main.storyboard | 92 +++------------------- Yep/ViewControllers/OAuth/OAuth.storyboard | 83 +++++++++++++++++++ 3 files changed, 99 insertions(+), 80 deletions(-) create mode 100644 Yep/ViewControllers/OAuth/OAuth.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 1945cdf0..1c307eeb 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -253,6 +253,7 @@ 50DEE0451BEA025100015741 /* About.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0441BEA025100015741 /* About.storyboard */; }; 50DEE0471BEA030900015741 /* PodsHelpYep.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0461BEA030900015741 /* PodsHelpYep.storyboard */; }; 50DEE0491BEA04CC00015741 /* SocialWorks.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0481BEA04CC00015741 /* SocialWorks.storyboard */; }; + 50DEE04B1BEA071100015741 /* OAuth.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04A1BEA071100015741 /* OAuth.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -577,6 +578,7 @@ 50DEE0441BEA025100015741 /* About.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = About.storyboard; path = ViewControllers/About/About.storyboard; sourceTree = ""; }; 50DEE0461BEA030900015741 /* PodsHelpYep.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = PodsHelpYep.storyboard; path = ViewControllers/PodsHelpYep/PodsHelpYep.storyboard; sourceTree = ""; }; 50DEE0481BEA04CC00015741 /* SocialWorks.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SocialWorks.storyboard; path = ViewControllers/SocialWorks/SocialWorks.storyboard; sourceTree = ""; }; + 50DEE04A1BEA071100015741 /* OAuth.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OAuth.storyboard; path = ViewControllers/OAuth/OAuth.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -803,6 +805,7 @@ isa = PBXGroup; children = ( 0A9018811B0120A500AE4B7F /* OAuthViewController.swift */, + 50DEE04A1BEA071100015741 /* OAuth.storyboard */, ); name = OAuth; sourceTree = ""; @@ -2254,6 +2257,7 @@ 50553F901ADB8BA200F80B59 /* ChatSectionDateCell.xib in Resources */, 50DEE0491BEA04CC00015741 /* SocialWorks.storyboard in Resources */, 501813261BA07CED0025873C /* Activities.xcassets in Resources */, + 50DEE04B1BEA071100015741 /* OAuth.storyboard in Resources */, 502AE5411AB88862005BD199 /* SkillRankCell.xib in Resources */, 508F8FD11B01D04400461B0B /* GithubRepoCell.xib in Resources */, 6A5632941BC911CB00397B53 /* DiscoverNormalUserCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index d4f6bd3d..da1071b7 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -368,12 +368,12 @@ - + @@ -562,62 +562,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1364,25 +1308,6 @@ - - - - - - - - - - - - - - - - - - - @@ -1397,7 +1322,7 @@ - + @@ -1453,13 +1378,21 @@ + + + + + + + + - + @@ -1467,7 +1400,7 @@ - + @@ -1505,7 +1438,6 @@ - diff --git a/Yep/ViewControllers/OAuth/OAuth.storyboard b/Yep/ViewControllers/OAuth/OAuth.storyboard new file mode 100644 index 00000000..a53e3e01 --- /dev/null +++ b/Yep/ViewControllers/OAuth/OAuth.storyboard @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4d570bc5fd368f332688f7bffb321e719df1fc30 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:35:36 +0800 Subject: [PATCH 05/16] split EditNicknameAndBadge --- Yep.xcodeproj/project.pbxproj | 4 + Yep/Base.lproj/Main.storyboard | 261 +----------------- .../EditNicknameAndBadge.storyboard | 245 ++++++++++++++++ 3 files changed, 255 insertions(+), 255 deletions(-) create mode 100644 Yep/ViewControllers/EditNicknameAndBadge/EditNicknameAndBadge.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 1c307eeb..de40d7bf 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -254,6 +254,7 @@ 50DEE0471BEA030900015741 /* PodsHelpYep.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0461BEA030900015741 /* PodsHelpYep.storyboard */; }; 50DEE0491BEA04CC00015741 /* SocialWorks.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0481BEA04CC00015741 /* SocialWorks.storyboard */; }; 50DEE04B1BEA071100015741 /* OAuth.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04A1BEA071100015741 /* OAuth.storyboard */; }; + 50DEE04D1BEA085F00015741 /* EditNicknameAndBadge.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -579,6 +580,7 @@ 50DEE0461BEA030900015741 /* PodsHelpYep.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = PodsHelpYep.storyboard; path = ViewControllers/PodsHelpYep/PodsHelpYep.storyboard; sourceTree = ""; }; 50DEE0481BEA04CC00015741 /* SocialWorks.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SocialWorks.storyboard; path = ViewControllers/SocialWorks/SocialWorks.storyboard; sourceTree = ""; }; 50DEE04A1BEA071100015741 /* OAuth.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OAuth.storyboard; path = ViewControllers/OAuth/OAuth.storyboard; sourceTree = ""; }; + 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditNicknameAndBadge.storyboard; path = ViewControllers/EditNicknameAndBadge/EditNicknameAndBadge.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -846,6 +848,7 @@ isa = PBXGroup; children = ( 500A0B1B1B450C2100D49358 /* EditNicknameAndBadgeViewController.swift */, + 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */, ); name = EditNicknameAndBadge; sourceTree = ""; @@ -2294,6 +2297,7 @@ 508F8FDF1B049ACF00461B0B /* InstagramMediaCell.xib in Resources */, 848806B11B789A2D000C5424 /* EditSkillCell.xib in Resources */, 50E114FD1ABC549300F13000 /* ContactsCell.xib in Resources */, + 50DEE04D1BEA085F00015741 /* EditNicknameAndBadge.storyboard in Resources */, 502AE54F1AB93175005BD199 /* ProfileHeaderCell.xib in Resources */, 503807241BDA18040068345E /* FeedSkillUsersCell.xib in Resources */, 50F5AF9A1BBBD02A0033C9BC /* FeedMediaCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index da1071b7..be19f60d 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -4,7 +4,6 @@ - @@ -658,7 +657,7 @@ - + @@ -844,260 +843,13 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + @@ -1424,7 +1176,6 @@ - diff --git a/Yep/ViewControllers/EditNicknameAndBadge/EditNicknameAndBadge.storyboard b/Yep/ViewControllers/EditNicknameAndBadge/EditNicknameAndBadge.storyboard new file mode 100644 index 00000000..973435b8 --- /dev/null +++ b/Yep/ViewControllers/EditNicknameAndBadge/EditNicknameAndBadge.storyboard @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From bfe1ad0ffd665893021166f2ae436e7c6ce55a3a Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:38:47 +0800 Subject: [PATCH 06/16] split EditProfile --- Yep.xcodeproj/project.pbxproj | 4 + Yep/Base.lproj/Main.storyboard | 129 ++---------------- .../EditProfile/EditProfile.storyboard | 124 +++++++++++++++++ 3 files changed, 137 insertions(+), 120 deletions(-) create mode 100644 Yep/ViewControllers/EditProfile/EditProfile.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index de40d7bf..4ab74a88 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -255,6 +255,7 @@ 50DEE0491BEA04CC00015741 /* SocialWorks.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0481BEA04CC00015741 /* SocialWorks.storyboard */; }; 50DEE04B1BEA071100015741 /* OAuth.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04A1BEA071100015741 /* OAuth.storyboard */; }; 50DEE04D1BEA085F00015741 /* EditNicknameAndBadge.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */; }; + 50DEE04F1BEA092100015741 /* EditProfile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04E1BEA092100015741 /* EditProfile.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -581,6 +582,7 @@ 50DEE0481BEA04CC00015741 /* SocialWorks.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SocialWorks.storyboard; path = ViewControllers/SocialWorks/SocialWorks.storyboard; sourceTree = ""; }; 50DEE04A1BEA071100015741 /* OAuth.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OAuth.storyboard; path = ViewControllers/OAuth/OAuth.storyboard; sourceTree = ""; }; 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditNicknameAndBadge.storyboard; path = ViewControllers/EditNicknameAndBadge/EditNicknameAndBadge.storyboard; sourceTree = ""; }; + 50DEE04E1BEA092100015741 /* EditProfile.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditProfile.storyboard; path = ViewControllers/EditProfile/EditProfile.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -1580,6 +1582,7 @@ isa = PBXGroup; children = ( 50894CFD1AEA5A78000981AF /* EditProfileViewController.swift */, + 50DEE04E1BEA092100015741 /* EditProfile.storyboard */, ); name = EditProfile; sourceTree = ""; @@ -2276,6 +2279,7 @@ 5008A1931B8DB8B500E94274 /* Localizable.strings in Resources */, 50894CF61AEA4A01000981AF /* SettingsUserCell.xib in Resources */, 6ADDB4501B848C600012877A /* 1Password.xcassets in Resources */, + 50DEE04F1BEA092100015741 /* EditProfile.storyboard in Resources */, 508D17481ACCF4710092D666 /* ChatLeftAudioCell.xib in Resources */, 0A8F54B61AB67D11004AD60E /* Main.storyboard in Resources */, 5033159D1AC101C80008A209 /* ChatRightTextCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index be19f60d..e382d32b 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -3,7 +3,6 @@ - @@ -412,10 +411,10 @@ - + @@ -561,114 +560,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -827,6 +718,14 @@ + + + + + + + + @@ -843,14 +742,6 @@ - - - - - - - - @@ -1187,9 +1078,7 @@ - - diff --git a/Yep/ViewControllers/EditProfile/EditProfile.storyboard b/Yep/ViewControllers/EditProfile/EditProfile.storyboard new file mode 100644 index 00000000..276936c7 --- /dev/null +++ b/Yep/ViewControllers/EditProfile/EditProfile.storyboard @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 00e673d89fb3a377d79a47f3b180db1fd7ff7817 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:42:03 +0800 Subject: [PATCH 07/16] split BlackList --- Yep.xcodeproj/project.pbxproj | 4 ++ Yep/Base.lproj/Main.storyboard | 50 +++--------------- .../BlackList/BlackList.storyboard | 52 +++++++++++++++++++ 3 files changed, 62 insertions(+), 44 deletions(-) create mode 100644 Yep/ViewControllers/BlackList/BlackList.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 4ab74a88..4e639504 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -256,6 +256,7 @@ 50DEE04B1BEA071100015741 /* OAuth.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04A1BEA071100015741 /* OAuth.storyboard */; }; 50DEE04D1BEA085F00015741 /* EditNicknameAndBadge.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */; }; 50DEE04F1BEA092100015741 /* EditProfile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04E1BEA092100015741 /* EditProfile.storyboard */; }; + 50DEE0511BEA09DD00015741 /* BlackList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0501BEA09DD00015741 /* BlackList.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -583,6 +584,7 @@ 50DEE04A1BEA071100015741 /* OAuth.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = OAuth.storyboard; path = ViewControllers/OAuth/OAuth.storyboard; sourceTree = ""; }; 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditNicknameAndBadge.storyboard; path = ViewControllers/EditNicknameAndBadge/EditNicknameAndBadge.storyboard; sourceTree = ""; }; 50DEE04E1BEA092100015741 /* EditProfile.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditProfile.storyboard; path = ViewControllers/EditProfile/EditProfile.storyboard; sourceTree = ""; }; + 50DEE0501BEA09DD00015741 /* BlackList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BlackList.storyboard; path = ViewControllers/BlackList/BlackList.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -1363,6 +1365,7 @@ isa = PBXGroup; children = ( 503ED2391B8ADCE70072187D /* BlackListViewController.swift */, + 50DEE0501BEA09DD00015741 /* BlackList.storyboard */, ); name = BlackList; sourceTree = ""; @@ -2277,6 +2280,7 @@ 50DEE0431BE8B3CD00015741 /* Feedback.storyboard in Resources */, 508F8FC91B0161EF00461B0B /* ProfileSeparationLineCell.xib in Resources */, 5008A1931B8DB8B500E94274 /* Localizable.strings in Resources */, + 50DEE0511BEA09DD00015741 /* BlackList.storyboard in Resources */, 50894CF61AEA4A01000981AF /* SettingsUserCell.xib in Resources */, 6ADDB4501B848C600012877A /* 1Password.xcassets in Resources */, 50DEE04F1BEA092100015741 /* EditProfile.storyboard in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index e382d32b..f5a5ced2 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -594,7 +594,7 @@ - + @@ -672,51 +672,13 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + diff --git a/Yep/ViewControllers/BlackList/BlackList.storyboard b/Yep/ViewControllers/BlackList/BlackList.storyboard new file mode 100644 index 00000000..05f7e81c --- /dev/null +++ b/Yep/ViewControllers/BlackList/BlackList.storyboard @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4c3901091d123810b90e833425626590e97dd4e7 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:45:37 +0800 Subject: [PATCH 08/16] split DoNotDisturbPeriod --- Yep.xcodeproj/project.pbxproj | 4 + Yep/Base.lproj/Main.storyboard | 77 ++----------------- .../DoNotDisturbPeriod.storyboard | 76 ++++++++++++++++++ 3 files changed, 87 insertions(+), 70 deletions(-) create mode 100644 Yep/ViewControllers/DoNotDisturbPeriod/DoNotDisturbPeriod.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 4e639504..76d83d29 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -257,6 +257,7 @@ 50DEE04D1BEA085F00015741 /* EditNicknameAndBadge.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */; }; 50DEE04F1BEA092100015741 /* EditProfile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04E1BEA092100015741 /* EditProfile.storyboard */; }; 50DEE0511BEA09DD00015741 /* BlackList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0501BEA09DD00015741 /* BlackList.storyboard */; }; + 50DEE0531BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0521BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -585,6 +586,7 @@ 50DEE04C1BEA085F00015741 /* EditNicknameAndBadge.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditNicknameAndBadge.storyboard; path = ViewControllers/EditNicknameAndBadge/EditNicknameAndBadge.storyboard; sourceTree = ""; }; 50DEE04E1BEA092100015741 /* EditProfile.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditProfile.storyboard; path = ViewControllers/EditProfile/EditProfile.storyboard; sourceTree = ""; }; 50DEE0501BEA09DD00015741 /* BlackList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BlackList.storyboard; path = ViewControllers/BlackList/BlackList.storyboard; sourceTree = ""; }; + 50DEE0521BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = DoNotDisturbPeriod.storyboard; path = ViewControllers/DoNotDisturbPeriod/DoNotDisturbPeriod.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -1747,6 +1749,7 @@ isa = PBXGroup; children = ( 50A640EB1B6F4E420050E4A3 /* DoNotDisturbPeriodViewController.swift */, + 50DEE0521BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard */, ); name = DoNotDisturbPeriod; sourceTree = ""; @@ -2254,6 +2257,7 @@ 50F5AF861BBA676D0033C9BC /* NewFeed.storyboard in Resources */, 50C090A11ADE391600CC6389 /* AddSkillsReusableView.xib in Resources */, 504F415B1AD5028200FBB19A /* SkillCell.xib in Resources */, + 50DEE0531BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard in Resources */, 50E348931B9063A700A8E699 /* AboutCell.xib in Resources */, 5039594F1B05E6E000797A3E /* ProfileSocialAccountGithubCell.xib in Resources */, 502AE5591AB932D5005BD199 /* ProfileSectionHeaderReusableView.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index f5a5ced2..9aa908f2 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -593,84 +593,21 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + @@ -678,7 +615,7 @@ - + diff --git a/Yep/ViewControllers/DoNotDisturbPeriod/DoNotDisturbPeriod.storyboard b/Yep/ViewControllers/DoNotDisturbPeriod/DoNotDisturbPeriod.storyboard new file mode 100644 index 00000000..20b8b4a0 --- /dev/null +++ b/Yep/ViewControllers/DoNotDisturbPeriod/DoNotDisturbPeriod.storyboard @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 72619240ec8aa32031b3f3521e46d49513fcecfa Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:50:15 +0800 Subject: [PATCH 09/16] split Notifications --- Yep.xcodeproj/project.pbxproj | 4 + Yep/Base.lproj/Main.storyboard | 73 +++---------------- .../Notifications/Notifications.storyboard | 68 +++++++++++++++++ 3 files changed, 84 insertions(+), 61 deletions(-) create mode 100644 Yep/ViewControllers/Notifications/Notifications.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 76d83d29..81beacca 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -258,6 +258,7 @@ 50DEE04F1BEA092100015741 /* EditProfile.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE04E1BEA092100015741 /* EditProfile.storyboard */; }; 50DEE0511BEA09DD00015741 /* BlackList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0501BEA09DD00015741 /* BlackList.storyboard */; }; 50DEE0531BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0521BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard */; }; + 50DEE0551BEA0BB200015741 /* Notifications.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0541BEA0BB200015741 /* Notifications.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -587,6 +588,7 @@ 50DEE04E1BEA092100015741 /* EditProfile.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditProfile.storyboard; path = ViewControllers/EditProfile/EditProfile.storyboard; sourceTree = ""; }; 50DEE0501BEA09DD00015741 /* BlackList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BlackList.storyboard; path = ViewControllers/BlackList/BlackList.storyboard; sourceTree = ""; }; 50DEE0521BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = DoNotDisturbPeriod.storyboard; path = ViewControllers/DoNotDisturbPeriod/DoNotDisturbPeriod.storyboard; sourceTree = ""; }; + 50DEE0541BEA0BB200015741 /* Notifications.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Notifications.storyboard; path = ViewControllers/Notifications/Notifications.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -1730,6 +1732,7 @@ isa = PBXGroup; children = ( 50A640DF1B6F38CF0050E4A3 /* NotificationsViewController.swift */, + 50DEE0541BEA0BB200015741 /* Notifications.storyboard */, ); name = Notifications; sourceTree = ""; @@ -2274,6 +2277,7 @@ 502AE5411AB88862005BD199 /* SkillRankCell.xib in Resources */, 508F8FD11B01D04400461B0B /* GithubRepoCell.xib in Resources */, 6A5632941BC911CB00397B53 /* DiscoverNormalUserCell.xib in Resources */, + 50DEE0551BEA0BB200015741 /* Notifications.storyboard in Resources */, 508F8FD81B01EDB400461B0B /* DribbbleShotCell.xib in Resources */, 502AE5541AB93215005BD199 /* ProfileFooterCell.xib in Resources */, 50CDBE4A1ACBAD3200459CE0 /* ChatLeftImageCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index 9aa908f2..51b45f1a 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -411,10 +411,10 @@ - + @@ -560,70 +560,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -631,7 +582,7 @@ - + @@ -639,7 +590,7 @@ - + diff --git a/Yep/ViewControllers/Notifications/Notifications.storyboard b/Yep/ViewControllers/Notifications/Notifications.storyboard new file mode 100644 index 00000000..5977e542 --- /dev/null +++ b/Yep/ViewControllers/Notifications/Notifications.storyboard @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 069ebc90765223e7d93220b09adbe6438c8b002e Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:54:16 +0800 Subject: [PATCH 10/16] split Settings --- Yep.xcodeproj/project.pbxproj | 4 + Yep/Base.lproj/Main.storyboard | 91 +++---------------- .../Settings/Settings.storyboard | 90 ++++++++++++++++++ 3 files changed, 106 insertions(+), 79 deletions(-) create mode 100644 Yep/ViewControllers/Settings/Settings.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 81beacca..5bdf90c2 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -259,6 +259,7 @@ 50DEE0511BEA09DD00015741 /* BlackList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0501BEA09DD00015741 /* BlackList.storyboard */; }; 50DEE0531BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0521BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard */; }; 50DEE0551BEA0BB200015741 /* Notifications.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0541BEA0BB200015741 /* Notifications.storyboard */; }; + 50DEE0571BEA0C9A00015741 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0561BEA0C9A00015741 /* Settings.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -589,6 +590,7 @@ 50DEE0501BEA09DD00015741 /* BlackList.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BlackList.storyboard; path = ViewControllers/BlackList/BlackList.storyboard; sourceTree = ""; }; 50DEE0521BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = DoNotDisturbPeriod.storyboard; path = ViewControllers/DoNotDisturbPeriod/DoNotDisturbPeriod.storyboard; sourceTree = ""; }; 50DEE0541BEA0BB200015741 /* Notifications.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Notifications.storyboard; path = ViewControllers/Notifications/Notifications.storyboard; sourceTree = ""; }; + 50DEE0561BEA0C9A00015741 /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Settings.storyboard; path = ViewControllers/Settings/Settings.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -1563,6 +1565,7 @@ isa = PBXGroup; children = ( 50894CF01AEA4726000981AF /* SettingsViewController.swift */, + 50DEE0561BEA0C9A00015741 /* Settings.storyboard */, ); name = Settings; sourceTree = ""; @@ -2323,6 +2326,7 @@ 5053AD511AF82A1700B3CBFA /* PickLocationCell.xib in Resources */, 5011382D1BCB5E150055A014 /* FeedConversationDockCell.xib in Resources */, 50E1CE891BDA3CED0025B933 /* SkillHome.storyboard in Resources */, + 50DEE0571BEA0C9A00015741 /* Settings.storyboard in Resources */, 5053AD5B1AF83B4200B3CBFA /* ChatLeftLocationCell.xib in Resources */, 0A8F54B81AB67D11004AD60E /* Images.xcassets in Resources */, 50EB8CC51AE89F12001AC1EE /* ChatRightVideoCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index 51b45f1a..05ac418c 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -357,7 +357,7 @@ - + @@ -378,49 +378,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -560,38 +517,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -801,6 +726,14 @@ + + + + + + + + @@ -869,7 +802,7 @@ - + @@ -933,8 +866,8 @@ - - + + diff --git a/Yep/ViewControllers/Settings/Settings.storyboard b/Yep/ViewControllers/Settings/Settings.storyboard new file mode 100644 index 00000000..4787bb11 --- /dev/null +++ b/Yep/ViewControllers/Settings/Settings.storyboard @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From cc990367a76328aaa0773965cf17f0bf98f9c1f8 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 17:57:53 +0800 Subject: [PATCH 11/16] split EditSkills --- Yep.xcodeproj/project.pbxproj | 4 ++ Yep/Base.lproj/Main.storyboard | 68 +++---------------- .../EditSkills/EditSkills.storyboard | 60 ++++++++++++++++ 3 files changed, 75 insertions(+), 57 deletions(-) create mode 100644 Yep/ViewControllers/EditSkills/EditSkills.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 5bdf90c2..b0269b81 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -260,6 +260,7 @@ 50DEE0531BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0521BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard */; }; 50DEE0551BEA0BB200015741 /* Notifications.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0541BEA0BB200015741 /* Notifications.storyboard */; }; 50DEE0571BEA0C9A00015741 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0561BEA0C9A00015741 /* Settings.storyboard */; }; + 50DEE0591BEA0D7B00015741 /* EditSkills.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0581BEA0D7B00015741 /* EditSkills.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -591,6 +592,7 @@ 50DEE0521BEA0AAC00015741 /* DoNotDisturbPeriod.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = DoNotDisturbPeriod.storyboard; path = ViewControllers/DoNotDisturbPeriod/DoNotDisturbPeriod.storyboard; sourceTree = ""; }; 50DEE0541BEA0BB200015741 /* Notifications.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Notifications.storyboard; path = ViewControllers/Notifications/Notifications.storyboard; sourceTree = ""; }; 50DEE0561BEA0C9A00015741 /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Settings.storyboard; path = ViewControllers/Settings/Settings.storyboard; sourceTree = ""; }; + 50DEE0581BEA0D7B00015741 /* EditSkills.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditSkills.storyboard; path = ViewControllers/EditSkills/EditSkills.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -2123,6 +2125,7 @@ isa = PBXGroup; children = ( 845E1A651B788EF3001E0789 /* EditSkillsViewController.swift */, + 50DEE0581BEA0D7B00015741 /* EditSkills.storyboard */, ); name = EditSkills; sourceTree = ""; @@ -2280,6 +2283,7 @@ 502AE5411AB88862005BD199 /* SkillRankCell.xib in Resources */, 508F8FD11B01D04400461B0B /* GithubRepoCell.xib in Resources */, 6A5632941BC911CB00397B53 /* DiscoverNormalUserCell.xib in Resources */, + 50DEE0591BEA0D7B00015741 /* EditSkills.storyboard in Resources */, 50DEE0551BEA0BB200015741 /* Notifications.storyboard in Resources */, 508F8FD81B01EDB400461B0B /* DribbbleShotCell.xib in Resources */, 502AE5541AB93215005BD199 /* ProfileFooterCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index 05ac418c..b4ab32a6 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -366,12 +366,12 @@ - + @@ -732,7 +732,15 @@ - + + + + + + + + + @@ -740,7 +748,7 @@ - + @@ -750,60 +758,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Yep/ViewControllers/EditSkills/EditSkills.storyboard b/Yep/ViewControllers/EditSkills/EditSkills.storyboard new file mode 100644 index 00000000..630b9231 --- /dev/null +++ b/Yep/ViewControllers/EditSkills/EditSkills.storyboard @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 893ac2edf66e097e1606e0254d5716b4fee87de0 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 18:04:17 +0800 Subject: [PATCH 12/16] split FriendsInContacts --- Yep.xcodeproj/project.pbxproj | 4 ++ Yep/Base.lproj/Main.storyboard | 59 +++-------------- .../FriendsInContacts.storyboard | 63 +++++++++++++++++++ 3 files changed, 76 insertions(+), 50 deletions(-) create mode 100644 Yep/ViewControllers/FriendsInContacts/FriendsInContacts.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index b0269b81..0b5d0c5a 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -261,6 +261,7 @@ 50DEE0551BEA0BB200015741 /* Notifications.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0541BEA0BB200015741 /* Notifications.storyboard */; }; 50DEE0571BEA0C9A00015741 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0561BEA0C9A00015741 /* Settings.storyboard */; }; 50DEE0591BEA0D7B00015741 /* EditSkills.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0581BEA0D7B00015741 /* EditSkills.storyboard */; }; + 50DEE05B1BEA0EAA00015741 /* FriendsInContacts.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE05A1BEA0EAA00015741 /* FriendsInContacts.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -593,6 +594,7 @@ 50DEE0541BEA0BB200015741 /* Notifications.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Notifications.storyboard; path = ViewControllers/Notifications/Notifications.storyboard; sourceTree = ""; }; 50DEE0561BEA0C9A00015741 /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Settings.storyboard; path = ViewControllers/Settings/Settings.storyboard; sourceTree = ""; }; 50DEE0581BEA0D7B00015741 /* EditSkills.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditSkills.storyboard; path = ViewControllers/EditSkills/EditSkills.storyboard; sourceTree = ""; }; + 50DEE05A1BEA0EAA00015741 /* FriendsInContacts.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = FriendsInContacts.storyboard; path = ViewControllers/FriendsInContacts/FriendsInContacts.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -920,6 +922,7 @@ isa = PBXGroup; children = ( 502280F71B1C3F2800E984EE /* FriendsInContactsViewController.swift */, + 50DEE05A1BEA0EAA00015741 /* FriendsInContacts.storyboard */, ); name = FriendsInContacts; sourceTree = ""; @@ -2322,6 +2325,7 @@ 50E114FD1ABC549300F13000 /* ContactsCell.xib in Resources */, 50DEE04D1BEA085F00015741 /* EditNicknameAndBadge.storyboard in Resources */, 502AE54F1AB93175005BD199 /* ProfileHeaderCell.xib in Resources */, + 50DEE05B1BEA0EAA00015741 /* FriendsInContacts.storyboard in Resources */, 503807241BDA18040068345E /* FeedSkillUsersCell.xib in Resources */, 50F5AF9A1BBBD02A0033C9BC /* FeedMediaCell.xib in Resources */, 50A640EA1B6F45FA0050E4A3 /* DoNotDisturbPeriodCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index b4ab32a6..1ee7add5 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -80,7 +80,7 @@ - + - + @@ -414,61 +414,20 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + @@ -820,8 +779,8 @@ + - diff --git a/Yep/ViewControllers/FriendsInContacts/FriendsInContacts.storyboard b/Yep/ViewControllers/FriendsInContacts/FriendsInContacts.storyboard new file mode 100644 index 00000000..e442a920 --- /dev/null +++ b/Yep/ViewControllers/FriendsInContacts/FriendsInContacts.storyboard @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3890bea4be4ae3d83c908ab5e08958102f0593f2 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 18:11:56 +0800 Subject: [PATCH 13/16] split SearchedUsers --- Yep.xcodeproj/project.pbxproj | 4 ++ Yep/Base.lproj/Main.storyboard | 59 +++--------------- .../SearchedUsers/SearchedUsers.storyboard | 61 +++++++++++++++++++ 3 files changed, 75 insertions(+), 49 deletions(-) create mode 100644 Yep/ViewControllers/SearchedUsers/SearchedUsers.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 0b5d0c5a..2a52fd9e 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -262,6 +262,7 @@ 50DEE0571BEA0C9A00015741 /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0561BEA0C9A00015741 /* Settings.storyboard */; }; 50DEE0591BEA0D7B00015741 /* EditSkills.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0581BEA0D7B00015741 /* EditSkills.storyboard */; }; 50DEE05B1BEA0EAA00015741 /* FriendsInContacts.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE05A1BEA0EAA00015741 /* FriendsInContacts.storyboard */; }; + 50DEE05D1BEA100100015741 /* SearchedUsers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE05C1BEA100100015741 /* SearchedUsers.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -595,6 +596,7 @@ 50DEE0561BEA0C9A00015741 /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Settings.storyboard; path = ViewControllers/Settings/Settings.storyboard; sourceTree = ""; }; 50DEE0581BEA0D7B00015741 /* EditSkills.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditSkills.storyboard; path = ViewControllers/EditSkills/EditSkills.storyboard; sourceTree = ""; }; 50DEE05A1BEA0EAA00015741 /* FriendsInContacts.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = FriendsInContacts.storyboard; path = ViewControllers/FriendsInContacts/FriendsInContacts.storyboard; sourceTree = ""; }; + 50DEE05C1BEA100100015741 /* SearchedUsers.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SearchedUsers.storyboard; path = ViewControllers/SearchedUsers/SearchedUsers.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -914,6 +916,7 @@ isa = PBXGroup; children = ( 502048231B0F1BB3002EBFC7 /* SearchedUsersViewController.swift */, + 50DEE05C1BEA100100015741 /* SearchedUsers.storyboard */, ); name = SearchedUsers; sourceTree = ""; @@ -2302,6 +2305,7 @@ 50894CF61AEA4A01000981AF /* SettingsUserCell.xib in Resources */, 6ADDB4501B848C600012877A /* 1Password.xcassets in Resources */, 50DEE04F1BEA092100015741 /* EditProfile.storyboard in Resources */, + 50DEE05D1BEA100100015741 /* SearchedUsers.storyboard in Resources */, 508D17481ACCF4710092D666 /* ChatLeftAudioCell.xib in Resources */, 0A8F54B61AB67D11004AD60E /* Main.storyboard in Resources */, 5033159D1AC101C80008A209 /* ChatRightTextCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index 1ee7add5..34f6a037 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -413,68 +413,29 @@ - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/Yep/ViewControllers/SearchedUsers/SearchedUsers.storyboard b/Yep/ViewControllers/SearchedUsers/SearchedUsers.storyboard new file mode 100644 index 00000000..a51992d6 --- /dev/null +++ b/Yep/ViewControllers/SearchedUsers/SearchedUsers.storyboard @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From eca4927b5e785fab9ca68189436a0e8b7df51614 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 18:18:42 +0800 Subject: [PATCH 14/16] split AddFriends --- Yep.xcodeproj/project.pbxproj | 4 ++ Yep/Base.lproj/Main.storyboard | 71 +++---------------- .../AddFriends/AddFriends.storyboard | 70 ++++++++++++++++++ .../Contacts/ContactsViewController.swift | 4 +- 4 files changed, 86 insertions(+), 63 deletions(-) create mode 100644 Yep/ViewControllers/AddFriends/AddFriends.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 2a52fd9e..632c58da 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -263,6 +263,7 @@ 50DEE0591BEA0D7B00015741 /* EditSkills.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0581BEA0D7B00015741 /* EditSkills.storyboard */; }; 50DEE05B1BEA0EAA00015741 /* FriendsInContacts.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE05A1BEA0EAA00015741 /* FriendsInContacts.storyboard */; }; 50DEE05D1BEA100100015741 /* SearchedUsers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE05C1BEA100100015741 /* SearchedUsers.storyboard */; }; + 50DEE05F1BEA119D00015741 /* AddFriends.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE05E1BEA119D00015741 /* AddFriends.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -597,6 +598,7 @@ 50DEE0581BEA0D7B00015741 /* EditSkills.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = EditSkills.storyboard; path = ViewControllers/EditSkills/EditSkills.storyboard; sourceTree = ""; }; 50DEE05A1BEA0EAA00015741 /* FriendsInContacts.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = FriendsInContacts.storyboard; path = ViewControllers/FriendsInContacts/FriendsInContacts.storyboard; sourceTree = ""; }; 50DEE05C1BEA100100015741 /* SearchedUsers.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SearchedUsers.storyboard; path = ViewControllers/SearchedUsers/SearchedUsers.storyboard; sourceTree = ""; }; + 50DEE05E1BEA119D00015741 /* AddFriends.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = AddFriends.storyboard; path = ViewControllers/AddFriends/AddFriends.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -1521,6 +1523,7 @@ isa = PBXGroup; children = ( 5064F64F1B0AE2E60089FAD4 /* AddFriendsViewController.swift */, + 50DEE05E1BEA119D00015741 /* AddFriends.storyboard */, ); name = AddFriends; sourceTree = ""; @@ -2296,6 +2299,7 @@ 50CDBE4A1ACBAD3200459CE0 /* ChatLeftImageCell.xib in Resources */, 6A56328F1BC90A4500397B53 /* DiscoverCardUserCell.xib in Resources */, 501138291BCB593F0055A014 /* FeedConversations.storyboard in Resources */, + 50DEE05F1BEA119D00015741 /* AddFriends.storyboard in Resources */, 0A90187F1B01152800AE4B7F /* ProfileSocialAccountCell.xib in Resources */, 5064F6551B0B0E160089FAD4 /* AddFriendSearchCell.xib in Resources */, 50DEE0431BE8B3CD00015741 /* Feedback.storyboard in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index 34f6a037..84d27ce4 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -80,7 +80,7 @@ - + - + @@ -217,8 +217,7 @@ - - + @@ -226,6 +225,7 @@ + @@ -378,64 +378,13 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - + @@ -740,7 +689,7 @@ - + diff --git a/Yep/ViewControllers/AddFriends/AddFriends.storyboard b/Yep/ViewControllers/AddFriends/AddFriends.storyboard new file mode 100644 index 00000000..f177cc08 --- /dev/null +++ b/Yep/ViewControllers/AddFriends/AddFriends.storyboard @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Yep/ViewControllers/Contacts/ContactsViewController.swift b/Yep/ViewControllers/Contacts/ContactsViewController.swift index f0559ac1..05115a2f 100644 --- a/Yep/ViewControllers/Contacts/ContactsViewController.swift +++ b/Yep/ViewControllers/Contacts/ContactsViewController.swift @@ -128,8 +128,8 @@ class ContactsViewController: BaseViewController { } } - @IBAction func presentAddFriends(sender: UIBarButtonItem) { - performSegueWithIdentifier("presentAddFriends", sender: nil) + @IBAction func showAddFriends(sender: UIBarButtonItem) { + performSegueWithIdentifier("showAddFriends", sender: nil) } // MARK: Navigation From a9e5c0be94c20af96f5e8e0bb90f0c3d8267466d Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 18:35:33 +0800 Subject: [PATCH 15/16] split Conversation --- Yep.xcodeproj/project.pbxproj | 4 + Yep/Base.lproj/Main.storyboard | 158 ++++-------------- Yep/FeedConversations.storyboard | 4 +- .../Conversation/Conversation.storyboard | 141 ++++++++++++++++ 4 files changed, 180 insertions(+), 127 deletions(-) create mode 100644 Yep/ViewControllers/Conversation/Conversation.storyboard diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index 632c58da..385b2e23 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -264,6 +264,7 @@ 50DEE05B1BEA0EAA00015741 /* FriendsInContacts.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE05A1BEA0EAA00015741 /* FriendsInContacts.storyboard */; }; 50DEE05D1BEA100100015741 /* SearchedUsers.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE05C1BEA100100015741 /* SearchedUsers.storyboard */; }; 50DEE05F1BEA119D00015741 /* AddFriends.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE05E1BEA119D00015741 /* AddFriends.storyboard */; }; + 50DEE0611BEA146900015741 /* Conversation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 50DEE0601BEA146900015741 /* Conversation.storyboard */; }; 50E114F41ABBF9CC00F13000 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F31ABBF9CC00F13000 /* Models.swift */; }; 50E114F91ABC137A00F13000 /* YepServiceSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114F81ABC137A00F13000 /* YepServiceSync.swift */; }; 50E114FC1ABC549300F13000 /* ContactsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E114FA1ABC549300F13000 /* ContactsCell.swift */; }; @@ -599,6 +600,7 @@ 50DEE05A1BEA0EAA00015741 /* FriendsInContacts.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = FriendsInContacts.storyboard; path = ViewControllers/FriendsInContacts/FriendsInContacts.storyboard; sourceTree = ""; }; 50DEE05C1BEA100100015741 /* SearchedUsers.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SearchedUsers.storyboard; path = ViewControllers/SearchedUsers/SearchedUsers.storyboard; sourceTree = ""; }; 50DEE05E1BEA119D00015741 /* AddFriends.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = AddFriends.storyboard; path = ViewControllers/AddFriends/AddFriends.storyboard; sourceTree = ""; }; + 50DEE0601BEA146900015741 /* Conversation.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Conversation.storyboard; path = ViewControllers/Conversation/Conversation.storyboard; sourceTree = ""; }; 50E114F31ABBF9CC00F13000 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Realm/Models.swift; sourceTree = ""; }; 50E114F81ABC137A00F13000 /* YepServiceSync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepServiceSync.swift; path = Services/YepServiceSync.swift; sourceTree = ""; }; 50E114FA1ABC549300F13000 /* ContactsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ContactsCell.swift; path = Views/Cells/Contacts/ContactsCell.swift; sourceTree = ""; }; @@ -1373,6 +1375,7 @@ 5076FC591AF9DF6B00D7381A /* ConversationMessagePreviewTransitionManager.swift */, 505498611B12FB0E0037E3BD /* ConversationMessagePreviewNavigationControllerDelegate.swift */, 0A0027D51B19CEC000AD4BE0 /* ConversationOperationQueue.swift */, + 50DEE0601BEA146900015741 /* Conversation.storyboard */, ); name = Conversation; sourceTree = ""; @@ -2272,6 +2275,7 @@ 505C338B1BAA92CA00E044E2 /* InfoPlist.strings in Resources */, 50535D221BCE497E002FE1A4 /* PickPhotos.storyboard in Resources */, 50AACECD1BB5419A004DD54B /* FeedView.xib in Resources */, + 50DEE0611BEA146900015741 /* Conversation.storyboard in Resources */, 50F5AF861BBA676D0033C9BC /* NewFeed.storyboard in Resources */, 50C090A11ADE391600CC6389 /* AddSkillsReusableView.xib in Resources */, 504F415B1AD5028200FBB19A /* SkillCell.xib in Resources */, diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index 84d27ce4..281715ee 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -11,7 +11,15 @@ - + + + + + + + + + @@ -49,127 +57,14 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -365,13 +260,13 @@ - + @@ -456,11 +351,11 @@ - + @@ -473,7 +368,7 @@ - + @@ -481,7 +376,15 @@ - + + + + + + + + + @@ -489,7 +392,7 @@ - + @@ -497,7 +400,7 @@ - + @@ -627,6 +530,14 @@ + + + + + + + + @@ -685,12 +596,9 @@ - - - - + diff --git a/Yep/FeedConversations.storyboard b/Yep/FeedConversations.storyboard index 65c5ec86..59f3081c 100644 --- a/Yep/FeedConversations.storyboard +++ b/Yep/FeedConversations.storyboard @@ -1,5 +1,5 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/Yep/ViewControllers/Conversation/Conversation.storyboard b/Yep/ViewControllers/Conversation/Conversation.storyboard new file mode 100644 index 00000000..4a179545 --- /dev/null +++ b/Yep/ViewControllers/Conversation/Conversation.storyboard @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From de311faee1472234bc5040639a90d78b46524615 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Wed, 4 Nov 2015 18:50:10 +0800 Subject: [PATCH 16/16] order in Main --- Yep/Base.lproj/Main.storyboard | 87 +++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 33 deletions(-) diff --git a/Yep/Base.lproj/Main.storyboard b/Yep/Base.lproj/Main.storyboard index 281715ee..6925717a 100644 --- a/Yep/Base.lproj/Main.storyboard +++ b/Yep/Base.lproj/Main.storyboard @@ -11,7 +11,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -119,13 +119,13 @@ - + - + @@ -183,12 +183,20 @@ - + - + + + + + + + + + @@ -271,7 +279,7 @@ - + @@ -279,7 +287,15 @@ - + + + + + + + + + @@ -302,7 +318,7 @@ - + @@ -351,16 +367,16 @@ - + - + @@ -368,7 +384,7 @@ - + @@ -376,7 +392,7 @@ - + @@ -384,7 +400,15 @@ - + + + + + + + + + @@ -392,7 +416,7 @@ - + @@ -400,7 +424,7 @@ - + @@ -424,7 +448,7 @@ - + @@ -448,7 +472,7 @@ - + @@ -472,7 +496,7 @@ - + @@ -496,7 +520,7 @@ - + @@ -504,7 +528,7 @@ - + @@ -512,7 +536,7 @@ - + @@ -520,7 +544,7 @@ - + @@ -528,7 +552,7 @@ - + @@ -536,7 +560,7 @@ - + @@ -544,7 +568,7 @@ - + @@ -552,7 +576,7 @@ - + @@ -560,7 +584,7 @@ - + @@ -580,7 +604,7 @@ - + @@ -598,7 +622,4 @@ - - -