Converting to modern objective-c syntax

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "libs/asi-http-request"]
 	path = libs/asi-http-request
 	url = https://github.com/pokeb/asi-http-request.git
-[submodule "libs/facebook"]
-	path = libs/facebook
-	url = https://github.com/facebook/facebook-ios-sdk.git
 [submodule "libs/nimbus"]
 	path = libs/nimbus
 	url = https://github.com/mobomo/nimbus.git

README.md

@@ -51,28 +51,25 @@ The following libraries are included as submodules:
 
 * [SVPullToRefresh][]
 * [Nimbus][]
-* [Facebook SDK for iOS][fb]
 
 To intialize submodules, run:
 
     git submodule update --init
 
-To build Facebook, `cd` into `libs/facebook` and run
-`./scripts/build_facebook_ios_sdk_static_lib.sh`. This will build the
-static library used by the app.
-
 ### Binary Libraries
 
 The following libraries must be downloaded and installed manually:
 
-* [libUAirship][] - Urban Airship library for iOS
+* [Urban Airship library for iOS][ua]
 * [Google Analytics SDK for iOS][ga]
+* [Facebook SDK for iOS][fb]
 
 To install Urban Airship, download the SDK and place the entire
 `Airship` directory inside of `libs/`.
 
-To install Google Analytics, download the SDK and place the entire
-`Google Analytics SDK` directory inside of `libs/`.
+To install Google Analytics, download the [Standalone SDK][gasdk], rename the `Library` directory to `GoogleAnalytics`, and place it inside of `libs/`.
+
+To install the Facebook SDK, download and install the package, copy the FacebookSDK.framework directory into `libs/`, and drag it into the the `Frameworks` group in your project.
 
 ### Feeds
 
@@ -93,6 +90,17 @@ The optimal size for display is chosen depending on the context (e.g. 640px
 for article feeds on the iPhone 4, or ~70px for photo gallery thumbnails on the 
 iPhone 3GS) and screen density.
 
+### Search
+
+Search functionality on WhiteHouse.gov and in the White House for iOS 
+mobile app relies on USASearch, a hosted site search service provided by 
+the U.S. General Services Administration (GSA). Federal, state, local, 
+tribal, or territorial government websites may use this service at no cost. 
+For details on incorporating USASearch into .Gov sites, or for examples of 
+the API and how it functions, see  [USASearch: About](http://usasearch.howto.gov/about-us)
+and  [USASearch: How (and When) to Use the Search API](http://usasearch.howto.gov/post/36743437542/how-and-when-to-use-the-search-api).
+
+
 
 NOTE: Setting up the application and configuring it for use in your
 organization's context requires iOS development experience. The
@@ -156,15 +164,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 
-[libUAirship]: http://urbanairship.com/resources/
+[ua]: http://urbanairship.com/resources/developer-resources
+[fb]: https://developers.facebook.com/docs/ios/
 [ga]: https://developers.google.com/analytics/devguides/collection/ios/resources
+[gasdk]: http://dl.google.com/dl/gaformobileapps/GoogleAnalyticsiOS_2.0beta4.zip
 [CustomBadge]: http://www.spaulus.com/2011/04/custombadge-2-0-retina-ready-scalable-light-reflex/
 [Underscore.js]: http://underscorejs.org/
 [Zepto.js]: http://zeptojs.com/
 [DTCustomColoredAccessory]: http://www.cocoanetics.com/2010/10/custom-colored-disclosure-indicators/
 [SVPullToRefresh]: https://github.com/samvermette/SVPullToRefresh
-[fb]: https://github.com/facebook/facebook-ios-sdk
 [Nimbus]: https://github.com/jverkoey/nimbus
-
 [forking]: https://help.github.com/articles/fork-a-repo
 [basic tutorial]: https://help.github.com/articles/set-up-git

WhiteHouseApp/AirshipConfig.plist

@@ -2,15 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>DEVELOPMENT_APP_KEY</key>
-	<string>your development key</string>
-	<key>DEVELOPMENT_APP_SECRET</key>
-	<string>your development secret</string>
-	<key>PRODUCTION_APP_KEY</key>
-	<string>your production key</string>
-	<key>PRODUCTION_APP_SECRET</key>
-	<string>your production secret</string>
-	<key>APP_STORE_OR_AD_HOC_BUILD</key>
-	<false/>
+  <key>inProduction</key>
+  <false/>
+  <key>developmentAppKey</key>
+  <string>Your Development App Key</string>
+  <key>developmentAppSecret</key>
+  <string>Your Development App Secret</string>
+  <key>productionAppKey</key>
+  <string>Your Production App Key</string>
+  <key>productionAppSecret</key>
+  <string>Your Production App Secret</string>
 </dict>
 </plist>

WhiteHouseApp/WHAppDelegate.h → WhiteHouseApp/AppDelegate.h

@@ -25,28 +25,25 @@
  */
 
 //
-//  WHAppDelegate.h
+//  AppDelegate.h
 //  WhiteHouseApp
 //
 //
 
-#import <UIKit/UIKit.h>
-
-#import "Facebook.h"
+#import <FacebookSDK/FacebookSDK.h>
 #import "WHRootMenuViewController.h"
 #import "WHLiveBarController.h"
 #import "WHRevealViewController.h"
 #import "WHFeedViewController.h"
 #import "WHLiveController.h"
 
-@interface WHAppDelegate : UIResponder <UIApplicationDelegate, FBSessionDelegate, FBDialogDelegate, UIAlertViewDelegate> {
+@interface AppDelegate : UIResponder <UIApplicationDelegate, UIAlertViewDelegate> {
     int liveSectionMenuIndex;
 }
 
 @property (strong, nonatomic) UIWindow *window;
 @property (nonatomic, strong) WHLiveBarController *liveBarController;
 
-- (void)initFacebook;
 - (void)shareOnFacebook:(WHFeedItem *)item;
 
 @end