public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Submitting v1.8 to iOS App Store.

Browse source
This commit is contained in:
Samuel Clay 2013-01-07 16:34:59 -08:00
parent 1527259f45
commit 4891910d42
11 changed files with 54 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
media/ios/Classes/FeedDetailMenuViewController.m
View file

@ -92,9 +92,9 @@
[options addObject:[deleteText uppercaseString]];
[options addObject:[@"Move to another folder" uppercaseString]];
[options addObject:[@"Train this site" uppercaseString]];
if (!appDelegate.isRiverView) {
[options addObject:[@"Train this site" uppercaseString]];
[options addObject:[@"Insta-fetch stories" uppercaseString]];
}

7
media/ios/Classes/FeedDetailViewController.m
View file

@ -888,7 +888,6 @@
- (void)markFeedsReadWithAllStories:(BOOL)includeHidden {
NSLog(@"mark feeds read: %d %d", appDelegate.isRiverView, includeHidden);
if (appDelegate.isRiverView && [appDelegate.activeFolder isEqualToString:@"everything"]) {
// Mark folder as read
NSString *urlString = [NSString stringWithFormat:@"http://%@/reader/mark_all_as_read",
@ -1193,7 +1192,6 @@
}
- (void)changeActiveFeedDetailRow {
NSLog(@"changeActiveFeedDetailRow in feed detail view");
int rowIndex = [appDelegate locationOfActiveStory];
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:rowIndex inSection:0];
@ -1209,7 +1207,6 @@
cellRect = [storyTitlesTable convertRect:cellRect toView:storyTitlesTable.superview];
BOOL completelyVisible = CGRectContainsRect(storyTitlesTable.frame, cellRect);
if (!completelyVisible) {
[storyTitlesTable scrollToRowAtIndexPath:offsetIndexPath
atScrollPosition:UITableViewScrollPositionTop
@ -1224,9 +1221,7 @@
// called when the user taps refresh button
- (void)instafetchFeed {
NSLog(@"Instafetch");
NSString *urlString = [NSString
NSString *urlString = [NSString
stringWithFormat:@"http://%@/reader/refresh_feed/%@",
NEWSBLUR_URL,
[appDelegate.activeFeed objectForKey:@"id"]];

28
media/ios/Classes/NBContainerViewController.m
View file

@ -421,6 +421,7 @@
self.storyNavigationController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH + 1, 0, vb.size.width - NB_DEFAULT_MASTER_WIDTH - 1, vb.size.height);
} completion:^(BOOL finished) {
[self.feedDetailViewController checkScroll];
[appDelegate.storyPageControl refreshPages];
[appDelegate adjustStoryDetailWebView];
[self.feedDetailViewController.storyTitlesTable reloadData];
}];
@ -450,7 +451,7 @@
[self.masterNavigationController.view removeFromSuperview];
self.storyNavigationController.view.frame = CGRectMake(0, 0, vb.size.width, storyTitlesYCoordinate);
self.storyTitlesStub.frame = CGRectMake(0, storyTitlesYCoordinate, vb.size.width, vb.size.height - storyTitlesYCoordinate);
self.storyTitlesStub.frame = CGRectMake(0, storyTitlesYCoordinate, vb.size.width, vb.size.height - storyTitlesYCoordinate - 44 - 20);
} completion:^(BOOL finished) {
if ([[self.masterNavigationController viewControllers] containsObject:self.feedDetailViewController]) {
[self.masterNavigationController popViewControllerAnimated:NO];
@ -459,6 +460,7 @@
self.feedDetailViewController.view.frame = CGRectMake(0, storyTitlesYCoordinate, vb.size.width, vb.size.height - storyTitlesYCoordinate);
self.storyTitlesStub.hidden = YES;
[self.feedDetailViewController checkScroll];
[appDelegate.storyPageControl refreshPages];
[appDelegate adjustStoryDetailWebView];
[self.feedDetailViewController.storyTitlesTable reloadData];
}];
@ -472,7 +474,7 @@
// adding feedDetailViewController
[self addChildViewController:self.feedDetailViewController];
// [self.view addSubview:self.feedDetailViewController.view];
[self.view addSubview:self.feedDetailViewController.view];
[self.feedDetailViewController didMoveToParentViewController:self];
// adding storyDetailViewController
@ -529,18 +531,6 @@
// set center title
UIView *titleLabel = [appDelegate makeFeedTitle:appDelegate.activeFeed];
self.storyPageControl.navigationItem.titleView = titleLabel;
// // set right avatar title image
// if (appDelegate.isSocialView) {
// UIButton *titleImageButton = [appDelegate makeRightFeedTitle:appDelegate.activeFeed];
// [titleImageButton addTarget:self action:@selector(showUserProfilePopover) forControlEvents:UIControlEventTouchUpInside];
// UIBarButtonItem *titleImageBarButton = [[UIBarButtonItem alloc]
// initWithCustomView:titleImageButton];
// self.storyPageControl.navigationItem.rightBarButtonItem = titleImageBarButton;
// } else {
// self.storyPageControl.navigationItem.rightBarButtonItem = nil;
// }
} else {
// CASE: story titles on left
self.storyPageControl.navigationItem.leftBarButtonItem = nil;
@ -640,8 +630,7 @@
CGRect vb = [self.view bounds];
self.isSharingStory = YES;
NSLog(@"VB: %@", NSStringFromCGRect(self.view.bounds));
// adding shareViewController
// adding shareViewController
[self addChildViewController:self.shareNavigationController];
[self.view insertSubview:self.shareNavigationController.view
aboveSubview:self.storyNavigationController.view];
@ -707,13 +696,9 @@
NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults];
if (yCoordinate > 344 && yCoordinate <= (vb.size.height)) {
// save coordinate
self.storyTitlesYCoordinate = yCoordinate;
[userPreferences setInteger:yCoordinate forKey:@"storyTitlesYCoordinate"];
[userPreferences synchronize];
// change frames
self.storyNavigationController.view.frame = CGRectMake(self.storyNavigationController.view.frame.origin.x,
0,
@ -733,7 +718,6 @@
[self.feedDetailViewController checkScroll];
}
} else if (yCoordinate >= (vb.size.height)){
// save coordinate
[userPreferences setInteger:1004 forKey:@"storyTitlesYCoordinate"];
[userPreferences synchronize];
self.storyTitlesYCoordinate = 1004;
@ -749,6 +733,7 @@
0);
}
}
}
-(void)keyboardWillShowOrHide:(NSNotification*)notification {
@ -781,7 +766,6 @@
shareViewFrame.origin.y = vb.size.height - NB_DEFAULT_SHARE_HEIGHT;
} else {
storyNavigationFrame.size.height = vb.size.height - NB_DEFAULT_SHARE_HEIGHT + 44;
NSLog(@"storyNavigationFrame.size.height %f", storyNavigationFrame.size.height);
shareViewFrame.origin.y = vb.size.height - NB_DEFAULT_SHARE_HEIGHT;
}
}

