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

Moving story loading indicator into story traversal controls. Adding mail icon. Cleaning up segmented controls.

Browse source
This commit is contained in:
Samuel Clay 2013-04-23 11:52:34 -07:00
parent 5fa8730dc2
commit e91c642a58
12 changed files with 133 additions and 6443 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/reader/views.py
View file

@ -493,7 +493,7 @@ def load_single_feed(request, feed_id):
read_filter = request.REQUEST.get('read_filter', 'all')
query = request.REQUEST.get('query')
include_story_content = is_true(request.REQUEST.get('include_story_content', True))
if page > 2: time.sleep(5)
dupe_feed_id = None
userstories_db = None
user_profiles = []

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

@ -166,7 +166,7 @@
cell.imageView.image = [UIImage imageNamed:@"g_icn_unread.png"];
} else if (indexPath.row == 2) {
cell.textLabel.text = [@"Send to..." uppercaseString];
cell.imageView.image = [UIImage imageNamed:@"email"];
cell.imageView.image = [UIImage imageNamed:@"menu_icn_mail.png"];
} else if (indexPath.row == 3) {
cell.textLabel.text = [@"Train this story" uppercaseString];
cell.imageView.image = [UIImage imageNamed:@"menu_icn_train.png"];

8
media/ios/Classes/NewsBlurViewController.m
View file

@ -128,16 +128,16 @@ static const CGFloat kFolderTitleHeight = 28;
barMetrics:UIBarMetricsDefault];
[[UISegmentedControl appearance]
setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
[UIFont boldSystemFontOfSize:11.0f], UITextAttributeFont,
UIColorFromRGB(0x505050), UITextAttributeTextColor,
[UIFont fontWithName:@"Helvetica-Bold" size:11.0f], UITextAttributeFont,
UIColorFromRGB(0x7B7D77), UITextAttributeTextColor,
UIColorFromRGB(0xF0F0F0), UITextAttributeTextShadowColor,
[NSValue valueWithUIOffset:UIOffsetMake(0, -1)], UITextAttributeTextShadowOffset,
nil]
forState:UIControlStateNormal];
[[UISegmentedControl appearance]
setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
[UIFont boldSystemFontOfSize:11.0f], UITextAttributeFont,
UIColorFromRGB(0x505050), UITextAttributeTextColor,
[UIFont fontWithName:@"Helvetica-Bold" size:11.0f], UITextAttributeFont,
UIColorFromRGB(0x5B5D57), UITextAttributeTextColor,
UIColorFromRGB(0xF0F0F0), UITextAttributeTextShadowColor,
[NSValue valueWithUIOffset:UIOffsetMake(0, -1)], UITextAttributeTextShadowOffset,
nil]

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

@ -99,6 +99,7 @@
percentage:20];
[self.traverseView addSubview:circularProgressView];
[circularProgressView addGestureRecognizer:tap];
self.loadingIndicator.frame = self.circularProgressView.frame;
self.buttonNext.titleEdgeInsets = UIEdgeInsetsMake(0, 24, 0, 0);
@ -392,6 +393,7 @@
[self resizeScrollView];
[self.loadingIndicator stopAnimating];
self.circularProgressView.hidden = NO;
}
- (void)scrollViewDidScroll:(UIScrollView *)sender {
@ -957,6 +959,7 @@
if (nextLocation == -1 && unreadCount > 0 &&
fdvc.feedPage < 100) {
[self.loadingIndicator startAnimating];
self.circularProgressView.hidden = YES;
self.buttonNext.enabled = NO;
// Fetch next page and see if it has the unreads.
self.waitingForNextUnreadFromServer = YES;
@ -974,6 +977,7 @@
- (IBAction)doPreviousStory {
[self.loadingIndicator stopAnimating];
self.circularProgressView.hidden = NO;
id previousStoryId = [appDelegate popReadStory];
if (!previousStoryId || previousStoryId == [appDelegate.activeStory objectForKey:@"id"]) {
[appDelegate.navigationController

46
media/ios/Classes/StoryPageControl.xib
View file

@ -41,21 +41,7 @@
<object class="IBUIScrollView" id="757323871">
<reference key="NSNextResponder" ref="179724038"/>
<int key="NSvFlags">1298</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIActivityIndicatorView" id="744070155">
<reference key="NSNextResponder" ref="757323871"/>
<int key="NSvFlags">1289</int>
<string key="NSFrame">{{128, 425}, {20, 20}}</string>
<reference key="NSSuperview" ref="757323871"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="853089862"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIAnimating">YES</bool>
<int key="IBUIStyle">2</int>
</object>
</array>
<array class="NSMutableArray" key="NSSubviews"/>
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview" ref="179724038"/>
@ -137,7 +123,6 @@
<string key="NSFrame">{{51.5, 9}, {104, 34}}</string>
<reference key="NSSuperview" ref="853089862"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -176,6 +161,23 @@
</object>
<reference key="IBUIFont" ref="165876350"/>
</object>
<object class="IBUIActivityIndicatorView" id="744070155">
<reference key="NSNextResponder" ref="853089862"/>
<int key="NSvFlags">1289</int>
<string key="NSFrame">{{57.5, 16}, {20, 20}}</string>
<reference key="NSSuperview" ref="853089862"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="853089862"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIAnimating">YES</bool>
<int key="IBUIStyle">2</int>
<object class="NSColor" key="IBUIColor">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC42MDc4NDMxNjA2IDAuNjE1Njg2Mjk3NCAwLjU4ODIzNTMxODcAA</bytes>
</object>
</object>
</array>
<string key="NSFrame">{{146.5, 409}, {173.5, 51}}</string>
<reference key="NSSuperview" ref="179724038"/>
@ -4693,9 +4695,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<object class="IBObjectRecord">
<int key="objectID">5</int>
<reference key="object" ref="757323871"/>
<array class="NSMutableArray" key="children">
<reference ref="744070155"/>
</array>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="179724038"/>
</object>
<object class="IBObjectRecord">
@ -4705,6 +4705,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference ref="157984429"/>
<reference ref="910120672"/>
<reference ref="24321768"/>
<reference ref="744070155"/>
</array>
<reference key="parent" ref="179724038"/>
</object>
@ -4726,7 +4727,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<object class="IBObjectRecord">
<int key="objectID">73</int>
<reference key="object" ref="744070155"/>
<reference key="parent" ref="757323871"/>
<reference key="parent" ref="853089862"/>
</object>
</array>
</object>
@ -5023,6 +5024,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="spacer3BarButton">UIBarButtonItem</string>
<string key="spacerBarButton">UIBarButtonItem</string>
<string key="storyTitlesTable">UITableView</string>
<string key="titleImageBarButton">UIBarButtonItem</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="appDelegate">
@ -5061,6 +5063,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="name">storyTitlesTable</string>
<string key="candidateClassName">UITableView</string>
</object>
<object class="IBToOneOutletInfo" key="titleImageBarButton">
<string key="name">titleImageBarButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>

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

@ -55,7 +55,9 @@ static NSMutableDictionary *imageCache;
+ (UIImage *)getImage:(NSString *)filename isSocial:(BOOL)isSocial {
UIImage *image;
image = [imageCache objectForKey:filename];
if (filename && [[imageCache allKeys] containsObject:filename]) {
image = [imageCache objectForKey:filename];
}
if (!image || [image class] == [NSNull class]) {
// Image not in cache, search on disk.

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

@ -290,9 +290,10 @@
FF9B566816E810900054BF68 /* Pocket-Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF9B566216E810900054BF68 /* Pocket-Icon@2x.png */; };
FF9B566916E810900054BF68 /* Readability-Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = FF9B566316E810900054BF68 /* Readability-Icon.png */; };
FF9B566A16E810900054BF68 /* Readability-Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF9B566416E810900054BF68 /* Readability-Icon@2x.png */; };
FFAD0BE71649EC1800EE33D0 /* StoryPageControl~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FFAD0BE61649EC1800EE33D0 /* StoryPageControl~ipad.xib */; };
FFAD4971144A386100BA6919 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FFAD4970144A386100BA6919 /* libz.dylib */; };
FFB5F50B17187B6F00C8B432 /* big_world.png in Resources */ = {isa = PBXBuildFile; fileRef = FFB5F50A17187B6F00C8B432 /* big_world.png */; };
FFB757FE1727098D001D132F /* menu_icn_mail.png in Resources */ = {isa = PBXBuildFile; fileRef = FFB757FC1727098D001D132F /* menu_icn_mail.png */; };
FFB757FF1727098D001D132F /* menu_icn_mail@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFB757FD1727098D001D132F /* menu_icn_mail@2x.png */; };
FFC5F30B16E2D2C2007AC72C /* story_share_appnet_active.png in Resources */ = {isa = PBXBuildFile; fileRef = FFC5F2FF16E2D2C2007AC72C /* story_share_appnet_active.png */; };
FFC5F30C16E2D2C2007AC72C /* story_share_appnet_active@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FFC5F30016E2D2C2007AC72C /* story_share_appnet_active@2x.png */; };
FFC5F30D16E2D2C2007AC72C /* story_share_appnet.png in Resources */ = {isa = PBXBuildFile; fileRef = FFC5F30116E2D2C2007AC72C /* story_share_appnet.png */; };
@ -817,9 +818,10 @@
FF9B566216E810900054BF68 /* Pocket-Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Pocket-Icon@2x.png"; sourceTree = "<group>"; };
FF9B566316E810900054BF68 /* Readability-Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Readability-Icon.png"; sourceTree = "<group>"; };
FF9B566416E810900054BF68 /* Readability-Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Readability-Icon@2x.png"; sourceTree = "<group>"; };
FFAD0BE61649EC1800EE33D0 /* StoryPageControl~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "StoryPageControl~ipad.xib"; path = "Resources-iPad/Classes/StoryPageControl~ipad.xib"; sourceTree = "<group>"; };
FFAD4970144A386100BA6919 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
FFB5F50A17187B6F00C8B432 /* big_world.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = big_world.png; sourceTree = "<group>"; };
FFB757FC1727098D001D132F /* menu_icn_mail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu_icn_mail.png; sourceTree = "<group>"; };
FFB757FD1727098D001D132F /* menu_icn_mail@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menu_icn_mail@2x.png"; sourceTree = "<group>"; };
FFC5F2FF16E2D2C2007AC72C /* story_share_appnet_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = story_share_appnet_active.png; sourceTree = "<group>"; };
FFC5F30016E2D2C2007AC72C /* story_share_appnet_active@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "story_share_appnet_active@2x.png"; sourceTree = "<group>"; };
FFC5F30116E2D2C2007AC72C /* story_share_appnet.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = story_share_appnet.png; sourceTree = "<group>"; };
@ -1319,6 +1321,8 @@
FFDD848516E8EB1E000AA0A2 /* share@2x.png */,
FFDD846816E88722000AA0A2 /* clock.png */,
FFDD846916E88722000AA0A2 /* clock@2x.png */,
FFB757FC1727098D001D132F /* menu_icn_mail.png */,
FFB757FD1727098D001D132F /* menu_icn_mail@2x.png */,
FFDD845016E8871A000AA0A2 /* menu_icn_delete.png */,
FFDD845116E8871A000AA0A2 /* menu_icn_delete@2x.png */,
FFDD845216E8871A000AA0A2 /* menu_icn_fetch_subscribers.png */,
@ -1646,7 +1650,6 @@
FF67D3B816897AD80057A7DA /* TrainerViewController~ipad.xib */,
43D045251565BC150085F811 /* OriginalStoryViewController~ipad.xib */,
43D045221565BC150085F811 /* StoryDetailViewController~ipad.xib */,
FFAD0BE61649EC1800EE33D0 /* StoryPageControl~ipad.xib */,
437AA8C9159394E2005463F5 /* ShareViewController~ipad.xib */,
);
name = "Resources-iPad";
@ -2176,7 +2179,6 @@
FF41309D162CEC7100DDB6A7 /* time.png in Resources */,
FF4130A0162CECAE00DDB6A7 /* email.png in Resources */,
FF6A23391644957800E15989 /* StoryPageControl.xib in Resources */,
FFAD0BE71649EC1800EE33D0 /* StoryPageControl~ipad.xib in Resources */,
FF67D3B51689746B0057A7DA /* bricks.png in Resources */,
FF67D3B7168977690057A7DA /* TrainerViewController.xib in Resources */,
FF67D3B916897AD80057A7DA /* TrainerViewController~ipad.xib in Resources */,
@ -2311,6 +2313,8 @@
FFDD848E16E8ED75000AA0A2 /* menu_icn_share.png in Resources */,
FFDD848F16E8ED75000AA0A2 /* menu_icn_share@2x.png in Resources */,
FFB5F50B17187B6F00C8B432 /* big_world.png in Resources */,
FFB757FE1727098D001D132F /* menu_icn_mail.png in Resources */,
FFB757FF1727098D001D132F /* menu_icn_mail@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

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 = "379293086.668773"
timestampString = "388435656.299212"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "298"
endingLineNumber = "298"
startingLineNumber = "301"
endingLineNumber = "301"
landmarkName = "-resizeScrollView"
landmarkType = "5">
</FileBreakpoint>

156
media/ios/Resources-iPad/Classes/DashboardViewController~ipad.xib
View file

@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12C3006</string>
<string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<string key="IBDocument.AppKitVersion">1187.37</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">2083</string>
@ -150,6 +150,7 @@
<string key="NSFrame">{{119, 8}, {240, 30}}</string>
<reference key="NSSuperview" ref="166456364"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -157,8 +158,8 @@
<int key="IBNumberOfSegments">2</int>
<int key="IBSelectedSegmentIndex">0</int>
<array key="IBSegmentTitles">
<string>Interactions</string>
<string>Your Activities</string>
<string>INTERACTIONS</string>
<string>ACTIVITIES</string>
</array>
<array class="NSMutableArray" key="IBSegmentWidths">
<real value="0.0"/>
@ -421,18 +422,13 @@
<string key="className">AddSiteViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="addFolder">id</string>
<string key="addSite">id</string>
<string key="checkSiteAddress">id</string>
<string key="doAddButton">id</string>
<string key="doCancelButton">id</string>
<string key="selectAddTypeSignup">id</string>
<string key="toggleAddFolder:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="addFolder">
<string key="name">addFolder</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="addSite">
<string key="name">addSite</string>
<string key="candidateClassName">id</string>
@ -449,16 +445,16 @@
<string key="name">doCancelButton</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="selectAddTypeSignup">
<string key="name">selectAddTypeSignup</string>
<object class="IBActionInfo" key="toggleAddFolder:">
<string key="name">toggleAddFolder:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="activityIndicator">UIActivityIndicatorView</string>
<string key="addButton">UIBarButtonItem</string>
<string key="addFolderButton">UIButton</string>
<string key="addFolderInput">UITextField</string>
<string key="addTypeControl">UISegmentedControl</string>
<string key="addingLabel">UILabel</string>
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="cancelButton">UIBarButtonItem</string>
@ -480,14 +476,14 @@
<string key="name">addButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="addFolderButton">
<string key="name">addFolderButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="addFolderInput">
<string key="name">addFolderInput</string>
<string key="candidateClassName">UITextField</string>
</object>
<object class="IBToOneOutletInfo" key="addTypeControl">
<string key="name">addTypeControl</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo" key="addingLabel">
<string key="name">addingLabel</string>
<string key="candidateClassName">UILabel</string>
@ -680,6 +676,7 @@
<string key="spacer3BarButton">UIBarButtonItem</string>
<string key="spacerBarButton">UIBarButtonItem</string>
<string key="storyTitlesTable">UITableView</string>
<string key="titleImageBarButton">UIBarButtonItem</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="appDelegate">
@ -718,6 +715,10 @@
<string key="name">storyTitlesTable</string>
<string key="candidateClassName">UITableView</string>
</object>
<object class="IBToOneOutletInfo" key="titleImageBarButton">
<string key="name">titleImageBarButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@ -746,33 +747,6 @@
<string key="minorKey">./Classes/FeedsMenuViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FindSitesViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="sitesSearchBar">UISearchBar</string>
<string key="sitesTable">UITableView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="sitesSearchBar">
<string key="name">sitesSearchBar</string>
<string key="candidateClassName">UISearchBar</string>
</object>
<object class="IBToOneOutletInfo" key="sitesTable">
<string key="name">sitesTable</string>
<string key="candidateClassName">UITableView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FindSitesViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserAddFriendsViewController</string>
<string key="superclassName">UIViewController</string>
@ -1328,6 +1302,14 @@
<string key="minorKey">./Classes/NBContainerViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NewsBlurAppDelegate</string>
<string key="superclassName">BaseViewController</string>
@ -1339,7 +1321,6 @@
<string key="feedDetailViewController">FeedDetailViewController</string>
<string key="feedsMenuViewController">FeedsMenuViewController</string>
<string key="feedsViewController">NewsBlurViewController</string>
<string key="findSitesViewController">FindSitesViewController</string>
<string key="firstTimeUserAddFriendsViewController">FirstTimeUserAddFriendsViewController</string>
<string key="firstTimeUserAddNewsBlurViewController">FirstTimeUserAddNewsBlurViewController</string>
<string key="firstTimeUserAddSitesViewController">FirstTimeUserAddSitesViewController</string>
@ -1388,10 +1369,6 @@
<string key="name">feedsViewController</string>
<string key="candidateClassName">NewsBlurViewController</string>
</object>
<object class="IBToOneOutletInfo" key="findSitesViewController">
<string key="name">findSitesViewController</string>
<string key="candidateClassName">FindSitesViewController</string>
</object>
<object class="IBToOneOutletInfo" key="firstTimeUserAddFriendsViewController">
<string key="name">firstTimeUserAddFriendsViewController</string>
<string key="candidateClassName">FirstTimeUserAddFriendsViewController</string>
@ -1588,6 +1565,9 @@
<string key="doCloseOriginalStoryViewController">id</string>
<string key="doOpenActionSheet">id</string>
<string key="loadAddress:">id</string>
<string key="webViewGoBack:">id</string>
<string key="webViewGoForward:">id</string>
<string key="webViewRefresh:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="doCloseOriginalStoryViewController">
@ -1602,6 +1582,18 @@
<string key="name">loadAddress:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="webViewGoBack:">
<string key="name">webViewGoBack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="webViewGoForward:">
<string key="name">webViewGoForward:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="webViewRefresh:">
<string key="name">webViewRefresh:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
@ -1691,8 +1683,11 @@
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="appdotnetButton">UIButton</string>
<string key="commentField">UITextView</string>
<string key="facebookButton">UIButton</string>
<string key="keyboardHeight">NSLayoutConstraint</string>
<string key="storyTitle">UILabel</string>
<string key="submitButton">UIBarButtonItem</string>
<string key="twitterButton">UIButton</string>
</dictionary>
@ -1701,6 +1696,10 @@
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="appdotnetButton">
<string key="name">appdotnetButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="commentField">
<string key="name">commentField</string>
<string key="candidateClassName">UITextView</string>
@ -1709,6 +1708,14 @@
<string key="name">facebookButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="keyboardHeight">
<string key="name">keyboardHeight</string>
<string key="candidateClassName">NSLayoutConstraint</string>
</object>
<object class="IBToOneOutletInfo" key="storyTitle">
<string key="name">storyTitle</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo" key="submitButton">
<string key="name">submitButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -1793,17 +1800,16 @@
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="activity">UIBarButtonItem</string>
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="bottomPlaceholderToolbar">UIToolbar</string>
<string key="buttonAction">UIBarButtonItem</string>
<string key="buttonNext">UIBarButtonItem</string>
<string key="buttonPrevious">UIBarButtonItem</string>
<string key="buttonNext">UIButton</string>
<string key="buttonPrevious">UIButton</string>
<string key="circularProgressView">THCircularProgressView</string>
<string key="fontSettingsButton">UIBarButtonItem</string>
<string key="loadingIndicator">UIActivityIndicatorView</string>
<string key="originalStoryButton">UIBarButtonItem</string>
<string key="pageControl">UIPageControl</string>
<string key="progressView">UIProgressView</string>
<string key="progressViewContainer">UIView</string>
<string key="rightToolbar">TransparentToolbar</string>
<string key="scrollView">UIScrollView</string>
<string key="separatorBarButton">UIBarButtonItem</string>
@ -1811,13 +1817,9 @@
<string key="spacer3BarButton">UIBarButtonItem</string>
<string key="spacerBarButton">UIBarButtonItem</string>
<string key="subscribeButton">UIBarButtonItem</string>
<string key="toolbar">UIToolbar</string>
<string key="traverseView">UIView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="activity">
<string key="name">activity</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
@ -1832,16 +1834,24 @@
</object>
<object class="IBToOneOutletInfo" key="buttonNext">
<string key="name">buttonNext</string>
<string key="candidateClassName">UIBarButtonItem</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="buttonPrevious">
<string key="name">buttonPrevious</string>
<string key="candidateClassName">UIBarButtonItem</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="circularProgressView">
<string key="name">circularProgressView</string>
<string key="candidateClassName">THCircularProgressView</string>
</object>
<object class="IBToOneOutletInfo" key="fontSettingsButton">
<string key="name">fontSettingsButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="loadingIndicator">
<string key="name">loadingIndicator</string>
<string key="candidateClassName">UIActivityIndicatorView</string>
</object>
<object class="IBToOneOutletInfo" key="originalStoryButton">
<string key="name">originalStoryButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
@ -1850,14 +1860,6 @@
<string key="name">pageControl</string>
<string key="candidateClassName">UIPageControl</string>
</object>
<object class="IBToOneOutletInfo" key="progressView">
<string key="name">progressView</string>
<string key="candidateClassName">UIProgressView</string>
</object>
<object class="IBToOneOutletInfo" key="progressViewContainer">
<string key="name">progressViewContainer</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="rightToolbar">
<string key="name">rightToolbar</string>
<string key="candidateClassName">TransparentToolbar</string>
@ -1886,9 +1888,9 @@
<string key="name">subscribeButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="toolbar">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
<object class="IBToOneOutletInfo" key="traverseView">
<string key="name">traverseView</string>
<string key="candidateClassName">UIView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -1896,6 +1898,14 @@
<string key="minorKey">./Classes/StoryPageControl.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">THCircularProgressView</string>
<string key="superclassName">UIView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/THCircularProgressView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">TrainerViewController</string>
<string key="superclassName">BaseViewController</string>

6336
media/ios/Resources-iPad/Classes/StoryPageControl~ipad.xib
View file

File diff suppressed because it is too large Load diff

BIN
media/ios/Resources/menu_icn_mail.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 437 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 865 B