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

Stubbing in saved story tags in ios feed list.

Browse source
This commit is contained in:
Samuel Clay 2014-05-20 12:21:17 -07:00
parent 39d2b0ac21
commit d26b6825b7
9 changed files with 51 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/profile/middleware.py
View file

@ -74,7 +74,7 @@ class DBProfilerMiddleware:
class SQLLogToConsoleMiddleware:
def activated(self, request):
return (settings.DEBUG or
return (settings.DEBUG_QUERIES or
(hasattr(request, 'activated_segments') and
'db_profiler' in request.activated_segments))

2
clients/ios/Classes/FolderTitleView.m
View file

@ -172,7 +172,7 @@
disclosureButton.frame = CGRectMake(customView.frame.size.width - 32, 3, 29, 29);
// Add collapse button to all folders except Everything
if (section != 0 && section != 2 && ![folderName isEqual:@"saved_stories"]) {
if (section != 0 && section != 2) {
if (!isFolderCollapsed) {
UIImage *disclosureImage = [UIImage imageNamed:@"disclosure_down.png"];
[disclosureButton setImage:disclosureImage forState:UIControlStateNormal];

2
clients/ios/Classes/NewsBlurAppDelegate.h
View file

@ -213,6 +213,7 @@
@property (nonatomic, strong) NSMutableDictionary *dictFeeds;
@property (nonatomic) NSMutableDictionary *dictActiveFeeds;
@property (nonatomic) NSDictionary *dictSocialFeeds;
@property (nonatomic) NSDictionary *dictSavedStoryTags;
@property (nonatomic) NSDictionary *dictSocialProfile;
@property (nonatomic) NSDictionary *dictUserProfile;
@property (nonatomic) NSDictionary *dictSocialServices;
@ -283,6 +284,7 @@
- (void)hideShareView:(BOOL)resetComment;
- (void)resetShareComments;
- (BOOL)isSocialFeed:(NSString *)feedIdStr;
- (BOOL)isSavedFeed:(NSString *)feedIdStr;
- (BOOL)isPortrait;
- (void)confirmLogout;
- (void)showConnectToService:(NSString *)serviceName;

22
clients/ios/Classes/NewsBlurAppDelegate.m
View file

@ -129,6 +129,7 @@
@synthesize dictFeeds;
@synthesize dictActiveFeeds;
@synthesize dictSocialFeeds;
@synthesize dictSavedStoryTags;
@synthesize dictSocialProfile;
@synthesize dictUserProfile;
@synthesize dictSocialServices;
@ -714,6 +715,7 @@
- (void)showLogin {
self.dictFeeds = nil;
self.dictSocialFeeds = nil;
self.dictSavedStoryTags = nil;
self.dictFolders = nil;
self.dictFoldersArray = nil;
self.userActivitiesArray = nil;
@ -952,6 +954,10 @@
return NO;
}
- (BOOL)isSavedFeed:(NSString *)feedIdStr {
return [feedIdStr startsWith:@"saved:"];
}
- (BOOL)isPortrait {
UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
if (orientation == UIInterfaceOrientationPortrait || orientation == UIInterfaceOrientationPortraitUpsideDown) {
@ -1100,12 +1106,12 @@
// add all the feeds from every NON blurblog folder
[feedDetailView.storiesCollection setActiveFolder:@"everything"];
for (NSString *folderName in self.feedsViewController.activeFeedLocations) {
if (![folderName isEqualToString:@"river_blurblogs"]) {
NSArray *originalFolder = [self.dictFolders objectForKey:folderName];
NSArray *folderFeeds = [self.feedsViewController.activeFeedLocations objectForKey:folderName];
for (int l=0; l < [folderFeeds count]; l++) {
[feeds addObject:[originalFolder objectAtIndex:[[folderFeeds objectAtIndex:l] intValue]]];
}
if ([folderName isEqualToString:@"river_blurblogs"]) continue;
if ([folderName isEqualToString:@"saved_stories"]) continue;
NSArray *originalFolder = [self.dictFolders objectForKey:folderName];
NSArray *folderFeeds = [self.feedsViewController.activeFeedLocations objectForKey:folderName];
for (int l=0; l < [folderFeeds count]; l++) {
[feeds addObject:[originalFolder objectAtIndex:[[folderFeeds objectAtIndex:l] intValue]]];
}
}
[self.folderCountCache removeAllObjects];
@ -1380,9 +1386,7 @@
#pragma mark - Unread Counts
- (void)populateDictUnreadCounts {
self.dictUnreadCounts = [NSMutableDictionary dictionary];
- (void)populateDictUnreadCounts {
[self.database inDatabase:^(FMDatabase *db) {
FMResultSet *cursor = [db executeQuery:@"SELECT * FROM unread_counts"];

42
clients/ios/Classes/NewsBlurViewController.m
View file

@ -489,7 +489,6 @@ static UIFont *userLabelFont;
- (void)finishLoadingFeedListWithDict:(NSDictionary *)results finished:(BOOL)finished {
NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults];
appDelegate.savedStoriesCount = [[results objectForKey:@"starred_count"] intValue];
[MBProgressHUD hideHUDForView:self.view animated:YES];
self.stillVisibleFeeds = [NSMutableDictionary dictionary];
@ -545,6 +544,7 @@ static UIFont *userLabelFont;
NSArray *sortedArray;
// Set up dictSocialProfile and userActivitiesArray
appDelegate.dictUnreadCounts = [NSMutableDictionary dictionary];
appDelegate.dictSocialProfile = [results objectForKey:@"social_profile"];
appDelegate.dictUserProfile = [results objectForKey:@"user_profile"];
appDelegate.dictSocialServices = [results objectForKey:@"social_services"];
@ -554,6 +554,7 @@ static UIFont *userLabelFont;
NSArray *socialFeedsArray = [results objectForKey:@"social_feeds"];
NSMutableArray *socialFolder = [[NSMutableArray alloc] init];
NSMutableDictionary *socialDict = [[NSMutableDictionary alloc] init];
NSMutableDictionary *savedStoryDict = [[NSMutableDictionary alloc] init];
NSMutableDictionary *tempActiveFeeds = [[NSMutableDictionary alloc] init];
appDelegate.dictActiveFeeds = tempActiveFeeds;
@ -577,8 +578,23 @@ static UIFont *userLabelFont;
[allFolders setValue:socialFolder forKey:@"river_blurblogs"];
[allFolders setValue:[[NSMutableArray alloc] init] forKey:@"river_global"];
appDelegate.savedStoriesCount = [[results objectForKey:@"starred_count"] intValue];
if (appDelegate.savedStoriesCount) {
[allFolders setValue:[[NSArray alloc] init] forKey:@"saved_stories"];
NSMutableArray *savedStories = [NSMutableArray array];
for (NSDictionary *userTag in [results objectForKey:@"starred_counts"]) {
if ([[userTag objectForKey:@"tag"] isEqualToString:@""]) continue;
NSString *savedTagId = [NSString stringWithFormat:@"saved:%@", [userTag objectForKey:@"tag"]];
NSDictionary *savedTag = @{@"ps": [userTag objectForKey:@"count"],
@"feed_title": [userTag objectForKey:@"tag"]};
[savedStories addObject:savedTagId];
[savedStoryDict setObject:savedTag forKey:savedTagId];
[appDelegate.dictUnreadCounts setObject:@{@"ps": [userTag objectForKey:@"count"],
@"nt": [NSNumber numberWithInt:0],
@"ng": [NSNumber numberWithInt:0]}
forKey:savedTagId];
}
[allFolders setValue:savedStories forKey:@"saved_stories"];
appDelegate.dictSavedStoryTags = savedStoryDict;
}
appDelegate.dictFolders = allFolders;
@ -1035,7 +1051,7 @@ static UIFont *userLabelFont;
}
NSString *folderName = [appDelegate.dictFoldersArray objectAtIndex:section];
return [[appDelegate.dictFolders objectForKey:folderName] count];
}
@ -1045,6 +1061,7 @@ static UIFont *userLabelFont;
id feedId = [[appDelegate.dictFolders objectForKey:folderName] objectAtIndex:indexPath.row];
NSString *feedIdStr = [NSString stringWithFormat:@"%@",feedId];
BOOL isSocial = [appDelegate isSocialFeed:feedIdStr];
BOOL isSaved = [appDelegate isSavedFeed:feedIdStr];
NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults];
NSString *collapseKey = [NSString stringWithFormat:@"folderCollapsed:%@", folderName];
bool isFolderCollapsed = [userPreferences boolForKey:collapseKey];
@ -1059,6 +1076,8 @@ static UIFont *userLabelFont;
return cell;
} else if (indexPath.section == 0 || indexPath.section == 1) {
CellIdentifier = @"BlurblogCellIdentifier";
} else if (isSaved) {
CellIdentifier = @"SavedCellIdentifier";
} else {
CellIdentifier = @"FeedCellIdentifier";
}
@ -1071,8 +1090,13 @@ static UIFont *userLabelFont;
cell.appDelegate = appDelegate;
}
if (isSaved) {
NSLog(@"Saved: %@", [appDelegate.dictSavedStoryTags objectForKey:feedIdStr]);
}
NSDictionary *feed = isSocial ?
[appDelegate.dictSocialFeeds objectForKey:feedIdStr] :
isSaved ?
[appDelegate.dictSavedStoryTags objectForKey:feedIdStr] :
[appDelegate.dictFeeds objectForKey:feedIdStr];
NSDictionary *unreadCounts = [appDelegate.dictUnreadCounts objectForKey:feedIdStr];
cell.feedFavicon = [appDelegate getFavicon:feedIdStr isSocial:isSocial];
@ -1406,7 +1430,9 @@ heightForHeaderInSection:(NSInteger)section {
feedId = [NSString stringWithFormat:@"%@",feedId];
}
NSDictionary *unreadCounts = [appDelegate.dictUnreadCounts objectForKey:feedId];
if ([appDelegate isSavedFeed:feedId]) {
NSLog(@"is visible: %@? %@", feedId, unreadCounts);
}
NSIndexPath *stillVisible = [self.stillVisibleFeeds objectForKey:feedId];
if (!stillVisible &&
appDelegate.selectedIntelligence >= 1 &&
@ -1585,10 +1611,8 @@ heightForHeaderInSection:(NSInteger)section {
}
- (void)loadAvatars {
NSLog(@"loadAvatars pre");
dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0ul);
dispatch_async(queue, ^{
NSLog(@"loadAvatars start");
for (NSString *feed_id in [appDelegate.dictSocialFeeds allKeys]) {
NSDictionary *feed = [appDelegate.dictSocialFeeds objectForKey:feed_id];
NSURL *imageURL = [NSURL URLWithString:[feed objectForKey:@"photo_url"]];
@ -1601,9 +1625,7 @@ heightForHeaderInSection:(NSInteger)section {
[appDelegate saveFavicon:faviconImage feedId:feed_id];
}
NSLog(@"loadAvatars end");
dispatch_async(dispatch_get_main_queue(), ^{
NSLog(@"loadAvatars post");
[self.feedTitlesTable reloadData];
});
});
@ -1614,7 +1636,6 @@ heightForHeaderInSection:(NSInteger)section {
- (void)saveAndDrawFavicons:(ASIHTTPRequest *)request {
__block NSString *responseString = [request responseString];
NSLog(@"saveAndDrawFavicons pre");
dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0ul);
dispatch_async(queue, ^{
NSData *responseData=[responseString dataUsingEncoding:NSUTF8StringEncoding];
@ -1624,7 +1645,6 @@ heightForHeaderInSection:(NSInteger)section {
options:kNilOptions
error:&error];
NSLog(@"saveAndDrawFavicons start");
for (id feed_id in results) {
// NSMutableDictionary *feed = [[appDelegate.dictFeeds objectForKey:feed_id] mutableCopy];
// [feed setValue:[results objectForKey:feed_id] forKey:@"favicon"];
@ -1639,9 +1659,7 @@ heightForHeaderInSection:(NSInteger)section {
}
}
NSLog(@"saveAndDrawFavicons end");
dispatch_async(dispatch_get_main_queue(), ^{
NSLog(@"saveAndDrawFavicons post");
[self.feedTitlesTable reloadData];
[self loadAvatars];
});

2
clients/ios/NewsBlur_Prefix.pch
View file

@ -5,7 +5,7 @@
#import <SystemConfiguration/SystemConfiguration.h>
#import <MobileCoreServices/MobileCoreServices.h>
//#define DEBUG 1
#define DEBUG 1
//#define PROD_DEBUG 1
#ifdef DEBUG

1
settings.py
View file

@ -57,6 +57,7 @@ SECRET_KEY = 'YOUR_SECRET_KEY'
DEBUG = False
TEST_DEBUG = False
SEND_BROKEN_LINK_EMAILS = False
DEBUG_QUERIES = False
MANAGERS = ADMINS
PAYPAL_RECEIVER_EMAIL = 'samuel@ofbrooklyn.com'
TIME_ZONE = 'GMT'

2
utils/mongo_raw_log_middleware.py
View file

@ -10,7 +10,7 @@ from bson.errors import InvalidBSON
class MongoDumpMiddleware(object):
def activated(self, request):
return (settings.DEBUG or
return (settings.DEBUG_QUERIES or
(hasattr(request, 'activated_segments') and
'db_profiler' in request.activated_segments))

2
utils/redis_raw_log_middleware.py
View file

@ -6,7 +6,7 @@ from time import time
class RedisDumpMiddleware(object):
def activated(self, request):
return (settings.DEBUG or
return (settings.DEBUG_QUERIES or
(hasattr(request, 'activated_segments') and
'db_profiler' in request.activated_segments))