Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the sample project should be running on modern iOS #62

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion Classes/WEPopoverAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
// Override point for customization after application launch.

// Add the view controller's view to the window and display.
[window addSubview:navController.view];
[window setRootViewController:navController];
[window makeKeyAndVisible];

return YES;
Expand Down
2 changes: 1 addition & 1 deletion Classes/WEPopoverContentViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
}

// Configure the cell...
cell.textLabel.text = [NSString stringWithFormat:@"Item %d", [indexPath row]];
cell.textLabel.text = [NSString stringWithFormat:@"Item %ld", (long)[indexPath row]];
cell.textLabel.textColor = [UIColor whiteColor];
return cell;
}
Expand Down
2 changes: 1 addition & 1 deletion Classes/WEPopoverTableViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
}

cell.textLabel.text = [NSString stringWithFormat:@"Cell %d", indexPath.row];
cell.textLabel.text = [NSString stringWithFormat:@"Cell %ld", (long)indexPath.row];

return cell;
}
Expand Down
Binary file added [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
650 changes: 49 additions & 601 deletions Resources/MainWindow.xib

Large diffs are not rendered by default.

444 changes: 40 additions & 404 deletions Resources/WEPopoverViewController.xib

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion WEPopover-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
19 changes: 13 additions & 6 deletions WEPopover.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -43,6 +43,7 @@
749FAE871286130000AB97F9 /* WEPopoverContentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 749FAE821286130000AB97F9 /* WEPopoverContentViewController.m */; };
749FAE881286130000AB97F9 /* WEPopoverController.m in Sources */ = {isa = PBXBuildFile; fileRef = 749FAE841286130000AB97F9 /* WEPopoverController.m */; };
74A2A7B1190E5B800054A6CD /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 74A2A7B0190E5B800054A6CD /* QuartzCore.framework */; };
F6BB8D531BF3957E0060A2E8 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = F6BB8D521BF3957E0060A2E8 /* [email protected] */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -95,6 +96,7 @@
749FAE851286130000AB97F9 /* WEPopoverParentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WEPopoverParentView.h; sourceTree = "<group>"; };
74A2A7B0190E5B800054A6CD /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
8D1107310486CEB800E47090 /* WEPopover-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "WEPopover-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
F6BB8D521BF3957E0060A2E8 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -139,6 +141,7 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
F6BB8D521BF3957E0060A2E8 /* [email protected] */,
080E96DDFE201D6D7F000001 /* Classes */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
Expand Down Expand Up @@ -274,10 +277,11 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0710;
ORGANIZATIONNAME = "Werner IT Consultancy";
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "WEPopover" */;
compatibilityVersion = "Xcode 3.1";
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -317,6 +321,7 @@
74295FBC18BE40C1008612BA /* [email protected] in Resources */,
7407D7DB13A67ABD0074B83C /* [email protected] in Resources */,
7407D7DC13A67ABD0074B83C /* popoverArrowRight.png in Resources */,
F6BB8D531BF3957E0060A2E8 /* [email protected] in Resources */,
7407D7DD13A67ABD0074B83C /* [email protected] in Resources */,
7407D7DE13A67ABD0074B83C /* popoverArrowLeft.png in Resources */,
74295FBE18BE47A4008612BA /* [email protected] in Resources */,
Expand Down Expand Up @@ -360,6 +365,7 @@
GCC_PREFIX_HEADER = WEPopover_Prefix.pch;
INFOPLIST_FILE = "WEPopover-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = WEPopover;
};
name = Debug;
Expand All @@ -374,6 +380,7 @@
GCC_PREFIX_HEADER = WEPopover_Prefix.pch;
INFOPLIST_FILE = "WEPopover-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = WEPopover;
VALIDATE_PRODUCT = YES;
};
Expand All @@ -382,12 +389,13 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
SDKROOT = iphoneos;
Expand All @@ -398,12 +406,11 @@
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PREBINDING = NO;
SDKROOT = iphoneos;
Expand Down