Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
50 changes: 44 additions & 6 deletions newsPicks.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,21 @@
374F12801994895B00B9731F /* NPTabBtn.m in Sources */ = {isa = PBXBuildFile; fileRef = 374F127F1994895B00B9731F /* NPTabBtn.m */; };
374F1284199496EA00B9731F /* LoginViewController_iPad.m in Sources */ = {isa = PBXBuildFile; fileRef = 374F1282199496EA00B9731F /* LoginViewController_iPad.m */; };
374F1285199496EA00B9731F /* LoginViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 374F1283199496EA00B9731F /* LoginViewController_iPad.xib */; };
376117E1199DA50F00BADE7A /* NPSettingInterestController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 376117E0199DA50F00BADE7A /* NPSettingInterestController.xib */; };
3761A8821995BE7F00C8B4FB /* NPTextInputViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3761A8801995BE7F00C8B4FB /* NPTextInputViewController.m */; };
3761A8831995BE7F00C8B4FB /* NPTextInputViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3761A8811995BE7F00C8B4FB /* NPTextInputViewController_iPad.xib */; };
3761A8851995BEA400C8B4FB /* NPTextInputViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3761A8841995BEA400C8B4FB /* NPTextInputViewController.xib */; };
376E571D1992283A00086E55 /* NPTimeOnlineCell_iPad.m in Sources */ = {isa = PBXBuildFile; fileRef = 376E571C1992283A00086E55 /* NPTimeOnlineCell_iPad.m */; };
37819D2419B3344400DADC77 /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 37819D2319B3344400DADC77 /* Main_iPhone.storyboard */; };
37819D2719B33D3900DADC77 /* LoginRootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 37819D2619B33D3900DADC77 /* LoginRootViewController.m */; };
378BFC1E198F875300DBD405 /* MJPopupBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 378BFC1B198F875300DBD405 /* MJPopupBackgroundView.m */; };
378BFC1F198F875300DBD405 /* UIViewController+MJPopupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 378BFC1D198F875300DBD405 /* UIViewController+MJPopupViewController.m */; };
37B016C9198A6B950069298D /* SVProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 37B016C6198A6B950069298D /* SVProgressHUD.bundle */; };
37B016CA198A6B950069298D /* SVProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 37B016C8198A6B950069298D /* SVProgressHUD.m */; };
66F148BA199F0C9400720697 /* NPThemeOfInterestCellTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 66F148B9199F0C9400720697 /* NPThemeOfInterestCellTableViewCell.m */; };
66F148BC199F182600720697 /* success-black@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 66F148BB199F182600720697 /* success-black@2x.png */; };
66F148BF199F565100720697 /* NPUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 66F148BE199F565100720697 /* NPUserInfoModel.m */; };
66F148C219A0D66500720697 /* NPRecommandThreadModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 66F148C119A0D66500720697 /* NPRecommandThreadModel.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -426,12 +433,16 @@
374F1281199496EA00B9731F /* LoginViewController_iPad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController_iPad.h; sourceTree = "<group>"; };
374F1282199496EA00B9731F /* LoginViewController_iPad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController_iPad.m; sourceTree = "<group>"; };
374F1283199496EA00B9731F /* LoginViewController_iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoginViewController_iPad.xib; sourceTree = "<group>"; };
376117E0199DA50F00BADE7A /* NPSettingInterestController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NPSettingInterestController.xib; sourceTree = "<group>"; };
3761A87F1995BE7F00C8B4FB /* NPTextInputViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPTextInputViewController.h; sourceTree = "<group>"; };
3761A8801995BE7F00C8B4FB /* NPTextInputViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NPTextInputViewController.m; sourceTree = "<group>"; };
3761A8811995BE7F00C8B4FB /* NPTextInputViewController_iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NPTextInputViewController_iPad.xib; sourceTree = "<group>"; };
3761A8841995BEA400C8B4FB /* NPTextInputViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NPTextInputViewController.xib; sourceTree = "<group>"; };
376E571B1992283A00086E55 /* NPTimeOnlineCell_iPad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPTimeOnlineCell_iPad.h; sourceTree = "<group>"; };
376E571C1992283A00086E55 /* NPTimeOnlineCell_iPad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NPTimeOnlineCell_iPad.m; sourceTree = "<group>"; };
37819D2319B3344400DADC77 /* Main_iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main_iPhone.storyboard; sourceTree = "<group>"; };
37819D2519B33D3900DADC77 /* LoginRootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginRootViewController.h; sourceTree = "<group>"; };
37819D2619B33D3900DADC77 /* LoginRootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginRootViewController.m; sourceTree = "<group>"; };
378BFC1A198F875300DBD405 /* MJPopupBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MJPopupBackgroundView.h; sourceTree = "<group>"; };
378BFC1B198F875300DBD405 /* MJPopupBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MJPopupBackgroundView.m; sourceTree = "<group>"; };
378BFC1C198F875300DBD405 /* UIViewController+MJPopupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+MJPopupViewController.h"; sourceTree = "<group>"; };
Expand All @@ -440,6 +451,13 @@
37B016C6198A6B950069298D /* SVProgressHUD.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = SVProgressHUD.bundle; sourceTree = "<group>"; };
37B016C7198A6B950069298D /* SVProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVProgressHUD.h; sourceTree = "<group>"; };
37B016C8198A6B950069298D /* SVProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVProgressHUD.m; sourceTree = "<group>"; };
66F148B8199F0C9400720697 /* NPThemeOfInterestCellTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPThemeOfInterestCellTableViewCell.h; sourceTree = "<group>"; };
66F148B9199F0C9400720697 /* NPThemeOfInterestCellTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NPThemeOfInterestCellTableViewCell.m; sourceTree = "<group>"; };
66F148BB199F182600720697 /* success-black@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "success-black@2x.png"; path = "newsPicks/other/SVProgressHUD/SVProgressHUD.bundle/success-black@2x.png"; sourceTree = "<group>"; };
66F148BD199F565100720697 /* NPUserInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPUserInfoModel.h; sourceTree = "<group>"; };
66F148BE199F565100720697 /* NPUserInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NPUserInfoModel.m; sourceTree = "<group>"; };
66F148C019A0D66500720697 /* NPRecommandThreadModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NPRecommandThreadModel.h; sourceTree = "<group>"; };
66F148C119A0D66500720697 /* NPRecommandThreadModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NPRecommandThreadModel.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -506,6 +524,8 @@
children = (
378BFC19198F873600DBD405 /* PopupView */,
3741F7901990C966006B8115 /* Main_iPad.storyboard */,
37819D2519B33D3900DADC77 /* LoginRootViewController.h */,
37819D2619B33D3900DADC77 /* LoginRootViewController.m */,
3741F7921990CD65006B8115 /* NPNewsListViewController_ipad.h */,
3741F7931990CD65006B8115 /* NPNewsListViewController_ipad.m */,
37193CA3198F39910065752D /* TestViewController.h */,
Expand Down Expand Up @@ -594,8 +614,10 @@
2644A00519868FDF00EAD5DF /* NPSettingPasswordController.m */,
2644A0071986904D00EAD5DF /* NPSettingInterestController.h */,
2644A0081986904D00EAD5DF /* NPSettingInterestController.m */,
376117E0199DA50F00BADE7A /* NPSettingInterestController.xib */,
373E8913198A2CC00080FBEF /* LoginViewController.h */,
373E8914198A2CC00080FBEF /* LoginViewController.m */,
37819D2319B3344400DADC77 /* Main_iPhone.storyboard */,
373E8915198A2CC00080FBEF /* LoginViewController.xib */,
371CDB4D198C754E00D3C9B8 /* NPContentUrlViewController.h */,
371CDB4E198C754E00D3C9B8 /* NPContentUrlViewController.m */,
Expand Down Expand Up @@ -645,6 +667,10 @@
2649D9E0197EBCAF00377012 /* NPlistReplyModel.m */,
26BE23021981036A007CDBBB /* NPUserDetaiInfolModel.h */,
26BE23031981036A007CDBBB /* NPUserDetaiInfolModel.m */,
66F148BD199F565100720697 /* NPUserInfoModel.h */,
66F148BE199F565100720697 /* NPUserInfoModel.m */,
66F148C019A0D66500720697 /* NPRecommandThreadModel.h */,
66F148C119A0D66500720697 /* NPRecommandThreadModel.m */,
);
path = model;
sourceTree = "<group>";
Expand Down Expand Up @@ -780,6 +806,7 @@
2694226A197BFE9E00515F9E = {
isa = PBXGroup;
children = (
66F148BB199F182600720697 /* success-black@2x.png */,
2694227C197BFE9E00515F9E /* newsPicks */,
26942295197BFE9E00515F9E /* newsPicksTests */,
26942275197BFE9E00515F9E /* Frameworks */,
Expand Down Expand Up @@ -970,6 +997,8 @@
2666CF071982839A00D4B106 /* NPFollowCell.m */,
376E571B1992283A00086E55 /* NPTimeOnlineCell_iPad.h */,
376E571C1992283A00086E55 /* NPTimeOnlineCell_iPad.m */,
66F148B8199F0C9400720697 /* NPThemeOfInterestCellTableViewCell.h */,
66F148B9199F0C9400720697 /* NPThemeOfInterestCellTableViewCell.m */,
);
path = cell;
sourceTree = "<group>";
Expand Down Expand Up @@ -1086,12 +1115,15 @@
files = (
26942281197BFE9E00515F9E /* InfoPlist.strings in Resources */,
37193CA7198F39910065752D /* TestViewController.xib in Resources */,
376117E1199DA50F00BADE7A /* NPSettingInterestController.xib in Resources */,
26542D25197D2C08000E0317 /* zbar-help.html in Resources */,
26542D29197D2C08000E0317 /* zbar-samples.png in Resources */,
66F148BC199F182600720697 /* success-black@2x.png in Resources */,
26542D27197D2C08000E0317 /* zbar-helpicons.png in Resources */,
26E8C7B2197D73020039EFB4 /* NP_IMG_default.jpg in Resources */,
26A43841197E053C009F225D /* Localizable.strings in Resources */,
371CDB51198C754E00D3C9B8 /* NPContentUrlViewController.xib in Resources */,
37819D2419B3344400DADC77 /* Main_iPhone.storyboard in Resources */,
26542D23197D2C08000E0317 /* zbar-back.png in Resources */,
260B4999197D4A7D00BEFF53 /* registerPhoto_1.png in Resources */,
374F1285199496EA00B9731F /* LoginViewController_iPad.xib in Resources */,
Expand Down Expand Up @@ -1179,6 +1211,7 @@
2649D9DB197EAFBA00377012 /* NPlistPopularUsers.m in Sources */,
26542D1F197D2C08000E0317 /* UIImageView+AFNetworking.m in Sources */,
26942283197BFE9E00515F9E /* main.m in Sources */,
66F148C219A0D66500720697 /* NPRecommandThreadModel.m in Sources */,
26E8C791197D5DF10039EFB4 /* MKAnnotationView+WebCache.m in Sources */,
2649D9E1197EBCAF00377012 /* NPlistReplyModel.m in Sources */,
185CD718198AAA470076F05B /* gtxCellView.m in Sources */,
Expand All @@ -1191,6 +1224,7 @@
26542D19197D2C08000E0317 /* AFURLConnectionOperation.m in Sources */,
3741F7941990CD65006B8115 /* NPNewsListViewController_ipad.m in Sources */,
26542C91197D241A000E0317 /* NPNavigationViewController.m in Sources */,
66F148BF199F565100720697 /* NPUserInfoModel.m in Sources */,
3761A8821995BE7F00C8B4FB /* NPTextInputViewController.m in Sources */,
373E8916198A2CC00080FBEF /* LoginViewController.m in Sources */,
26791FCC197FB796003DAC20 /* NPCustomMethod.m in Sources */,
Expand All @@ -1202,8 +1236,10 @@
374F1284199496EA00B9731F /* LoginViewController_iPad.m in Sources */,
26E8C793197D5DF10039EFB4 /* NSData+GIF.m in Sources */,
26542D17197D2C08000E0317 /* AFPropertyListRequestOperation.m in Sources */,
66F148BA199F0C9400720697 /* NPThemeOfInterestCellTableViewCell.m in Sources */,
26791FC6197F6B70003DAC20 /* NPNewListDetailFootLoadView.m in Sources */,
2613BBF01980109F00628079 /* NPUserDetailViewController.m in Sources */,
37819D2719B33D3900DADC77 /* LoginRootViewController.m in Sources */,
26542C8D197D241A000E0317 /* NPBaseViewController.m in Sources */,
26449FF319867FB400EAD5DF /* NPFollowersRobotsController.m in Sources */,
26542CD6197D27D0000E0317 /* NPListModel.m in Sources */,
Expand Down Expand Up @@ -1337,7 +1373,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "fd7353de-859e-4ee7-9ead-d4671693b150";
PROVISIONING_PROFILE = "ed4b5fca-8fde-47bc-b82e-09aab12f6686";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down Expand Up @@ -1371,7 +1407,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
PROVISIONING_PROFILE = "fd7353de-859e-4ee7-9ead-d4671693b150";
PROVISIONING_PROFILE = "ed4b5fca-8fde-47bc-b82e-09aab12f6686";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
Expand All @@ -1383,7 +1419,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer: ZHONGRUI YIN (9S72XJC9KA)";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "newsPicks/newsPicks-Prefix.pch";
INFOPLIST_FILE = "newsPicks/newsPicks-Info.plist";
Expand All @@ -1393,7 +1430,7 @@
"$(PROJECT_DIR)/newsPicks/other/AFNetworking/ZBarSDK",
);
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "fd7353de-859e-4ee7-9ead-d4671693b150";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos6.1;
WRAPPER_EXTENSION = app;
};
Expand All @@ -1404,7 +1441,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer: ZHONGRUI YIN (9S72XJC9KA)";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "newsPicks/newsPicks-Prefix.pch";
INFOPLIST_FILE = "newsPicks/newsPicks-Info.plist";
Expand All @@ -1414,7 +1452,7 @@
"$(PROJECT_DIR)/newsPicks/other/AFNetworking/ZBarSDK",
);
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "fd7353de-859e-4ee7-9ead-d4671693b150";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos6.1;
WRAPPER_EXTENSION = app;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>1D770B83-773D-40DC-B6EB-8B677E8AF950</string>
<string>C042A238-AAF2-4F84-AB2A-69911559926F</string>
<key>IDESourceControlProjectName</key>
<string>newsPicks</string>
<key>IDESourceControlProjectOriginsDictionary</key>
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
scope = "0"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "newsPicks/cell/NPTimeOnlineCell.m"
timestampString = "431189874.132106"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "198"
endingLineNumber = "198"
landmarkName = "-OnClickRepley:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
</Bucket>
Loading