diff --git a/IBFiles/iPad/MainWindow.xib b/IBFiles/iPad/MainWindow-ipad.xib similarity index 99% rename from IBFiles/iPad/MainWindow.xib rename to IBFiles/iPad/MainWindow-ipad.xib index 645a6057..d563fdf8 100644 --- a/IBFiles/iPad/MainWindow.xib +++ b/IBFiles/iPad/MainWindow-ipad.xib @@ -55,6 +55,7 @@ {768, 1024} + 1 MSAxIDEAA @@ -108,10 +109,9 @@ Feeds - + 292 {{284, 7}, {200, 30}} - NO NO IBIPadFramework @@ -335,6 +335,7 @@ 266 {{0, 975}, {768, 49}} + 3 MCAwAA diff --git a/IBFiles/iPhone/MainWindow.xib b/IBFiles/iPhone/MainWindow-iphone.xib similarity index 99% rename from IBFiles/iPhone/MainWindow.xib rename to IBFiles/iPhone/MainWindow-iphone.xib index 9be32d25..b46eaa16 100644 --- a/IBFiles/iPhone/MainWindow.xib +++ b/IBFiles/iPhone/MainWindow-iphone.xib @@ -55,6 +55,7 @@ {320, 480} + 1 MSAxIDEAA @@ -109,6 +110,7 @@ 292 {{6, 7}, {200, 30}} + NO NO IBCocoaTouchFramework @@ -332,6 +334,7 @@ 266 {{0, 431}, {320, 49}} + 3 MCAwAA diff --git a/Info.plist b/Info.plist index 5c6360c9..b9a21678 100644 --- a/Info.plist +++ b/Info.plist @@ -42,9 +42,9 @@ LSRequiresIPhoneOS NSMainNibFile - MainWindow + MainWindow-iphone NSMainNibFile~ipad - MainWindow + MainWindow-ipad SBUsesNetwork UIPrerenderedIcon diff --git a/Platform.h b/Platform.h new file mode 100644 index 00000000..1b19914e --- /dev/null +++ b/Platform.h @@ -0,0 +1,5 @@ +#ifdef UI_USER_INTERFACE_IDIOM() +#define IS_IPAD() (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) +#else +#define IS_IPAD() (false) +#endif \ No newline at end of file diff --git a/iOctocat.xcodeproj/project.pbxproj b/iOctocat.xcodeproj/project.pbxproj index 56b2a515..f8f7d617 100755 --- a/iOctocat.xcodeproj/project.pbxproj +++ b/iOctocat.xcodeproj/project.pbxproj @@ -163,8 +163,8 @@ 6FA92B1D0FACD648001B1D1D /* issues_open.png in Resources */ = {isa = PBXBuildFile; fileRef = 6FA92B1B0FACD648001B1D1D /* issues_open.png */; }; 6FA92B320FACD6EA001B1D1D /* MyFeeds.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6FA92B300FACD6EA001B1D1D /* MyFeeds.xib */; }; 6FA92B4E0FACD7ED001B1D1D /* IssueCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6FA92B4D0FACD7ED001B1D1D /* IssueCell.xib */; }; - 6FB3CBE713977DBE00CB0EAE /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6FB3CBE613977DBE00CB0EAE /* MainWindow.xib */; }; - 6FB3CBEA13977E4000CB0EAE /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6FB3CBE913977E4000CB0EAE /* MainWindow.xib */; }; + 6FB3CBE713977DBE00CB0EAE /* MainWindow-ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6FB3CBE613977DBE00CB0EAE /* MainWindow-ipad.xib */; }; + 6FB3CBEA13977E4000CB0EAE /* MainWindow-iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6FB3CBE913977E4000CB0EAE /* MainWindow-iphone.xib */; }; 6FB3CBF6139780D600CB0EAE /* Icon-iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6FB3CBF3139780D600CB0EAE /* Icon-iPad.png */; }; 6FB3CBF7139780D600CB0EAE /* Icon-Small-50.png in Resources */ = {isa = PBXBuildFile; fileRef = 6FB3CBF4139780D600CB0EAE /* Icon-Small-50.png */; }; 6FB3CBF8139780D600CB0EAE /* Icon-Small.png in Resources */ = {isa = PBXBuildFile; fileRef = 6FB3CBF5139780D600CB0EAE /* Icon-Small.png */; }; @@ -436,7 +436,7 @@ 6F9DD88C1334E0F300D1E35E /* UserTableHeadBackground@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "UserTableHeadBackground@2x.png"; path = "Images/UserTableHeadBackground@2x.png"; sourceTree = ""; }; 6F9DD8961334E1AB00D1E35E /* OrganizationsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrganizationsController.h; sourceTree = ""; }; 6F9DD8971334E1AF00D1E35E /* OrganizationsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrganizationsController.m; sourceTree = ""; }; - 6FA512F01332657400C16D95 /* JLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JLog.h; sourceTree = ""; }; + 6FA512F01332657400C16D95 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; path = Platform.h; sourceTree = ""; }; 6FA512F11332659000C16D95 /* AppConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppConstants.h; sourceTree = ""; }; 6FA92AFC0FACD51A001B1D1D /* FeedEntry.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = FeedEntry.xib; path = IBFiles/FeedEntry.xib; sourceTree = ""; }; 6FA92AFD0FACD51A001B1D1D /* Issue.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Issue.xib; path = IBFiles/Issue.xib; sourceTree = ""; }; @@ -444,8 +444,8 @@ 6FA92B1B0FACD648001B1D1D /* issues_open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = issues_open.png; path = Images/Icons/issues_open.png; sourceTree = ""; }; 6FA92B300FACD6EA001B1D1D /* MyFeeds.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MyFeeds.xib; path = IBFiles/MyFeeds.xib; sourceTree = ""; }; 6FA92B4D0FACD7ED001B1D1D /* IssueCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = IssueCell.xib; path = IBFiles/IssueCell.xib; sourceTree = ""; }; - 6FB3CBE613977DBE00CB0EAE /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainWindow.xib; path = IBFiles/iPad/MainWindow.xib; sourceTree = ""; }; - 6FB3CBE913977E4000CB0EAE /* MainWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = ""; }; + 6FB3CBE613977DBE00CB0EAE /* MainWindow-ipad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-ipad.xib"; path = "IBFiles/iPad/MainWindow-ipad.xib"; sourceTree = ""; }; + 6FB3CBE913977E4000CB0EAE /* MainWindow-iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "MainWindow-iphone.xib"; sourceTree = ""; }; 6FB3CBF3139780D600CB0EAE /* Icon-iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-iPad.png"; sourceTree = ""; }; 6FB3CBF4139780D600CB0EAE /* Icon-Small-50.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small-50.png"; sourceTree = ""; }; 6FB3CBF5139780D600CB0EAE /* Icon-Small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-Small.png"; sourceTree = ""; }; @@ -601,7 +601,7 @@ isa = PBXGroup; children = ( 6FA512F11332659000C16D95 /* AppConstants.h */, - 6FA512F01332657400C16D95 /* JLog.h */, + 6FA512F01332657400C16D95 /* Platform.h */, 6F7961AD132EC90D00C9446E /* SynthesizeSingleton.h */, 28A0AAE50D9B0CCF005BE974 /* iOctocat_Prefix.pch */, 29B97316FDCFA39411CA2CEA /* main.m */, @@ -971,7 +971,7 @@ 6FB3CBE513977DBC00CB0EAE /* iPad */ = { isa = PBXGroup; children = ( - 6FB3CBE613977DBE00CB0EAE /* MainWindow.xib */, + 6FB3CBE613977DBE00CB0EAE /* MainWindow-ipad.xib */, ); name = iPad; sourceTree = ""; @@ -979,7 +979,7 @@ 6FB3CBE813977E4000CB0EAE /* iPhone */ = { isa = PBXGroup; children = ( - 6FB3CBE913977E4000CB0EAE /* MainWindow.xib */, + 6FB3CBE913977E4000CB0EAE /* MainWindow-iphone.xib */, ); name = iPhone; path = IBFiles/iPhone; @@ -1253,8 +1253,8 @@ 6F843156136D53350016E367 /* issue_comment.png in Resources */, 6F843157136D53350016E367 /* issue_comment@2x.png in Resources */, E0497E5F13914C89005E2C92 /* RefreshArrow@2x.png in Resources */, - 6FB3CBE713977DBE00CB0EAE /* MainWindow.xib in Resources */, - 6FB3CBEA13977E4000CB0EAE /* MainWindow.xib in Resources */, + 6FB3CBE713977DBE00CB0EAE /* MainWindow-ipad.xib in Resources */, + 6FB3CBEA13977E4000CB0EAE /* MainWindow-iphone.xib in Resources */, 6FB3CBF6139780D600CB0EAE /* Icon-iPad.png in Resources */, 6FB3CBF7139780D600CB0EAE /* Icon-Small-50.png in Resources */, 6FB3CBF8139780D600CB0EAE /* Icon-Small.png in Resources */, diff --git a/iOctocat_Prefix.pch b/iOctocat_Prefix.pch index e8a168ca..8c993a3c 100644 --- a/iOctocat_Prefix.pch +++ b/iOctocat_Prefix.pch @@ -4,4 +4,5 @@ #import #import "AppConstants.h" #import "JLog.h" + #import "Platform.h" #endif