This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/Post/WPStyleGuide+Posts.h b/WordPress/Classes/ViewRelated/Post/WPStyleGuide+Posts.h | |
| index 75b56bb74d..b9957c09c4 100644 | |
| --- a/WordPress/Classes/ViewRelated/Post/WPStyleGuide+Posts.h | |
| +++ b/WordPress/Classes/ViewRelated/Post/WPStyleGuide+Posts.h | |
| @@ -70,6 +70,15 @@ NS_ASSUME_NONNULL_BEGIN | |
| + (void)applyRestorePageButtonStyle:(UIButton *)button; | |
| + | |
| +#pragma mark - Reader Posts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/Post/WPStyleGuide+Posts.h b/WordPress/Classes/ViewRelated/Post/WPStyleGuide+Posts.h | |
| index 75b56bb74d..b9957c09c4 100644 | |
| --- a/WordPress/Classes/ViewRelated/Post/WPStyleGuide+Posts.h | |
| +++ b/WordPress/Classes/ViewRelated/Post/WPStyleGuide+Posts.h | |
| @@ -70,6 +70,15 @@ NS_ASSUME_NONNULL_BEGIN | |
| + (void)applyRestorePageButtonStyle:(UIButton *)button; | |
| + | |
| +#pragma mark - Reader Posts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/Aztec/Helpers/AztecVerificationPromptHelper.swift b/WordPress/Classes/ViewRelated/Aztec/Helpers/AztecVerificationPromptHelper.swift | |
| index 222f0e4267..062894902b 100644 | |
| --- a/WordPress/Classes/ViewRelated/Aztec/Helpers/AztecVerificationPromptHelper.swift | |
| +++ b/WordPress/Classes/ViewRelated/Aztec/Helpers/AztecVerificationPromptHelper.swift | |
| @@ -18,8 +18,7 @@ class AztecVerificationPromptHelper: NSObject { | |
| accountService = AccountService(managedObjectContext: managedObjectContext) | |
| - guard accountService.isDefaultWordPressComAccount(passedAccount), | |
| - passedAccount.needsEmailVerification else { |
frosty
/ PublishTitle.diff
Last active
May 9, 2018 12:43
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift | |
| index 0e37dd48c2..257f1907b0 100644 | |
| --- a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift | |
| +++ b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift | |
| @@ -1198,7 +1198,7 @@ extension AztecPostViewController { | |
| if !UserDefaults.standard.asyncPromoWasDisplayed { | |
| promoBlock() | |
| } else { | |
| - displayPublishConfirmationAlert(onPublish: publishBlock) | |
| + displayPublishConfirmationAlert(for: action, onPublish: publishBlock) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Example/Example/EditorDemoController.swift b/Example/Example/EditorDemoController.swift | |
| index e0029787..6f9b2ca9 100644 | |
| --- a/Example/Example/EditorDemoController.swift | |
| +++ b/Example/Example/EditorDemoController.swift | |
| @@ -464,6 +464,17 @@ extension EditorDemoController : UITextViewDelegate { | |
| } | |
| } | |
| + func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { | |
| + // If the user types a tab character in the title text view, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/Blog/BlogDetailHeaderView.m b/WordPress/Classes/ViewRelated/Blog/BlogDetailHeaderView.m | |
| index 87e745150..cb127b4bb 100644 | |
| --- a/WordPress/Classes/ViewRelated/Blog/BlogDetailHeaderView.m | |
| +++ b/WordPress/Classes/ViewRelated/Blog/BlogDetailHeaderView.m | |
| @@ -11,7 +11,7 @@ @interface BlogDetailHeaderView () <UIDropInteractionDelegate> | |
| @property (nonatomic, strong) UIStackView *stackView; | |
| @property (nonatomic, strong) UIActivityIndicatorView *blavatarUpdateActivityIndicatorView; | |
| @property (nonatomic, strong) UIStackView *labelsStackView; | |
| -@property (nonatomic) BOOL isAnimating; | |
| +@property (nonatomic, strong) UIView *blavatarDropTarget; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Example/WPMediaPicker/DemoViewController.m b/Example/WPMediaPicker/DemoViewController.m | |
| index 9140fb5..d6b7c3c 100644 | |
| --- a/Example/WPMediaPicker/DemoViewController.m | |
| +++ b/Example/WPMediaPicker/DemoViewController.m | |
| @@ -275,6 +275,7 @@ - (BOOL)textFieldShouldBeginEditing:(UITextField *)textField | |
| { | |
| if (textField == self.quickInputTextField) { | |
| [self setupMediaKeyboardForInputField]; | |
| + self.mediaInputViewController.options = [self selectedOptions]; | |
| [self.mediaInputViewController.mediaPicker resetState:NO]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Services/MediaService.h b/WordPress/Classes/Services/MediaService.h | |
| index fedb7b7a8..783eab04e 100644 | |
| --- a/WordPress/Classes/Services/MediaService.h | |
| +++ b/WordPress/Classes/Services/MediaService.h | |
| @@ -40,6 +40,11 @@ | |
| thumbnailCallback:(nullable void (^)(NSURL * _Nonnull thumbnailURL))thumbnailCallback | |
| completion:(nullable void (^)(Media * _Nullable media, NSError * _Nullable error))completion; | |
| +- (void)createMediaWithPHAsset:(nonnull PHAsset *)asset | |
| + forBlogObjectID:(nonnull NSManagedObjectID *)blogObjectID |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift | |
| index afea6d00d..ee190bf8e 100644 | |
| --- a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift | |
| +++ b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift | |
| @@ -514,7 +514,26 @@ extension NotificationsViewController { | |
| return | |
| } | |
| - performSegue(withIdentifier: NotificationDetailsViewController.classNameWithoutNamespaces(), sender: note) | |
| + if let controller = storyboard?.instantiateViewController(withIdentifier: "NotificationDetailsViewController") as? NotificationDetailsViewController { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Pod/Classes/WPVideoPlayerView.m b/Pod/Classes/WPVideoPlayerView.m | |
| index 6da5424..4ed3fa2 100644 | |
| --- a/Pod/Classes/WPVideoPlayerView.m | |
| +++ b/Pod/Classes/WPVideoPlayerView.m | |
| @@ -12,6 +12,7 @@ @interface WPVideoPlayerView() | |
| @property (nonatomic, strong) AVPlayerItem *playerItem; | |
| @property (nonatomic, strong) UIToolbar *controlToolbar; | |
| @property (nonatomic, strong) UIBarButtonItem * videoDurationButton; | |
| +@property (nonatomic, strong) UILabel * videoDurationLabel; | |
| @property (nonatomic, strong) id timeObserver; |