Merge branch 'release/1.1'

SpeakSwift/SpeakSwift.xcodeproj/project.pbxproj

@@ -365,11 +365,12 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Steve Overmars (36HPV94EE2)";
 				INFOPLIST_FILE = SpeakSwift/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "5cad3d54-02b6-4f3c-a6e7-d674f8ff31bb";
 			};
 			name = Debug;
 		};
@@ -378,11 +379,13 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Steve Overmars (36HPV94EE2)";
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				INFOPLIST_FILE = SpeakSwift/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "0cf796c7-5d53-401c-b682-b978c7c12129";
 			};
 			name = Release;
 		};

SpeakSwift/SpeakSwift/AppDelegate.swift

@@ -56,11 +56,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var mainViewController: SSMainViewController? = nil
 
     class func appDelegate() -> AppDelegate {
-        return UIApplication.sharedApplication().delegate as AppDelegate
+        return UIApplication.sharedApplication().delegate as! AppDelegate
     }
 
 
-    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: NSDictionary?) -> Bool {
+    func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject : AnyObject]?) -> Bool {
         // Override point for customization after application launch.
 
         println("Run this app on your device! The iPhone Simulator might not have Speech Voices (AVSpeechSynthesisVoice)!")

SpeakSwift/SpeakSwift/Images.xcassets/LaunchImage.launchimage/Contents.json

@@ -1,5 +1,23 @@
 {
   "images" : [
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "736h",
+      "filename" : "Default-736h@3x.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "3x"
+    },
+    {
+      "extent" : "full-screen",
+      "idiom" : "iphone",
+      "subtype" : "667h",
+      "filename" : "Default-667h@2x.png",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
+    },
     {
       "orientation" : "portrait",
       "idiom" : "iphone",

SpeakSwift/SpeakSwift/Info.plist

@@ -7,19 +7,19 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.appifymedia.beta.SpeakSwift</string>
+	<string>com.appifymedia.speakswift</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1024</string>
+	<string>1048</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>

SpeakSwift/SpeakSwift/SSDataManager.swift

@@ -52,7 +52,7 @@ class SSDataManager : NSObject {
 
     func saveSpeechObject(#speechObject : SSSpeechObject?) {
 
-        if let speechObj = speechObject? {
+        if let speechObj = speechObject {
 
             var savedObjects : [Dictionary<String, String>] = speechObjectDictionariesArray()
 
@@ -85,7 +85,7 @@ class SSDataManager : NSObject {
 
         if let data: NSData = NSUserDefaults.standardUserDefaults().objectForKey(SpeakSwiftSpeechObjectsKey) as? NSData {
 
-            let arrayOfSpeechObjectDictionaries: [Dictionary<String, String>] = NSKeyedUnarchiver.unarchiveObjectWithData(data) as [Dictionary<String, String>]
+            let arrayOfSpeechObjectDictionaries: [Dictionary<String, String>] = NSKeyedUnarchiver.unarchiveObjectWithData(data) as! [Dictionary<String, String>]
             return arrayOfSpeechObjectDictionaries
 
         }

SpeakSwift/SpeakSwift/SSMainViewController.swift

@@ -41,11 +41,6 @@ class SSMainViewController: UIViewController, UIPickerViewDelegate, UIPickerView
         super.init(coder: aDecoder)
     }
 
-    override init() {
-        super.init()
-        println("SSMainViewController init()")
-    }
-
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -72,7 +67,7 @@ class SSMainViewController: UIViewController, UIPickerViewDelegate, UIPickerView
 
         navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Organize, target: self, action: Selector("favouritesButtonTapped:"))
 
-        let infoButton: UIButton = UIButton.buttonWithType(.InfoLight) as UIButton
+        let infoButton: UIButton = UIButton.buttonWithType(.InfoLight) as! UIButton
         infoButton.addTarget(self, action: Selector("infoButtonTapped:"), forControlEvents: .TouchUpInside)
         navigationItem.leftBarButtonItem = UIBarButtonItem(customView: infoButton)
 
@@ -212,9 +207,9 @@ class SSMainViewController: UIViewController, UIPickerViewDelegate, UIPickerView
 
     func infoButtonTapped(sender: UIButton!) {
 
-        let title = NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleName") as String
-        let version = NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleShortVersionString") as String
-        let build = NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleVersion") as String
+        let title = NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleName") as! String
+        let version = NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleShortVersionString") as! String
+        let build = NSBundle.mainBundle().objectForInfoDictionaryKey("CFBundleVersion") as! String
         let message = "\nVersion: \(version) (build: \(build))\n\nAppify Media\n\nAppifyMedia.com"
         let btnTitle = "OK"
 
@@ -378,7 +373,7 @@ class SSMainViewController: UIViewController, UIPickerViewDelegate, UIPickerView
     }
 
 
-    func pickerView(pickerView: UIPickerView!, attributedTitleForRow row: Int, forComponent component: Int) -> NSAttributedString! {
+    func pickerView(pickerView: UIPickerView, attributedTitleForRow row: Int, forComponent component: Int) -> NSAttributedString? {
 
         if SSSpeechManager.sharedManager.languageCodes.count > 0 {
 
@@ -400,7 +395,7 @@ class SSMainViewController: UIViewController, UIPickerViewDelegate, UIPickerView
         UITextViewDelegate methods
     */
 
-    func textViewShouldBeginEditing(textView: UITextView!) -> Bool {
+    func textViewShouldBeginEditing(textView: UITextView) -> Bool {
 
         // Clear intro text
 
@@ -412,7 +407,7 @@ class SSMainViewController: UIViewController, UIPickerViewDelegate, UIPickerView
     }
 
 
-    func textView(textView: UITextView!, shouldChangeTextInRange range: NSRange, replacementText text: String!) -> Bool {
+    func textView(textView: UITextView, shouldChangeTextInRange range: NSRange, replacementText text: String) -> Bool {
 
         if text == "\n" {
             textView.resignFirstResponder()

SpeakSwift/SpeakSwift/SSSpeechManager.swift

@@ -89,7 +89,7 @@ class SSSpeechManager : NSObject, AVSpeechSynthesizerDelegate {
 
                 for voice: AnyObject in speechVcs {
 
-                    languageCodes.append((voice as AVSpeechSynthesisVoice).language)
+                    languageCodes.append((voice as! AVSpeechSynthesisVoice).language)
 
                     let currentLocale: NSLocale = NSLocale.autoupdatingCurrentLocale()