Adding new send to button to traversal bar. Now isntapaper is 2 clicks.
|
@ -207,7 +207,7 @@
|
||||||
[appDelegate.feedDetailViewController redrawUnreadStory];
|
[appDelegate.feedDetailViewController redrawUnreadStory];
|
||||||
}
|
}
|
||||||
} else if (indexPath.row == 2) {
|
} else if (indexPath.row == 2) {
|
||||||
[appDelegate.storyPageControl openSendToDialog];
|
[appDelegate.storyPageControl openSendToDialog:nil];
|
||||||
} else if (indexPath.row == 3) {
|
} else if (indexPath.row == 3) {
|
||||||
[appDelegate openTrainStory:appDelegate.storyPageControl.fontSettingsButton];
|
[appDelegate openTrainStory:appDelegate.storyPageControl.fontSettingsButton];
|
||||||
} else if (indexPath.row == 4) {
|
} else if (indexPath.row == 4) {
|
||||||
|
|
|
@ -98,7 +98,6 @@
|
||||||
- (void)setTextButton;
|
- (void)setTextButton;
|
||||||
- (void)markStoryAsRead;
|
- (void)markStoryAsRead;
|
||||||
- (void)finishMarkAsRead:(ASIFormDataRequest *)request;
|
- (void)finishMarkAsRead:(ASIFormDataRequest *)request;
|
||||||
- (void)openSendToDialog;
|
|
||||||
- (void)markStoryAsUnread;
|
- (void)markStoryAsUnread;
|
||||||
- (void)finishMarkAsUnread:(ASIFormDataRequest *)request;
|
- (void)finishMarkAsUnread:(ASIFormDataRequest *)request;
|
||||||
- (void)markStoryAsSaved;
|
- (void)markStoryAsSaved;
|
||||||
|
@ -116,6 +115,7 @@
|
||||||
|
|
||||||
- (void)flashCheckmarkHud:(NSString *)messageType;
|
- (void)flashCheckmarkHud:(NSString *)messageType;
|
||||||
|
|
||||||
|
- (IBAction)openSendToDialog:(id)sender;
|
||||||
- (IBAction)doNextUnreadStory;
|
- (IBAction)doNextUnreadStory;
|
||||||
- (IBAction)doPreviousStory;
|
- (IBAction)doPreviousStory;
|
||||||
- (IBAction)tapProgressBar:(id)sender;
|
- (IBAction)tapProgressBar:(id)sender;
|
||||||
|
|
|
@ -671,12 +671,14 @@
|
||||||
if (readStoryCount == 0 ||
|
if (readStoryCount == 0 ||
|
||||||
(readStoryCount == 1 &&
|
(readStoryCount == 1 &&
|
||||||
[appDelegate.readStories lastObject] == [appDelegate.activeStory objectForKey:@"id"])) {
|
[appDelegate.readStories lastObject] == [appDelegate.activeStory objectForKey:@"id"])) {
|
||||||
[buttonPrevious setEnabled:NO];
|
[buttonPrevious setEnabled:NO];
|
||||||
[buttonPrevious setAlpha:.4];
|
// buttonPrevious.alpha = 1.0f;
|
||||||
} else {
|
// [buttonAction setImage:[UIImage imageNamed:@"traverse_previous_off"]];
|
||||||
[buttonPrevious setEnabled:YES];
|
} else {
|
||||||
[buttonPrevious setAlpha:1];
|
[buttonPrevious setEnabled:YES];
|
||||||
}
|
// buttonPrevious.alpha = 1.0f;
|
||||||
|
// [buttonAction setImage:[UIImage imageNamed:@"traverse_previous"]];
|
||||||
|
}
|
||||||
|
|
||||||
// setting up the NEXT UNREAD STORY BUTTON
|
// setting up the NEXT UNREAD STORY BUTTON
|
||||||
buttonNext.enabled = YES;
|
buttonNext.enabled = YES;
|
||||||
|
@ -804,7 +806,7 @@
|
||||||
// NSLog(@"results in mark as read is %@", results);
|
// NSLog(@"results in mark as read is %@", results);
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)openSendToDialog {
|
- (IBAction)openSendToDialog:(id)sender {
|
||||||
NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
|
NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
|
||||||
NSURL *url = [NSURL URLWithString:[appDelegate.activeStory
|
NSURL *url = [NSURL URLWithString:[appDelegate.activeStory
|
||||||
objectForKey:@"story_permalink"]];
|
objectForKey:@"story_permalink"]];
|
||||||
|
@ -848,13 +850,13 @@
|
||||||
[shareSheet setValue:[appDelegate.activeStory objectForKey:@"story_title"] forKey:@"subject"];
|
[shareSheet setValue:[appDelegate.activeStory objectForKey:@"story_title"] forKey:@"subject"];
|
||||||
|
|
||||||
[shareSheet setCompletionHandler:^(NSString *activityType, BOOL completed) {
|
[shareSheet setCompletionHandler:^(NSString *activityType, BOOL completed) {
|
||||||
NSString *_completedString;
|
|
||||||
if (completed) {
|
if (completed) {
|
||||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||||
selector:@selector(keyboardDidHide:)
|
selector:@selector(keyboardDidHide:)
|
||||||
name:UIKeyboardDidHideNotification
|
name:UIKeyboardDidHideNotification
|
||||||
object:nil];
|
object:nil];
|
||||||
|
|
||||||
|
NSString *_completedString;
|
||||||
if ([activityType isEqualToString:UIActivityTypePostToTwitter]) {
|
if ([activityType isEqualToString:UIActivityTypePostToTwitter]) {
|
||||||
_completedString = @"Posted";
|
_completedString = @"Posted";
|
||||||
} else if ([activityType isEqualToString:UIActivityTypePostToFacebook]) {
|
} else if ([activityType isEqualToString:UIActivityTypePostToFacebook]) {
|
||||||
|
@ -872,17 +874,14 @@
|
||||||
} else if ([activityType isEqualToString:@"pinboard"]) {
|
} else if ([activityType isEqualToString:@"pinboard"]) {
|
||||||
_completedString = @"Saved";
|
_completedString = @"Saved";
|
||||||
}
|
}
|
||||||
} else {
|
[MBProgressHUD hideHUDForView:appDelegate.storyPageControl.view animated:NO];
|
||||||
_completedString = nil;
|
self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
|
||||||
|
self.storyHUD.customView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"37x-Checkmark.png"]];
|
||||||
|
self.storyHUD.mode = MBProgressHUDModeCustomView;
|
||||||
|
self.storyHUD.removeFromSuperViewOnHide = YES;
|
||||||
|
self.storyHUD.labelText = _completedString;
|
||||||
|
[self.storyHUD hide:YES afterDelay:1];
|
||||||
}
|
}
|
||||||
|
|
||||||
[MBProgressHUD hideHUDForView:appDelegate.storyPageControl.view animated:NO];
|
|
||||||
self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
|
|
||||||
self.storyHUD.customView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"37x-Checkmark.png"]];
|
|
||||||
self.storyHUD.mode = MBProgressHUDModeCustomView;
|
|
||||||
self.storyHUD.removeFromSuperViewOnHide = YES;
|
|
||||||
self.storyHUD.labelText = _completedString;
|
|
||||||
[self.storyHUD hide:YES afterDelay:1];
|
|
||||||
}];
|
}];
|
||||||
|
|
||||||
shareSheet.excludedActivityTypes = @[UIActivityTypePostToWeibo,UIActivityTypeAssignToContact];
|
shareSheet.excludedActivityTypes = @[UIActivityTypePostToWeibo,UIActivityTypeAssignToContact];
|
||||||
|
|
|
@ -264,6 +264,10 @@
|
||||||
FF5D40121799F70200349659 /* ARChromeActivity@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D400D1799F70200349659 /* ARChromeActivity@2x.png */; };
|
FF5D40121799F70200349659 /* ARChromeActivity@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D400D1799F70200349659 /* ARChromeActivity@2x.png */; };
|
||||||
FF5D40131799F70200349659 /* ARChromeActivity@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D400E1799F70200349659 /* ARChromeActivity@2x~ipad.png */; };
|
FF5D40131799F70200349659 /* ARChromeActivity@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D400E1799F70200349659 /* ARChromeActivity@2x~ipad.png */; };
|
||||||
FF5D40141799F70200349659 /* ARChromeActivity~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D400F1799F70200349659 /* ARChromeActivity~ipad.png */; };
|
FF5D40141799F70200349659 /* ARChromeActivity~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D400F1799F70200349659 /* ARChromeActivity~ipad.png */; };
|
||||||
|
FF5D4017179A00B900349659 /* traverse_send.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D4015179A00B900349659 /* traverse_send.png */; };
|
||||||
|
FF5D4018179A00B900349659 /* traverse_send@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D4016179A00B900349659 /* traverse_send@2x.png */; };
|
||||||
|
FF5D401B179A03E700349659 /* traverse_previous_off.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D4019179A03E700349659 /* traverse_previous_off.png */; };
|
||||||
|
FF5D401C179A03E700349659 /* traverse_previous_off@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5D401A179A03E700349659 /* traverse_previous_off@2x.png */; };
|
||||||
FF5EA47F143B691000B7563D /* AddSiteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF5EA47D143B691000B7563D /* AddSiteViewController.m */; };
|
FF5EA47F143B691000B7563D /* AddSiteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF5EA47D143B691000B7563D /* AddSiteViewController.m */; };
|
||||||
FF5F3A82162B82B5008DBE3E /* rainbow.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5F3A81162B82B5008DBE3E /* rainbow.png */; };
|
FF5F3A82162B82B5008DBE3E /* rainbow.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5F3A81162B82B5008DBE3E /* rainbow.png */; };
|
||||||
FF5F3A85162B831A008DBE3E /* user_orange.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5F3A84162B831A008DBE3E /* user_orange.png */; };
|
FF5F3A85162B831A008DBE3E /* user_orange.png in Resources */ = {isa = PBXBuildFile; fileRef = FF5F3A84162B831A008DBE3E /* user_orange.png */; };
|
||||||
|
@ -803,6 +807,10 @@
|
||||||
FF5D400D1799F70200349659 /* ARChromeActivity@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ARChromeActivity@2x.png"; sourceTree = "<group>"; };
|
FF5D400D1799F70200349659 /* ARChromeActivity@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ARChromeActivity@2x.png"; sourceTree = "<group>"; };
|
||||||
FF5D400E1799F70200349659 /* ARChromeActivity@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ARChromeActivity@2x~ipad.png"; sourceTree = "<group>"; };
|
FF5D400E1799F70200349659 /* ARChromeActivity@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ARChromeActivity@2x~ipad.png"; sourceTree = "<group>"; };
|
||||||
FF5D400F1799F70200349659 /* ARChromeActivity~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ARChromeActivity~ipad.png"; sourceTree = "<group>"; };
|
FF5D400F1799F70200349659 /* ARChromeActivity~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ARChromeActivity~ipad.png"; sourceTree = "<group>"; };
|
||||||
|
FF5D4015179A00B900349659 /* traverse_send.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_send.png; sourceTree = "<group>"; };
|
||||||
|
FF5D4016179A00B900349659 /* traverse_send@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_send@2x.png"; sourceTree = "<group>"; };
|
||||||
|
FF5D4019179A03E700349659 /* traverse_previous_off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_previous_off.png; sourceTree = "<group>"; };
|
||||||
|
FF5D401A179A03E700349659 /* traverse_previous_off@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_previous_off@2x.png"; sourceTree = "<group>"; };
|
||||||
FF5EA47C143B691000B7563D /* AddSiteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSiteViewController.h; sourceTree = "<group>"; };
|
FF5EA47C143B691000B7563D /* AddSiteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddSiteViewController.h; sourceTree = "<group>"; };
|
||||||
FF5EA47D143B691000B7563D /* AddSiteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddSiteViewController.m; sourceTree = "<group>"; };
|
FF5EA47D143B691000B7563D /* AddSiteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddSiteViewController.m; sourceTree = "<group>"; };
|
||||||
FF5F3A81162B82B5008DBE3E /* rainbow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rainbow.png; sourceTree = "<group>"; };
|
FF5F3A81162B82B5008DBE3E /* rainbow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rainbow.png; sourceTree = "<group>"; };
|
||||||
|
@ -1335,6 +1343,8 @@
|
||||||
FFC518B81768E59F00542719 /* g_icn_offline.png */,
|
FFC518B81768E59F00542719 /* g_icn_offline.png */,
|
||||||
FF8364C41757EC0B008F5C58 /* traverse_background_left.png */,
|
FF8364C41757EC0B008F5C58 /* traverse_background_left.png */,
|
||||||
FF8364C51757EC0B008F5C58 /* traverse_background_left@2x.png */,
|
FF8364C51757EC0B008F5C58 /* traverse_background_left@2x.png */,
|
||||||
|
FF5D4015179A00B900349659 /* traverse_send.png */,
|
||||||
|
FF5D4016179A00B900349659 /* traverse_send@2x.png */,
|
||||||
FF8364BD1756949E008F5C58 /* traverse_text_on.png */,
|
FF8364BD1756949E008F5C58 /* traverse_text_on.png */,
|
||||||
FF8364BE1756949E008F5C58 /* traverse_text_on@2x.png */,
|
FF8364BE1756949E008F5C58 /* traverse_text_on@2x.png */,
|
||||||
FF8364B91755759A008F5C58 /* traverse_text.png */,
|
FF8364B91755759A008F5C58 /* traverse_text.png */,
|
||||||
|
@ -1368,6 +1378,8 @@
|
||||||
FF688E5116E6B8D0003B7B42 /* traverse_background@2x.png */,
|
FF688E5116E6B8D0003B7B42 /* traverse_background@2x.png */,
|
||||||
FF688E4C16E6B3E1003B7B42 /* traverse_done.png */,
|
FF688E4C16E6B3E1003B7B42 /* traverse_done.png */,
|
||||||
FF688E4D16E6B3E1003B7B42 /* traverse_done@2x.png */,
|
FF688E4D16E6B3E1003B7B42 /* traverse_done@2x.png */,
|
||||||
|
FF5D4019179A03E700349659 /* traverse_previous_off.png */,
|
||||||
|
FF5D401A179A03E700349659 /* traverse_previous_off@2x.png */,
|
||||||
FF688E4816E6AFD3003B7B42 /* traverse_previous.png */,
|
FF688E4816E6AFD3003B7B42 /* traverse_previous.png */,
|
||||||
FF688E4916E6AFD3003B7B42 /* traverse_previous@2x.png */,
|
FF688E4916E6AFD3003B7B42 /* traverse_previous@2x.png */,
|
||||||
FF688E4416E6ADB1003B7B42 /* traverse_next.png */,
|
FF688E4416E6ADB1003B7B42 /* traverse_next.png */,
|
||||||
|
@ -2439,6 +2451,10 @@
|
||||||
FF5D40121799F70200349659 /* ARChromeActivity@2x.png in Resources */,
|
FF5D40121799F70200349659 /* ARChromeActivity@2x.png in Resources */,
|
||||||
FF5D40131799F70200349659 /* ARChromeActivity@2x~ipad.png in Resources */,
|
FF5D40131799F70200349659 /* ARChromeActivity@2x~ipad.png in Resources */,
|
||||||
FF5D40141799F70200349659 /* ARChromeActivity~ipad.png in Resources */,
|
FF5D40141799F70200349659 /* ARChromeActivity~ipad.png in Resources */,
|
||||||
|
FF5D4017179A00B900349659 /* traverse_send.png in Resources */,
|
||||||
|
FF5D4018179A00B900349659 /* traverse_send@2x.png in Resources */,
|
||||||
|
FF5D401B179A03E700349659 /* traverse_previous_off.png in Resources */,
|
||||||
|
FF5D401C179A03E700349659 /* traverse_previous_off@2x.png in Resources */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
- (void)commonInit {
|
- (void)commonInit {
|
||||||
_callbackSource = [[NSBundle mainBundle]objectForInfoDictionaryKey:@"CFBundleName"];
|
_callbackSource = [[NSBundle mainBundle]objectForInfoDictionaryKey:@"CFBundleName"];
|
||||||
_activityTitle = @"Chrome";
|
_activityTitle = @"Open in Chrome";
|
||||||
}
|
}
|
||||||
|
|
||||||
- (id)init {
|
- (id)init {
|
||||||
|
|
BIN
clients/ios/Resources/traverse_previous_off.png
Normal file
After Width: | Height: | Size: 856 B |
BIN
clients/ios/Resources/traverse_previous_off@2x.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
clients/ios/Resources/traverse_send.png
Normal file
After Width: | Height: | Size: 1 KiB |
BIN
clients/ios/Resources/traverse_send@2x.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 933 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 948 B |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.6 KiB |