Merge pull request #73 from Automattic/develop

Simplenote Mark 4.4

Author: jleandroperez

External/DTPinLock/DTPinLockController.m

@@ -506,8 +506,8 @@ - (void)dismissKeyboard
 
 - (void)cancel:(id)sender
 {
-    [self.view endEditing:YES];
-    
+    [self dismissKeyboard];
+  
 	// if there is a delegate method, then we let it deal with it
 	if (pinLockDelegate && [pinLockDelegate respondsToSelector:@selector(pinLockControllerDidCancel)])
 	{

Podfile

@@ -27,7 +27,7 @@ abstract_target 'Automattic' do
 		# Automattic
 		#
 		pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :tag => '0.1.0'
-		pod 'Simperium', '0.8.16'
+		pod 'Simperium', '0.8.17'
 		pod 'WordPress-AppbotX', :git => 'https://github.com/wordpress-mobile/appbotx.git', :commit => '479d05f7d6b963c9b44040e6ea9f190e8bd9a47a'
 		pod 'WordPress-Ratings-iOS', '0.0.2'
 	end

Podfile.lock

@@ -23,17 +23,17 @@ PODS:
     - hoedown/standard (= 3.0.3)
   - hoedown/standard (3.0.3)
   - Reachability (3.2)
-  - Simperium (0.8.16):
-    - Simperium/DiffMatchPach (= 0.8.16)
-    - Simperium/JRSwizzle (= 0.8.16)
-    - Simperium/SocketRocket (= 0.8.16)
-    - Simperium/SPReachability (= 0.8.16)
-    - Simperium/SSKeychain (= 0.8.16)
-  - Simperium/DiffMatchPach (0.8.16)
-  - Simperium/JRSwizzle (0.8.16)
-  - Simperium/SocketRocket (0.8.16)
-  - Simperium/SPReachability (0.8.16)
-  - Simperium/SSKeychain (0.8.16)
+  - Simperium (0.8.17):
+    - Simperium/DiffMatchPach (= 0.8.17)
+    - Simperium/JRSwizzle (= 0.8.17)
+    - Simperium/SocketTrust (= 0.8.17)
+    - Simperium/SPReachability (= 0.8.17)
+    - Simperium/SSKeychain (= 0.8.17)
+  - Simperium/DiffMatchPach (0.8.17)
+  - Simperium/JRSwizzle (0.8.17)
+  - Simperium/SocketTrust (0.8.17)
+  - Simperium/SPReachability (0.8.17)
+  - Simperium/SSKeychain (0.8.17)
   - SSKeychain (1.2.2)
   - SVProgressHUD (1.1.2)
   - UIDeviceIdentifier (0.5.0)
@@ -48,7 +48,7 @@ DEPENDENCIES:
   - GoogleAnalytics (= 3.14.0)
   - HockeySDK (~> 3.8.0)
   - hoedown (~> 3.0.3)
-  - Simperium (= 0.8.16)
+  - Simperium (= 0.8.17)
   - SSKeychain (= 1.2.2)
   - SVProgressHUD (= 1.1.2)
   - WordPress-AppbotX (from `https://github.com/wordpress-mobile/appbotx.git`, commit `479d05f7d6b963c9b44040e6ea9f190e8bd9a47a`)
@@ -80,13 +80,13 @@ SPEC CHECKSUMS:
   HockeySDK: ab68303eec6680f6b539de65d747742dd276e934
   hoedown: c1327bbbc96d269595ed86bf97f1d09867ec7529
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  Simperium: 07a07d958dfdbd65febde942214d10525d49aa0c
+  Simperium: 0111b16b6d72bc598a99e244ef87025ae433b27e
   SSKeychain: 88767e903ee8d274ed380e364d96b7a101235286
   SVProgressHUD: 3afb875b9eb23acd1bed9b82495695c68621a8b2
   UIDeviceIdentifier: a959a6d4f51036b4180dd31fb26483a820f1cc46
   WordPress-AppbotX: b5abc0ba45e3da5827f84e9f346c963180f1b545
   WordPress-Ratings-iOS: b04108f7a45867844ba47a240bb6295ca747eebf
 
-PODFILE CHECKSUM: 85792041d567f2099884924acdc40b1a646f6b91
+PODFILE CHECKSUM: 2d182e50997cbe1e2b8976426df9b496171dd193
 
 COCOAPODS: 1.0.1

README.md

@@ -2,8 +2,10 @@
 A Simplenote client for iOS. Learn more about Simplenote at [Simplenote.com](https://simplenote.com).
 
 ## Development Requirements
-* A Simperium account. [Sign up here](https://simperium.com/signup/)
-* A Simperium Application ID and key. [Create a new app here](https://simperium.com/app/new/)
+* A Simperium account ([sign up here](https://simperium.com/signup/)).
+* A Simperium Application ID and key ([create a new app here](https://simperium.com/app/new/)).
+* [CocoaPods](https://cocoapods.org/).
+* [Xcode](https://developer.apple.com/xcode/).
 
 ## Running
 

Simplenote/Classes/SPAddCollaboratorsViewController.m

@@ -32,7 +32,8 @@ - (void)viewDidLoad
 
     // set navigation bar
     self.navigationItem.title = NSLocalizedString(@"Collaborators", @"Noun - collaborators are other Simplenote users who you chose to share a note with");
-
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", nil) style:UIBarButtonItemStyleDone target:self action:@selector(onDone)];
+    
     entryTextField.placeholder = NSLocalizedString(@"Add a new collaborator...", @"Noun - collaborators are other Simplenote users who you chose to share a note with");
 
     if (!self.dataSource)
@@ -261,6 +262,14 @@ - (void)updateAutoCompleteMatchesForString:(NSString *)string {
     [self updatedAutoCompleteMatches];
 }
 
+#pragma mark - Buttons
+
+- (void)onDone
+{
+    [self processTextInField];
+    [self.navigationController dismissViewControllerAnimated:YES completion:nil];
+}
+
 #pragma mark ABPeoplePickerNavigationControllerDelegate methods
 
 - (void)peoplePickerNavigationControllerDidCancel: (ABPeoplePickerNavigationController *)peoplePicker

Simplenote/Classes/SPNoteEditorViewController.m

@@ -1660,7 +1660,9 @@ - (void)shareNoteContentAction:(id)sender {
 
     [SPTracker trackEditorNoteContentShared];
 
-    UIActivityViewController *acv = [[UIActivityViewController alloc] initWithActivityItems:@[_currentNote.content]
+    UISimpleTextPrintFormatter *print = [[UISimpleTextPrintFormatter alloc] initWithText:_currentNote.content];
+
+    UIActivityViewController *acv = [[UIActivityViewController alloc] initWithActivityItems:@[_currentNote.content, print]
                                                                       applicationActivities:nil];
 
     if ([UIDevice isPad]) {

Simplenote/Simplenote-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.4</string>
+	<string>4.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4340</string>
+	<string>4400</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

SimplenoteShare/Info.plist

@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.4</string>
+	<string>4.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4340</string>
+	<string>4400</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>