Skip to content

Adding support for UIDocumentInteractionController which allows more exp... #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alistairmcmillan wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Adding support for UIDocumentInteractionController which allows more exp... #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Classes/WDCanvasController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#import "WDActionSheet.h"
#import "WDBar.h"
#import "WDDocumentReplay.h"
#import <MessageUI/MFMailComposeViewController.h>

typedef enum {
WDInterfaceModeHidden, // all adornments are hidden
Expand Down Expand Up @@ -42,8 +41,7 @@ typedef enum {
@class WDUnlockView;

@interface WDCanvasController : UIViewController <UINavigationControllerDelegate, UIImagePickerControllerDelegate,
MFMailComposeViewControllerDelegate, UIPopoverControllerDelegate,
WDActionSheetDelegate, WDDocumentReplayDelegate, WDActionNameViewDelegate>
UIPopoverControllerDelegate, WDActionSheetDelegate, WDDocumentReplayDelegate, WDActionNameViewDelegate, UIDocumentInteractionControllerDelegate>
{
WDBarItem *album_;
WDBarItem *undo_;
Expand All @@ -64,6 +62,8 @@ typedef enum {

WDHueSaturationController *hueController_;
WDColorBalanceController *balanceController_;

NSURL *exportFileUrl;
}

@property (nonatomic) WDDocument *document;
Expand Down Expand Up @@ -98,6 +98,7 @@ typedef enum {
@property (nonatomic) BOOL wasPlayingBeforeRotation;

@property (nonatomic) WDArtStoreController *artStoreController;
@property (strong, nonatomic) UIDocumentInteractionController *documentInteractionController;

- (void) updateTitle;
- (void) hidePopovers;
Expand Down
94 changes: 54 additions & 40 deletions Classes/WDCanvasController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
//

#import <Twitter/Twitter.h>
#import <MessageUI/MessageUI.h>

#import "UIImage+Resize.h"
#import "UIImage+Additions.h"
Expand Down Expand Up @@ -329,10 +328,10 @@ - (void) showActionSheet:(id)sender
// could check this with [TWTweetComposeViewController canSendTweet], but the behavior seems okay without the check
[shareSheet addButtonWithTitle:NSLocalizedString(@"Tweet", @"Tweet")
action:^(id sender) { [canvasController tweetPainting:sender]; }];
if (self.document && [MFMailComposeViewController canSendMail]) {
[shareSheet addButtonWithTitle:NSLocalizedString(@"Email", @"Email")
action:^(id sender) { [canvasController emailPNG:sender]; }];

if (self.document) {
[shareSheet addButtonWithTitle:NSLocalizedString(@"Export", @"Export")
action:^(id sender) { [canvasController exportPNG:sender]; }];
}

[shareSheet addCancelButton];
Expand Down Expand Up @@ -422,14 +421,14 @@ - (void) showActionMenu:(id)sender

[menus addObject:[WDMenuItem separatorItem]];

item = [WDMenuItem itemWithTitle:NSLocalizedString(@"Email JPEG", @"Email JPEG")
action:@selector(emailJPEG:) target:self];
item = [WDMenuItem itemWithTitle:NSLocalizedString(@"Export JPEG", @"Export JPEG")
action:@selector(exportJPEG:) target:self];
[menus addObject:item];

item = [WDMenuItem itemWithTitle:NSLocalizedString(@"Email PNG", @"Email PNG")
action:@selector(emailPNG:) target:self];
item = [WDMenuItem itemWithTitle:NSLocalizedString(@"Export PNG", @"Export PNG")
action:@selector(exportPNG:) target:self];
[menus addObject:item];

actionMenu_ = [[WDMenu alloc] initWithItems:menus];
actionMenu_.delegate = self;
}
Expand Down Expand Up @@ -541,10 +540,10 @@ - (void) tweetPainting:(id)sender
- (void) validateMenuItem:(WDMenuItem *)item
{
// ACTION
if (item.action == @selector(emailPNG:) ||
item.action == @selector(emailJPEG:))
if (item.action == @selector(exportPNG:) ||
item.action == @selector(exportJPEG:))
{
item.enabled = [MFMailComposeViewController canSendMail];
item.enabled = (self.document != nil);
}
else if (item.action == @selector(duplicatePainting:))
{
Expand Down Expand Up @@ -1657,27 +1656,6 @@ - (void) addToPhotoAlbum:(id)sender
//UIImageWriteToSavedPhotosAlbum(pngImage, self, nil, NULL);
}

// Dismisses the email composition interface when users tap Cancel or Send. Proceeds to update the message field with the result of the operation.
- (void)mailComposeController:(MFMailComposeViewController*)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError*)error
{
[controller dismissViewControllerAnimated:YES completion:nil];
}

- (void) emailPainting:(id)sender mimeType:(NSString *)mimeType data:(NSData *)data
{
MFMailComposeViewController *picker = [[MFMailComposeViewController alloc] init];
picker.mailComposeDelegate = self;

NSString *subject = NSLocalizedString(@"Brushes Painting: ", @"Brushes Painting: ");
NSString *filename = self.document ? self.document.displayName : self.replay.paintingName;
subject = [subject stringByAppendingString:filename];
[picker setSubject:subject];

[picker addAttachmentData:data mimeType:mimeType fileName:filename];

[self presentViewController:picker animated:YES completion:nil];
}

- (BOOL) canPasteImage
{
if (!self.isEditing) {
Expand Down Expand Up @@ -1735,16 +1713,37 @@ - (void) duplicatePainting:(id)sender
[UIView commitAnimations];
}

- (void) emailPNG:(id)sender
- (void) export:(id)sender format:(NSString *)format
{
NSData *imageData = [canvas_.painting PNGRepresentationForCurrentState];
[self emailPainting:sender mimeType:@"image/png" data:imageData];
NSString *baseFilename = [self.document.fileURL.lastPathComponent stringByDeletingPathExtension];
NSString *filename = nil;

// Generates export file in requested format
if ([format isEqualToString:@"PNG"]) {
filename = [NSTemporaryDirectory() stringByAppendingPathComponent:[baseFilename stringByAppendingPathExtension:@"png"]];
[[canvas_.painting PNGRepresentationForCurrentState] writeToFile:filename atomically:YES];
} else if ([format isEqualToString:@"JPEG"]) {
filename = [NSTemporaryDirectory() stringByAppendingPathComponent:[baseFilename stringByAppendingPathExtension:@"jpg"]];
[[canvas_.painting JPEGRepresentationForCurrentState] writeToFile:filename atomically:YES];
}

// Passes exported file to UIDocumentInteractionController
exportFileUrl = [NSURL fileURLWithPath:filename];
if(exportFileUrl) {
self.documentInteractionController = [UIDocumentInteractionController interactionControllerWithURL:exportFileUrl];
[self.documentInteractionController setDelegate:self];
[self.documentInteractionController presentPreviewAnimated:YES];
}
}

- (void) emailJPEG:(id)sender
- (void) exportJPEG:(id)sender
{
NSData *imageData = [canvas_.painting JPEGRepresentationForCurrentState];
[self emailPainting:sender mimeType:@"image/jpeg" data:imageData];
[self export:sender format:@"JPEG"];
}

- (void) exportPNG:(id)sender
{
[self export:sender format:@"PNG"];
}

#pragma mark - Interface Visibility
Expand Down Expand Up @@ -1888,4 +1887,19 @@ - (UIView *) rotatingFooterView
return self.bottomBar;
}

#pragma mark - UIDocumentInteractionController

- (UIViewController *) documentInteractionControllerViewControllerForPreview: (UIDocumentInteractionController *) controller {
return self;
}

- (void)documentInteractionControllerDidEndPreview:(UIDocumentInteractionController *)controller
{
// Clean up by removing generated file
NSError *error;
if(exportFileUrl) {
[[NSFileManager defaultManager] removeItemAtURL:exportFileUrl error:&error];
}
}

@end