TableSearch: Version 1.1, 2014-12-18

Incorporate Swift nullability enhancements with the release of Xcode 6.1.1.

Author: Lax

TableSearch/LICENSE.txt

@@ -1,5 +1,5 @@
 Sample code project: Table Search with UISearchController (Obj-C and Swift)
-Version: 1.0
+Version: 1.1
 
 IMPORTANT:  This Apple software is supplied to you by Apple
 Inc. ("Apple") in consideration of your agreement to the following

TableSearch/README.md

@@ -1,30 +1,19 @@
-Table Search with UISearchController
-====================================
+# Table Search with UISearchController
 
-“Table Search with UISearchController” is an iOS sample application that demonstrates how to use UISearchController.
-A search controller manages the presentation of a search bar (in concert with the results view controller’s content).
+This sample demonstrates how to use UISearchController. A search controller manages the presentation of a search bar (in concert with the results view controller’s content).  It also demonstrates how to use UIStateRestoration to restore the search controller.
 
-The Xcode project includes two separate projects to support the following languages: Objective-C and Swift.
+## Written in Objective-C and Swift
 
+This sample is written in both Objective-C and Swift. Both versions of the sample are at the top level directory of this project in folders named "Objective-C" and "Swift". Both versions of the application have the exact same visual appearance; however, the code and structure may be different depending on the choice of language.
 
-===========================================================================
-BUILD REQUIREMENTS
+## Build
 
-iOS 8.0 SDK or later
+Building this sample requires Xcode 6.1.1 and iOS 8.1 SDK
 
+## Runtime
 
-===========================================================================
-RUNTIME REQUIREMENTS
-
-iOS 8.0 or later
+Running the sample requires iOS 8.0 or later.
     Both targets use Storyboards and Automatic Reference Counting (ARC).
 
 
-========================================================
-REVISION HISTORY
-
-1.0 - first version
-
-
-========================================================
-Copyright © 2014 Apple Inc. All rights reserved.
+Copyright (C) 2014 Apple Inc. All rights reserved.

TableSearch/TableSearch.obj-c/TableSearch-objc.xcodeproj/project.pbxproj

@@ -285,6 +285,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -302,6 +303,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;

TableSearch/TableSearch.obj-c/TableSearch-objc.xcodeproj/xcuserdata/keith.xcuserdatad/xcschemes/TableSearch.objc.xcscheme

@@ -8,7 +8,7 @@
   
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface APLAppDelegate : NSObject <UIApplicationDelegate>
 

TableSearch/TableSearch.obj-c/TableSearch-objc.xcodeproj/xcuserdata/keith.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -14,7 +14,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     // load our data source and hand it over to APLMainTableViewController
     //
-    NSArray *productArray = @[[APLProduct productWithType:[APLProduct deviceTypeTitle]
+    NSArray *products = @[[APLProduct productWithType:[APLProduct deviceTypeTitle]
                                                      name:@"iPhone"
                                                      year:@2007
                                                     price:@599.00],
@@ -57,7 +57,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     // we are being store from UIStateRestoration
     //
     APLMainTableViewController *viewController = (APLMainTableViewController *)navigationController.viewControllers[0];
-    viewController.products = productArray;
+    viewController.products = products;
 
     return YES;
 }

TableSearch/TableSearch.obj-c/TableSearch/APLAppDelegate.h

@@ -8,11 +8,11 @@
   
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @class APLProduct;
 
-static NSString * const kCellIdentifier = @"cellID";
+extern NSString *const kCellIdentifier;
 
 @interface APLBaseTableViewController : UITableViewController
 

TableSearch/TableSearch.obj-c/TableSearch/APLAppDelegate.m

@@ -7,12 +7,16 @@
 #import "APLBaseTableViewController.h"
 #import "APLProduct.h"
 
+NSString *const kCellIdentifier = @"cellID";
+NSString *const kTableCellNibName = @"TableCell";
+
 @implementation APLBaseTableViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    [self.tableView registerNib:[UINib nibWithNibName:@"TableCell" bundle:nil] forCellReuseIdentifier:kCellIdentifier];
+    // we use a nib which contains the cell's view and this class as the files owner
+    [self.tableView registerNib:[UINib nibWithNibName:kTableCellNibName bundle:nil] forCellReuseIdentifier:kCellIdentifier];
 }
 
 - (void)configureCell:(UITableViewCell *)cell forProduct:(APLProduct *)product {
@@ -21,11 +25,11 @@ - (void)configureCell:(UITableViewCell *)cell forProduct:(APLProduct *)product {
     // build the price and year string
     // use NSNumberFormatter to get the currency format out of this NSNumber (product.introPrice)
     //
-    NSNumberFormatter *numFormatter = [[NSNumberFormatter alloc] init];
-    [numFormatter setNumberStyle:NSNumberFormatterCurrencyStyle];
-    NSString *priceStr = [numFormatter stringFromNumber:product.introPrice];
+    NSNumberFormatter *numberFormatter = [[NSNumberFormatter alloc] init];
+    [numberFormatter setNumberStyle:NSNumberFormatterCurrencyStyle];
+    NSString *priceString = [numberFormatter stringFromNumber:product.introPrice];
 
-    NSString *detailedStr = [NSString stringWithFormat:@"%@ | %@", priceStr, [product.yearIntroduced stringValue]];
+    NSString *detailedStr = [NSString stringWithFormat:@"%@ | %@", priceString, [product.yearIntroduced stringValue]];
     cell.detailTextLabel.text = detailedStr;
 }
 

TableSearch/TableSearch.obj-c/TableSearch/APLBaseTableViewController.h

@@ -8,7 +8,7 @@
   
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @class APLProduct;
 

TableSearch/TableSearch.obj-c/TableSearch/APLBaseTableViewController.m

@@ -25,15 +25,15 @@ - (void)viewWillAppear:(BOOL)animated {
 
     self.yearLabel.text = [self.product.yearIntroduced stringValue];
 
-    NSNumberFormatter *numFormatter = [[NSNumberFormatter alloc] init];
-    [numFormatter setNumberStyle:NSNumberFormatterCurrencyStyle];
-    NSString *priceStr = [numFormatter stringFromNumber:self.product.introPrice];
-    self.priceLabel.text = priceStr;
+    NSNumberFormatter *numberFormatter = [[NSNumberFormatter alloc] init];
+    [numberFormatter setNumberStyle:NSNumberFormatterCurrencyStyle];
+    NSString *priceString = [numberFormatter stringFromNumber:self.product.introPrice];
+    self.priceLabel.text = priceString;
 }
 
 #pragma mark - UIStateRestoration
 
-static NSString *ViewControllerProductKey = @"ViewControllerProductKey";
+NSString *const ViewControllerProductKey = @"ViewControllerProductKey";
 
 - (void)encodeRestorableStateWithCoder:(NSCoder *)coder {
     [super encodeRestorableStateWithCoder:coder];

TableSearch/TableSearch.obj-c/TableSearch/APLDetailViewController.h

@@ -12,6 +12,6 @@
 
 @interface APLMainTableViewController : APLBaseTableViewController
 
-@property (nonatomic, strong) NSArray *products;
+@property (nonatomic, copy) NSArray *products;
 
 @end