mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Fixing last few bugs (paging for next unread on river blurblog) before submission of v1.6 of iOS app.
This commit is contained in:
parent
1d631964e4
commit
e0e351b9e1
8 changed files with 28 additions and 23 deletions
BIN
media/img/iphone/iphone_logo_1024.png
Normal file
BIN
media/img/iphone/iphone_logo_1024.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 111 KiB |
Binary file not shown.
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 513 KiB |
|
@ -212,10 +212,14 @@
|
|||
#pragma mark Regular and Social Feeds
|
||||
|
||||
- (void)fetchNextPage:(void(^)())callback {
|
||||
[self fetchFeedDetail:self.feedPage+1 withCallback:callback];
|
||||
if (appDelegate.isRiverView) {
|
||||
[self fetchRiverPage:self.feedPage+1 withCallback:callback];
|
||||
} else {
|
||||
[self fetchFeedDetail:self.feedPage+1 withCallback:callback];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)fetchFeedDetail:(int)page withCallback:(void(^)())callback {
|
||||
- (void)fetchFeedDetail:(int)page withCallback:(void(^)())callback {
|
||||
NSString *theFeedDetailURL;
|
||||
|
||||
if (!self.pageFetching && !self.pageFinished) {
|
||||
|
@ -437,7 +441,7 @@
|
|||
[self.storyTitlesTable reloadData];
|
||||
|
||||
} else if (newStoriesCount == 0 ||
|
||||
(self.feedPage > 15 &&
|
||||
(self.feedPage > 25 &&
|
||||
existingStoriesCount >= [appDelegate unreadCount])) {
|
||||
self.pageFinished = YES;
|
||||
[self.storyTitlesTable reloadData];
|
||||
|
@ -666,7 +670,7 @@
|
|||
int rowIndex = [appDelegate locationOfActiveStory];
|
||||
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:rowIndex inSection:0];
|
||||
FeedDetailTableCell *cell = (FeedDetailTableCell*) [self.storyTitlesTable cellForRowAtIndexPath:indexPath];
|
||||
cell.isRead = NO;
|
||||
cell.isRead = [[appDelegate.activeStory objectForKey:@"read_status"] boolValue];
|
||||
[cell setNeedsDisplay];
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#import "FontSettingsViewController.h"
|
||||
#import "NewsBlurAppDelegate.h"
|
||||
#import "StoryDetailViewController.h"
|
||||
#import "FeedDetailViewController.h"
|
||||
#import "MenuTableViewCell.h"
|
||||
#import "NBContainerViewController.h"
|
||||
|
||||
|
@ -199,6 +200,7 @@
|
|||
[appDelegate.storyDetailViewController markStoryAsUnread];
|
||||
} else {
|
||||
[appDelegate.storyDetailViewController markStoryAsRead];
|
||||
[appDelegate.feedDetailViewController redrawUnreadStory];
|
||||
}
|
||||
} else if (indexPath.row == 2) {
|
||||
[appDelegate.storyDetailViewController openSendToDialog];
|
||||
|
|
|
@ -248,7 +248,7 @@
|
|||
popoverController.delegate = self;
|
||||
|
||||
|
||||
[popoverController setPopoverContentSize:CGSizeMake(200, 86)];
|
||||
[popoverController setPopoverContentSize:CGSizeMake(200, 76)];
|
||||
// UIBarButtonItem *settingsButton = [[UIBarButtonItem alloc]
|
||||
// initWithCustomView:sender];
|
||||
[popoverController presentPopoverFromBarButtonItem:sender
|
||||
|
|
|
@ -1177,7 +1177,6 @@
|
|||
}
|
||||
|
||||
- (void)markActiveStorySaved:(BOOL)saved {
|
||||
NSLog(@"Save story: %@ --- %d", self.activeStory, saved);
|
||||
NSMutableDictionary *newStory = [self.activeStory mutableCopy];
|
||||
[newStory setValue:[NSNumber numberWithBool:saved] forKey:@"starred"];
|
||||
|
||||
|
|
|
@ -49,11 +49,11 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.5</string>
|
||||
<string>1.6</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.5</string>
|
||||
<string>1.6</string>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>NSMainNibFile</key>
|
||||
|
|
|
@ -2345,8 +2345,8 @@
|
|||
);
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Entitlements.entitlements;
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer: Samuel Clay (G9HFWP68T7)";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
CODE_SIGN_IDENTITY = "iPhone Distribution: NewsBlur, Inc.";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: NewsBlur, Inc.";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
|
@ -2368,8 +2368,8 @@
|
|||
"-ObjC",
|
||||
);
|
||||
PRODUCT_NAME = NewsBlur;
|
||||
PROVISIONING_PROFILE = "";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
|
||||
PROVISIONING_PROFILE = "7B9F5761-3D49-495A-9090-AFC4AC7BF03D";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "7B9F5761-3D49-495A-9090-AFC4AC7BF03D";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
"WARNING_CFLAGS[arch=*]" = "-Wall";
|
||||
};
|
||||
|
@ -2385,7 +2385,7 @@
|
|||
);
|
||||
CLANG_ENABLE_OBJC_ARC = YES;
|
||||
CODE_SIGN_ENTITLEMENTS = Entitlements.entitlements;
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer: Samuel Clay (G9HFWP68T7)";
|
||||
CODE_SIGN_IDENTITY = "iPhone Distribution: NewsBlur, Inc.";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: NewsBlur, Inc.";
|
||||
COPY_PHASE_STRIP = YES;
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
|
@ -2405,8 +2405,8 @@
|
|||
"-all_load",
|
||||
);
|
||||
PRODUCT_NAME = NewsBlur;
|
||||
PROVISIONING_PROFILE = "";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "3674B4BA-9006-4099-A608-673EC3103906";
|
||||
PROVISIONING_PROFILE = "7B9F5761-3D49-495A-9090-AFC4AC7BF03D";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "7B9F5761-3D49-495A-9090-AFC4AC7BF03D";
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
VALIDATE_PRODUCT = YES;
|
||||
};
|
||||
|
@ -2416,8 +2416,8 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
||||
CODE_SIGN_IDENTITY = "iPhone Distribution: Samuel Clay";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Samuel Clay";
|
||||
CODE_SIGN_IDENTITY = "iPhone Distribution";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
GCC_C_LANGUAGE_STANDARD = "compiler-default";
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
|
@ -2425,8 +2425,8 @@
|
|||
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/**";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
||||
OTHER_LDFLAGS = "-ObjC";
|
||||
PROVISIONING_PROFILE = "382118CB-42EB-4479-93DB-9963EFFA6DDD";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "382118CB-42EB-4479-93DB-9963EFFA6DDD";
|
||||
PROVISIONING_PROFILE = "";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
|
||||
RUN_CLANG_STATIC_ANALYZER = YES;
|
||||
SDKROOT = iphoneos;
|
||||
STRIP_INSTALLED_PRODUCT = NO;
|
||||
|
@ -2437,8 +2437,8 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
|
||||
CODE_SIGN_IDENTITY = "iPhone Distribution: Samuel Clay";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Samuel Clay";
|
||||
CODE_SIGN_IDENTITY = "iPhone Distribution";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
|
||||
COPY_PHASE_STRIP = NO;
|
||||
GCC_C_LANGUAGE_STANDARD = "compiler-default";
|
||||
GCC_WARN_ABOUT_RETURN_TYPE = YES;
|
||||
|
@ -2447,8 +2447,8 @@
|
|||
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
|
||||
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
|
||||
OTHER_LDFLAGS = "-ObjC";
|
||||
PROVISIONING_PROFILE = "382118CB-42EB-4479-93DB-9963EFFA6DDD";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "382118CB-42EB-4479-93DB-9963EFFA6DDD";
|
||||
PROVISIONING_PROFILE = "";
|
||||
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
|
||||
SDKROOT = iphoneos;
|
||||
STRIP_INSTALLED_PRODUCT = NO;
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue