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

Fixing animation bug when not on story list view.

Browse source
This commit is contained in:
Samuel Clay 2013-06-12 19:49:10 -07:00
parent b7a2789f80
commit 0c946e3241
8 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/reader/views.py
View file

@ -629,8 +629,9 @@ def load_single_feed(request, feed_id):
if dupe_feed_id: data['dupe_feed_id'] = dupe_feed_id
if not usersub:
data.update(feed.canonical())
time.sleep(2)
if page == 1:
time.sleep(2)
return data

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

@ -197,11 +197,8 @@
[self performSelector:@selector(fadeSelectedCell) withObject:self afterDelay:0.4];
}
if (!self.notifier || !self.notifier.view) {
NSLog(@"Frame of self.view: %@", NSStringFromCGRect(self.view.frame));
self.notifier = [[NBNotifier alloc] initWithTitle:@"Fetching stories..." inView:self.view];
}
[self.notifier hideIn:0];
self.notifier = [[NBNotifier alloc] initWithTitle:@"Fetching stories..." inView:self.view];
// [self.notifier hideIn:0];
}
- (void)viewDidAppear:(BOOL)animated {
@ -569,7 +566,7 @@
[appDelegate.database commit];
// NSLog(@"Inserting %d stories: %@", [confirmedNewStories count], [appDelegate.database lastErrorMessage]);
// [self.notifier hide];
[self.notifier hide];
}
#pragma mark -

1
media/ios/Classes/NBLoadingCell.m
View file

@ -34,6 +34,7 @@
}
- (void)animate {
if (!self.window || !self.superview.window) return;
NSLog(@"Animate");
if (!animating) return;
[UIView animateWithDuration:.650f delay:0.2f options:nil animations:^{

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

@ -288,7 +288,7 @@
if (self.style == NBLoadingStyle) {
CGContextSetFillColorWithColor(context, [UIColor colorWithRed:0.0f green:0.0f blue:0.0f alpha:0.6f].CGColor);
} else if (self.style == NBOfflineStyle) {
CGContextSetFillColorWithColor(context, [UIColor colorWithRed:200.0f green:40.0f blue:40.0f alpha:0.6f].CGColor);
CGContextSetFillColorWithColor(context, [UIColor colorWithRed:0.4 green:0.15 blue:0.1 alpha:0.6f].CGColor);
} else if (self.style == NBSyncingStyle) {
CGContextSetFillColorWithColor(context, [UIColor colorWithRed:0.0f green:0.0f blue:0.0f alpha:0.3f].CGColor);
}

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

@ -188,6 +188,7 @@
78FC34FB11CA94900055C312 /* SBJsonParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FC34F411CA94900055C312 /* SBJsonParser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
78FC34FC11CA94900055C312 /* SBJsonWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FC34F611CA94900055C312 /* SBJsonWriter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
FF11045F176950F900502C29 /* NBLoadingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FF11045E176950F900502C29 /* NBLoadingCell.m */; };
FF1104611769695A00502C29 /* g_icn_offline@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF1104601769695A00502C29 /* g_icn_offline@2x.png */; };
FF1660C816D6E9A700AF8541 /* DashboardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF1660C716D6E9A700AF8541 /* DashboardViewController.xib */; };
FF1660CA16D6E9B400AF8541 /* DashboardViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF1660C916D6E9B400AF8541 /* DashboardViewController~ipad.xib */; };
FF1660CD16D6FD8A00AF8541 /* SmallInteractionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FF1660CC16D6FD8A00AF8541 /* SmallInteractionCell.m */; };
@ -714,6 +715,7 @@
8D1107310486CEB800E47090 /* NewsBlur-iPhone-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "NewsBlur-iPhone-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
FF11045D176950F900502C29 /* NBLoadingCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBLoadingCell.h; sourceTree = "<group>"; };
FF11045E176950F900502C29 /* NBLoadingCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NBLoadingCell.m; sourceTree = "<group>"; };
FF1104601769695A00502C29 /* g_icn_offline@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "g_icn_offline@2x.png"; sourceTree = "<group>"; };
FF1660C716D6E9A700AF8541 /* DashboardViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DashboardViewController.xib; sourceTree = "<group>"; };
FF1660C916D6E9B400AF8541 /* DashboardViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "DashboardViewController~ipad.xib"; path = "Resources-iPad/Classes/DashboardViewController~ipad.xib"; sourceTree = "<group>"; };
FF1660CB16D6FD8A00AF8541 /* SmallInteractionCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmallInteractionCell.h; sourceTree = "<group>"; };
@ -1353,6 +1355,7 @@
431B857615A132B600DCE497 /* Images */ = {
isa = PBXGroup;
children = (
FF1104601769695A00502C29 /* g_icn_offline@2x.png */,
FFC518B81768E59F00542719 /* g_icn_offline.png */,
FF8364C41757EC0B008F5C58 /* traverse_background_left.png */,
FF8364C51757EC0B008F5C58 /* traverse_background_left@2x.png */,
@ -2387,6 +2390,7 @@
FF8364C61757EC0B008F5C58 /* traverse_background_left.png in Resources */,
FF8364C71757EC0B008F5C58 /* traverse_background_left@2x.png in Resources */,
FFC518B91768E59F00542719 /* g_icn_offline.png in Resources */,
FF1104611769695A00502C29 /* g_icn_offline@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

4
media/ios/NewsBlur_Prefix.pch
View file

@ -13,8 +13,8 @@
// #define BACKGROUND_REFRESH_SECONDS -5
#define BACKGROUND_REFRESH_SECONDS -10*60
// #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"]
#define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]
#define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"]
// #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]
#define NEWSBLUR_LINK_COLOR 0x405BA8
#define NEWSBLUR_HIGHLIGHT_COLOR 0xd2e6fd

BIN
media/ios/Resources/g_icn_offline.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 687 B

After

Width:  |  Height:  |  Size: 457 B

BIN
media/ios/Resources/g_icn_offline@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 767 B