Skip to content

Commit c0132e5

Browse files
wenghengcongwenghengcong
committed
Merge branch 'developer'
2 parents 352a446 + a109e6c commit c0132e5

35 files changed

+624
-236
lines changed

‎Coderpursue/Coderpursue.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
5EACCFD11C8E62C70059A303 /* ParaTrending.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EACCFD01C8E62C70059A303 /* ParaTrending.swift */; };
5353
5EBF89AD1C926AB4009B3F5B /* CPMyReposCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EBF89AB1C926AB4009B3F5B /* CPMyReposCell.swift */; };
5454
5EBF89B01C926D4F009B3F5B /* CPMyReposCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5EBF89AF1C926D4F009B3F5B /* CPMyReposCell.xib */; };
55+
5EC6C9831CA528D10067E2E4 /* CPCountry.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5EC6C9821CA528D10067E2E4 /* CPCountry.plist */; };
56+
5EC6C9881CA538FE0067E2E4 /* CPFunnyLabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EC6C9871CA538FE0067E2E4 /* CPFunnyLabViewController.swift */; };
57+
5EC6C98B1CA54D810067E2E4 /* CPFunnyAwardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EC6C98A1CA54D810067E2E4 /* CPFunnyAwardViewController.swift */; };
5558
5ECB406D1C98288B00B0C6FF /* CPMesNotiDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ECB406C1C98288B00B0C6FF /* CPMesNotiDetailViewController.swift */; };
5659
5ECB40701C994C5000B0C6FF /* CPProAboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ECB406F1C994C5000B0C6FF /* CPProAboutViewController.swift */; };
5760
5ECB40721C994C5D00B0C6FF /* CPProSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5ECB40711C994C5D00B0C6FF /* CPProSettingsViewController.swift */; };
@@ -104,7 +107,6 @@
104107
FE49DF981C4B5D6A00676131 /* UIDevice+Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE49DF971C4B5D6A00676131 /* UIDevice+Model.swift */; };
105108
FE49DF9B1C4BAFDD00676131 /* CPSettingsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE49DF9A1C4BAFDC00676131 /* CPSettingsCell.swift */; };
106109
FE5259071C5DF8F200B23BFD /* CPGlobalHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5259061C5DF8F200B23BFD /* CPGlobalHelper.swift */; };
107-
FE6055C71C4088730073BC0A /* CPGitLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE6055C61C4088730073BC0A /* CPGitLoginViewController.swift */; };
108110
FE6055CA1C41B8FC0073BC0A /* GitHubAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE6055C91C41B8FC0073BC0A /* GitHubAPI.swift */; };
109111
FE6333EA1C532E76006D7A2B /* CPStarsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE6333E91C532E76006D7A2B /* CPStarsViewController.swift */; };
110112
FE6980E21C5602C40026089B /* ObjEmail.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE6980DD1C5602C40026089B /* ObjEmail.swift */; };
@@ -195,6 +197,9 @@
195197
5EACCFD01C8E62C70059A303 /* ParaTrending.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParaTrending.swift; sourceTree = "<group>"; };
196198
5EBF89AB1C926AB4009B3F5B /* CPMyReposCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPMyReposCell.swift; sourceTree = "<group>"; };
197199
5EBF89AF1C926D4F009B3F5B /* CPMyReposCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CPMyReposCell.xib; sourceTree = "<group>"; };
200+
5EC6C9821CA528D10067E2E4 /* CPCountry.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = CPCountry.plist; sourceTree = "<group>"; };
201+
5EC6C9871CA538FE0067E2E4 /* CPFunnyLabViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPFunnyLabViewController.swift; sourceTree = "<group>"; };
202+
5EC6C98A1CA54D810067E2E4 /* CPFunnyAwardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPFunnyAwardViewController.swift; sourceTree = "<group>"; };
198203
5ECB406C1C98288B00B0C6FF /* CPMesNotiDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPMesNotiDetailViewController.swift; sourceTree = "<group>"; };
199204
5ECB406F1C994C5000B0C6FF /* CPProAboutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPProAboutViewController.swift; sourceTree = "<group>"; };
200205
5ECB40711C994C5D00B0C6FF /* CPProSettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPProSettingsViewController.swift; sourceTree = "<group>"; };
@@ -252,7 +257,6 @@
252257
FE49DF971C4B5D6A00676131 /* UIDevice+Model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIDevice+Model.swift"; sourceTree = "<group>"; };
253258
FE49DF9A1C4BAFDC00676131 /* CPSettingsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPSettingsCell.swift; sourceTree = "<group>"; };
254259
FE5259061C5DF8F200B23BFD /* CPGlobalHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPGlobalHelper.swift; sourceTree = "<group>"; };
255-
FE6055C61C4088730073BC0A /* CPGitLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPGitLoginViewController.swift; sourceTree = "<group>"; };
256260
FE6055C91C41B8FC0073BC0A /* GitHubAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitHubAPI.swift; sourceTree = "<group>"; };
257261
FE6333E91C532E76006D7A2B /* CPStarsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CPStarsViewController.swift; sourceTree = "<group>"; };
258262
FE6980DD1C5602C40026089B /* ObjEmail.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjEmail.swift; sourceTree = "<group>"; };
@@ -381,6 +385,14 @@
381385
path = Parameters;
382386
sourceTree = "<group>";
383387
};
388+
5EC6C9891CA54D5F0067E2E4 /* Funny */ = {
389+
isa = PBXGroup;
390+
children = (
391+
5EC6C98A1CA54D810067E2E4 /* CPFunnyAwardViewController.swift */,
392+
);
393+
path = Funny;
394+
sourceTree = "<group>";
395+
};
384396
5EE3FF521C7BFF6700760F0F /* Issue */ = {
385397
isa = PBXGroup;
386398
children = (
@@ -491,6 +503,7 @@
491503
children = (
492504
FE914DBD1C4BE37B001C3D90 /* CPProfileList.plist */,
493505
5ECB40731C994D6000B0C6FF /* CPSettingsList.plist */,
506+
5EC6C9821CA528D10067E2E4 /* CPCountry.plist */,
494507
5E738C991C93A3A60075C82C /* CPCity.plist */,
495508
5E738C9B1C93A3B50075C82C /* CPLanguage.plist */,
496509
5ECB407D1C998CDC00B0C6FF /* CPAboutList.plist */,
@@ -607,11 +620,12 @@
607620
children = (
608621
FE91BA8E1C33396E002AECB6 /* CPProfileViewController.swift */,
609622
FE91BA961C334C9F002AECB6 /* CPLoginViewController.swift */,
610-
FE6055C61C4088730073BC0A /* CPGitLoginViewController.swift */,
611623
FE3ED3C81C5C67790048BA1D /* CPReposViewController.swift */,
612624
FE3ED3CA1C5C679F0048BA1D /* CPFollowersViewController.swift */,
613625
5ECB406F1C994C5000B0C6FF /* CPProAboutViewController.swift */,
614626
5ECB40711C994C5D00B0C6FF /* CPProSettingsViewController.swift */,
627+
5EC6C9871CA538FE0067E2E4 /* CPFunnyLabViewController.swift */,
628+
5EC6C9891CA54D5F0067E2E4 /* Funny */,
615629
);
616630
path = Profile;
617631
sourceTree = "<group>";
@@ -879,6 +893,7 @@
879893
FEC0DC461C28B39F0008C7C1 /* LaunchScreen.storyboard in Resources */,
880894
5E738C9A1C93A3A60075C82C /* CPCity.plist in Resources */,
881895
5E03D5931C8D20C800E8C1FD /* CPMesNotificationCell.xib in Resources */,
896+
5EC6C9831CA528D10067E2E4 /* CPCountry.plist in Resources */,
882897
5ECB407E1C998CDC00B0C6FF /* CPAboutList.plist in Resources */,
883898
5EF6E3CE1C8AC4C9004F6473 /* CPEventStarredCell.xib in Resources */,
884899
FE914DBE1C4BE37B001C3D90 /* CPProfileList.plist in Resources */,
@@ -972,6 +987,7 @@
972987
FE3ED3C91C5C67790048BA1D /* CPReposViewController.swift in Sources */,
973988
5ECB40701C994C5000B0C6FF /* CPProAboutViewController.swift in Sources */,
974989
FE91BA8D1C33395C002AECB6 /* CPMessageViewController.swift in Sources */,
990+
5EC6C9881CA538FE0067E2E4 /* CPFunnyLabViewController.swift in Sources */,
975991
FE37DEF51C4A614000B8449D /* UIView+Position.swift in Sources */,
976992
5EE91F7D1C7C4792003F4CBF /* ObjSubject.swift in Sources */,
977993
FE3ED3C61C5C49700048BA1D /* HMSegmentedControl.m in Sources */,
@@ -1023,6 +1039,7 @@
10231039
FE6333EA1C532E76006D7A2B /* CPStarsViewController.swift in Sources */,
10241040
5E03D58D1C8C488D00E8C1FD /* CPEventPushCell.swift in Sources */,
10251041
FE91BA8B1C333948002AECB6 /* CPGistViewController.swift in Sources */,
1042+
5EC6C98B1CA54D810067E2E4 /* CPFunnyAwardViewController.swift in Sources */,
10261043
5EACCFCC1C8DEB490059A303 /* ParaSearchUser.swift in Sources */,
10271044
5E4ABFBF1C9032D40041FA89 /* CPTrendingRepoCell.swift in Sources */,
10281045
FE0FE0D71C3DC7BB0005DDE5 /* ObjBase.swift in Sources */,
@@ -1055,7 +1072,6 @@
10551072
5E546D971C8F618000E94997 /* ObjShowcase.swift in Sources */,
10561073
5E546D8E1C8EDE3100E94997 /* ObjResponseHeader.swift in Sources */,
10571074
5E546D8D1C8EDE3100E94997 /* AppToken.swift in Sources */,
1058-
FE6055C71C4088730073BC0A /* CPGitLoginViewController.swift in Sources */,
10591075
FE19F93F1C394398009986FE /* UIFont+Project.swift in Sources */,
10601076
FEC0DC3A1C28B39F0008C7C1 /* AppDelegate.swift in Sources */,
10611077
5EE91F7F1C7C481A003F4CBF /* ObjNotification.swift in Sources */,

‎Coderpursue/Coderpursue/Assets.xcassets/Octicon_25/octicon_commit_25.imageset/Contents.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "octicon_commit_25@2x.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"filename" : "octicon_commit_25@3x.png",
15+
"scale" : "3x"
16+
}
17+
],
18+
"info" : {
19+
"version" : 1,
20+
"author" : "xcode"
21+
}
22+
}

‎Coderpursue/Coderpursue/Assets.xcassets/Octicon_25/octicon_commit_25.imageset/octicon_commit_25@2x.png‎

685 Bytes
Loading

‎Coderpursue/Coderpursue/Assets.xcassets/Octicon_25/octicon_commit_25.imageset/octicon_commit_25@3x.png‎

967 Bytes
Loading

‎Coderpursue/Coderpursue/Assets.xcassets/Profile/lab_award_50.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"scale" : "1x"
6+
},
7+
{
8+
"idiom" : "universal",
9+
"filename" : "lab_award_50@2x.png",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎Coderpursue/Coderpursue/Assets.xcassets/Profile/lab_award_50.imageset/lab_award_50@2x.png‎

2.75 KB
Loading

0 commit comments

Comments
 (0)