2
media/ios/Classes/StoryDetailViewController.m
View file

@ -1165,7 +1165,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
frame = CGRectMake(x, y, width, height);
}
NSLog(@"Open trainer: %@ (%d/%d/%d/%d)", NSStringFromCGRect(frame), x, y, width, height);
// NSLog(@"Open trainer: %@ (%d/%d/%d/%d)", NSStringFromCGRect(frame), x, y, width, height);
[appDelegate openTrainStory:[NSValue valueWithCGRect:frame]];
}

43
media/ios/Classes/StoryPageControl.m
View file

@ -207,7 +207,6 @@
}
- (void)resetPages {
NSLog(@"resetPages");
[currentPage clearStory];
[nextPage clearStory];
[previousPage clearStory];
@ -219,7 +218,7 @@
CGRect frame = self.scrollView.frame;
self.scrollView.contentSize = frame.size;
NSLog(@"Pages are at: %f / %f / %f", previousPage.view.frame.origin.x, currentPage.view.frame.origin.x, nextPage.view.frame.origin.x);
// NSLog(@"Pages are at: %f / %f / %f", previousPage.view.frame.origin.x, currentPage.view.frame.origin.x, nextPage.view.frame.origin.x);
currentPage.view.frame = self.scrollView.frame;
nextPage.view.frame = self.scrollView.frame;
previousPage.view.frame = self.scrollView.frame;
@ -231,7 +230,6 @@
}
- (void)refreshPages {
NSLog(@"refreshPages");
[self resizeScrollView];
[appDelegate adjustStoryDetailWebView];
int pageIndex = currentPage.pageIndex;
@ -253,7 +251,6 @@
if (widthCount == 0) {
widthCount = 1;
}
NSLog(@"resizeScrollView: %@", NSStringFromCGRect(self.scrollView.frame));
self.scrollView.contentSize = CGSizeMake(self.scrollView.frame.size.width
* widthCount,
self.scrollView.frame.size.height);
@ -310,9 +307,8 @@
pageController.view.frame = pageFrame;
}
int wasIndex = pageController.pageIndex;
pageController.pageIndex = newIndex;
NSLog(@"Applied Index: Was %d, now %d (%d/%d/%d) [%d stories - %d]", wasIndex, newIndex, previousPage.pageIndex, currentPage.pageIndex, nextPage.pageIndex, [appDelegate.activeFeedStoryLocations count], outOfBounds);
// NSLog(@"Applied Index: Was %d, now %d (%d/%d/%d) [%d stories - %d]", wasIndex, newIndex, previousPage.pageIndex, currentPage.pageIndex, nextPage.pageIndex, [appDelegate.activeFeedStoryLocations count], outOfBounds);
if (newIndex > 0 && newIndex >= [appDelegate.activeFeedStoryLocations count]) {
pageController.pageIndex = -2;
@ -320,7 +316,7 @@
!self.appDelegate.feedDetailViewController.pageFinished &&
!self.appDelegate.feedDetailViewController.pageFetching) {
[self.appDelegate.feedDetailViewController fetchNextPage:^() {
NSLog(@"Fetched next page, %d stories", [appDelegate.activeFeedStoryLocations count]);
// NSLog(@"Fetched next page, %d stories", [appDelegate.activeFeedStoryLocations count]);
[self applyNewIndex:newIndex pageController:pageController];
}];
} else if (!self.appDelegate.feedDetailViewController.pageFinished &&
@ -342,7 +338,7 @@
[pageController drawStory];
} else {
[pageController clearStory];
NSLog(@"Skipping drawing %d (waiting for %d)", newIndex, self.scrollingToPage);
// NSLog(@"Skipping drawing %d (waiting for %d)", newIndex, self.scrollingToPage);
}
} else if (outOfBounds) {
[pageController clearStory];
@ -367,34 +363,34 @@
// NSLog(@"Did Scroll: %f = %d (%d/%d/%d)", fractionalPage, lowerNumber, previousPage.pageIndex, currentPage.pageIndex, nextPage.pageIndex);
if (lowerNumber == currentPage.pageIndex) {
if (upperNumber != nextPage.pageIndex) {
NSLog(@"Next was %d, now %d (A)", nextPage.pageIndex, upperNumber);
// NSLog(@"Next was %d, now %d (A)", nextPage.pageIndex, upperNumber);
[self applyNewIndex:upperNumber pageController:nextPage];
}
if (previousNumber != previousPage.pageIndex) {
NSLog(@"Prev was %d, now %d (A)", previousPage.pageIndex, previousNumber);
// NSLog(@"Prev was %d, now %d (A)", previousPage.pageIndex, previousNumber);
[self applyNewIndex:previousNumber pageController:previousPage];
}
} else if (upperNumber == currentPage.pageIndex) {
// Going backwards
if (lowerNumber != previousPage.pageIndex) {
NSLog(@"Prev was %d, now %d (B)", previousPage.pageIndex, previousNumber);
// NSLog(@"Prev was %d, now %d (B)", previousPage.pageIndex, previousNumber);
[self applyNewIndex:lowerNumber pageController:previousPage];
}
} else {
// Going forwards
if (lowerNumber == nextPage.pageIndex) {
NSLog(@"Prev was %d, now %d (C1)", previousPage.pageIndex, previousNumber);
// NSLog(@"Prev was %d, now %d (C1)", previousPage.pageIndex, previousNumber);
// [self applyNewIndex:upperNumber pageController:nextPage];
// [self applyNewIndex:lowerNumber pageController:currentPage];
[self applyNewIndex:previousNumber pageController:previousPage];
} else if (upperNumber == nextPage.pageIndex) {
NSLog(@"Prev was %d, now %d (C2)", previousPage.pageIndex, previousNumber);
// NSLog(@"Prev was %d, now %d (C2)", previousPage.pageIndex, previousNumber);
[self applyNewIndex:lowerNumber pageController:currentPage];
[self applyNewIndex:previousNumber pageController:previousPage];
} else {
NSLog(@"Next was %d, now %d (C3)", nextPage.pageIndex, upperNumber);
NSLog(@"Current was %d, now %d (C3)", currentPage.pageIndex, lowerNumber);
NSLog(@"Prev was %d, now %d (C3)", previousPage.pageIndex, previousNumber);
// NSLog(@"Next was %d, now %d (C3)", nextPage.pageIndex, upperNumber);
// NSLog(@"Current was %d, now %d (C3)", currentPage.pageIndex, lowerNumber);
// NSLog(@"Prev was %d, now %d (C3)", previousPage.pageIndex, previousNumber);
[self applyNewIndex:lowerNumber pageController:currentPage];
[self applyNewIndex:upperNumber pageController:nextPage];
[self applyNewIndex:previousNumber pageController:previousPage];
@ -448,7 +444,7 @@
}
- (void)changePage:(NSInteger)pageIndex animated:(BOOL)animated {
NSLog(@"changePage to %d (animated: %d)", pageIndex, animated);
// NSLog(@"changePage to %d (animated: %d)", pageIndex, animated);
// update the scroll view to the appropriate page
[self resizeScrollView];
@ -487,14 +483,14 @@
}
if (currentPage.pageIndex < nearestNumber) {
NSLog(@"Swap next into current, current into previous: %d / %d", currentPage.pageIndex, nearestNumber);
// NSLog(@"Swap next into current, current into previous: %d / %d", currentPage.pageIndex, nearestNumber);
StoryDetailViewController *swapCurrentController = currentPage;
StoryDetailViewController *swapPreviousController = previousPage;
currentPage = nextPage;
previousPage = swapCurrentController;
nextPage = swapPreviousController;
} else if (currentPage.pageIndex > nearestNumber) {
NSLog(@"Swap previous into current: %d / %d", currentPage.pageIndex, nearestNumber);
// NSLog(@"Swap previous into current: %d / %d", currentPage.pageIndex, nearestNumber);
StoryDetailViewController *swapCurrentController = currentPage;
StoryDetailViewController *swapNextController = nextPage;
currentPage = previousPage;
@ -502,7 +498,7 @@
previousPage = swapNextController;
}
NSLog(@"Set Story from scroll: %f = %d (%d/%d/%d)", fractionalPage, nearestNumber, previousPage.pageIndex, currentPage.pageIndex, nextPage.pageIndex);
// NSLog(@"Set Story from scroll: %f = %d (%d/%d/%d)", fractionalPage, nearestNumber, previousPage.pageIndex, currentPage.pageIndex, nextPage.pageIndex);
nextPage.webView.scrollView.scrollsToTop = NO;
previousPage.webView.scrollView.scrollsToTop = NO;
@ -513,6 +509,7 @@
self.scrollView.scrollsToTop = NO;
if (self.isDraggingScrollview || self.scrollingToPage == currentPage.pageIndex) {
if (currentPage.pageIndex == -2) return;
self.scrollingToPage = -1;
int storyIndex = [appDelegate indexFromLocation:currentPage.pageIndex];
appDelegate.activeStory = [appDelegate.activeFeedStories objectAtIndex:storyIndex];
@ -544,15 +541,15 @@
[appDelegate changeActiveFeedDetailRow];
if (self.currentPage.pageIndex != location) {
NSLog(@"Updating Current: from %d to %d", currentPage.pageIndex, location);
// NSLog(@"Updating Current: from %d to %d", currentPage.pageIndex, location);
[self applyNewIndex:location pageController:self.currentPage];
}
if (self.nextPage.pageIndex != location+1) {
NSLog(@"Updating Next: from %d to %d", nextPage.pageIndex, location+1);
// NSLog(@"Updating Next: from %d to %d", nextPage.pageIndex, location+1);
[self applyNewIndex:location+1 pageController:self.nextPage];
}
if (self.previousPage.pageIndex != location-1) {
NSLog(@"Updating Previous: from %d to %d", previousPage.pageIndex, location-1);
// NSLog(@"Updating Previous: from %d to %d", previousPage.pageIndex, location-1);
[self applyNewIndex:location-1 pageController:self.previousPage];
}
}

4
media/ios/Classes/TrainerViewController.m
View file

@ -369,7 +369,9 @@
NSString *titleTrainer = [NSString stringWithFormat:@"<div class=\"NB-trainer-section-inner\">"
" <div class=\"NB-trainer-section-title\">Story Title</div>"
" <div class=\"NB-trainer-section-body NB-title\">"
" <div class=\"NB-title-trainer\">%@</div>"
" <div class=\"NB-title-trainer\">"
" <span>%@</span>"
" </div>"
" %@"
" </div>"
"</div>", storyTitle, titleClassifiers];

2
media/ios/Entitlements.entitlements
View file

@ -5,7 +5,7 @@
<key>application-identifier</key>
<string>$(AppIdentifierPrefix)$(CFBundleIdentifier)</string>
<key>get-task-allow</key>
<true/>
<false/>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)$(CFBundleIdentifier)</string>

12
media/ios/NewsBlur.xcodeproj/project.pbxproj
View file

@ -1757,7 +1757,7 @@
FF2D8BDC1487EFF000057B80 /* Facebook */,
FF2D8BF31487EFF000057B80 /* Instapaper */,
FF2D8BF61487EFF000057B80 /* Pinboard */,
FF2D8BF91487EFF000057B80 /* Pocket */,
FF2D8BF91487EFF000057B80 /* Read It Later */,
FF2D8BFC1487EFF000057B80 /* Tumblr */,
FF2D8BFF1487EFF000057B80 /* Twitter */,
);
@ -1793,7 +1793,7 @@
path = Pinboard;
sourceTree = "<group>";
};
FF2D8BF91487EFF000057B80 /* Pocket */ = {
FF2D8BF91487EFF000057B80 /* Read It Later */ = {
isa = PBXGroup;
children = (
FF2D8BFA1487EFF000057B80 /* SHKReadItLater.h */,
@ -2463,8 +2463,8 @@
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = "-ObjC";
PROVISIONING_PROFILE = "EE8BC292-FFF2-41A0-AE29-C4B39D6A2C5A";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "EE8BC292-FFF2-41A0-AE29-C4B39D6A2C5A";
PROVISIONING_PROFILE = "548B341C-C438-40E2-943F-ACB87D42AED4";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "548B341C-C438-40E2-943F-ACB87D42AED4";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
@ -2486,8 +2486,8 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
OTHER_LDFLAGS = "-ObjC";
PROVISIONING_PROFILE = "EE8BC292-FFF2-41A0-AE29-C4B39D6A2C5A";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "EE8BC292-FFF2-41A0-AE29-C4B39D6A2C5A";
PROVISIONING_PROFILE = "548B341C-C438-40E2-943F-ACB87D42AED4";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "548B341C-C438-40E2-943F-ACB87D42AED4";
SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO;
VALID_ARCHS = armv7;

6
media/ios/NewsBlur.xcodeproj/xcuserdata/sclay.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
View file

@ -8,11 +8,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Classes/StoryPageControl.m"
timestampString = "377572385.895663"
timestampString = "379293086.668773"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "301"
endingLineNumber = "301"
startingLineNumber = "298"
endingLineNumber = "298"
landmarkName = "-applyNewIndex:pageController:"
landmarkType = "5">
</FileBreakpoint>

2
media/ios/static/storyDetailView.css
View file

@ -452,7 +452,6 @@ a.NB-show-profile {
a.NB-show-profile {
-webkit-text-size-adjust: none;
-webkit-user-select: none;
-webkit-highlight: none;
-webkit-touch-callout: none;
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
@ -460,7 +459,6 @@ a.NB-show-profile {
.NB-header,
#NB-share-bar-wrapper {
-webkit-user-select: none;
-webkit-highlight: none;
-webkit-touch-callout: none;
}

17
media/ios/static/trainer.css
View file

@ -56,18 +56,25 @@
padding: 0 12px 12px;
}
.NB-trainer-title .NB-title-trainer {
padding: 18px 0 12px;
font-size: 18px;
font-weight: bold;
line-height: 24px;
width: 100%;
min-height: 36px;
-webkit-user-select: text;
-webkit-touch-callout: default;
-webkit-highlight: auto;
-webkit-tap-highlight-color: auto;
}
.NB-trainer-title .NB-title-trainer span {
display: block;
padding: 18px 0 18px;
min-height: 36px;
}
.NB-trainer-title .NB-title-trainer .NB-spacer {
display: block;
height: 1px;
-webkit-user-select: none;
-webkit-touch-callout: none;
-webkit-tap-highlight-color: none;
}
.NB-title-info {
text-transform: uppercase;
color: #C0C0C0;