mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-09-18 21:50:56 +00:00
Aligning arrows in web. Adding interactions dashboard on iphone app.
This commit is contained in:
Samuel Clay
parent
ffee37957e
commit
a7e223a1fa
11 changed files with 2048 additions and 55 deletions
|
|
@ -652,36 +652,44 @@ body {
|
|||
top: -1px;
|
||||
width: 20px;
|
||||
height: 22px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_right.png') no-repeat 3px 4px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_right.png') no-repeat 4px 6px;
|
||||
background-size: 8px;
|
||||
}
|
||||
.NB-feedlist .folder_title .NB-feedlist-manage-icon {
|
||||
background-position: 3px 5px;
|
||||
background-position: 4px 6px;
|
||||
}
|
||||
|
||||
.NB-feedlist .feed .NB-feedlist-manage-icon:hover,
|
||||
.NB-feedlist .folder_title .NB-feedlist-manage-icon:hover {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 3px 4px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 4px 6px;
|
||||
background-size: 8px;
|
||||
}
|
||||
.NB-feedlist .folder_title .NB-feedlist-manage-icon:hover {
|
||||
background-position: 3px 5px;
|
||||
background-position: 4px 5px;
|
||||
}
|
||||
.NB-feedlist .feed.NB-hover-inverse .NB-feedlist-manage-icon:hover,
|
||||
.NB-feedlist .folder.NB-hover-inverse .NB-feedlist-manage-icon:hover {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 3px 2px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 4px 8px;
|
||||
background-size: 8px;
|
||||
}
|
||||
|
||||
.NB-feedlist .folder.NB-hover-inverse .NB-feedlist-manage-icon:hover {
|
||||
background-position: 6px 8px;
|
||||
}
|
||||
.NB-feedlist .feed.NB-hover-inverse .NB-feedlist-manage-icon:hover {
|
||||
background-position: 4px 8px;
|
||||
}
|
||||
.NB-feedlist .feed.NB-toplevel.NB-hover-inverse .NB-feedlist-manage-icon:hover {
|
||||
background-position: 5px 7px;
|
||||
}
|
||||
.NB-feedlist .feed.NB-toplevel .NB-feedlist-manage-icon,
|
||||
.NB-feedlist .folder_title.NB-toplevel .NB-feedlist-manage-icon {
|
||||
left: 0;
|
||||
opacity: 1;
|
||||
display: none;
|
||||
background-position: 5px 4px;
|
||||
background-position: 6px 7px;
|
||||
}
|
||||
.NB-feedlist .folder_title.NB-toplevel .NB-feedlist-manage-icon {
|
||||
background-position: 5px 5px;
|
||||
background-position: 6px 8px;
|
||||
}
|
||||
.NB-feedlist .feed:hover .NB-feedlist-manage-icon,
|
||||
.NB-feedlist .folder_title:hover .NB-feedlist-manage-icon {
|
||||
|
|
@ -1127,7 +1135,7 @@ background: transparent;
|
|||
float: right;
|
||||
width: 16px;
|
||||
height: 12px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 0 -1px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 4px 2px;
|
||||
background-size: 8px;
|
||||
margin: 0 0 0 4px;
|
||||
}
|
||||
|
|
@ -1605,7 +1613,7 @@ background: transparent;
|
|||
top: 2px;
|
||||
width: 28px;
|
||||
height: 22px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_right.png') no-repeat 10px 2px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_right.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
}
|
||||
|
||||
|
|
@ -1614,12 +1622,12 @@ background: transparent;
|
|||
}
|
||||
|
||||
#story_titles .NB-story-title:hover .NB-story-manage-icon:hover {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 10px 1px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
cursor: pointer;
|
||||
}
|
||||
#story_titles .NB-story-title.NB-hover-inverse:hover .NB-story-manage-icon:hover {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 10px 1px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
|
@ -2042,7 +2050,7 @@ background: transparent;
|
|||
.NB-feed-story .NB-feed-story-sentiment {
|
||||
position: absolute;
|
||||
top: 1px;
|
||||
left: -22px;
|
||||
left: -19px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
|
|
@ -2080,7 +2088,7 @@ background: transparent;
|
|||
}
|
||||
|
||||
.NB-feed-story .NB-feed-story-manage-icon {
|
||||
background: url("/media/embed/icons/circular/g_icn_arrow_right.png") no-repeat scroll 7px 2px transparent;
|
||||
background: url("/media/embed/icons/circular/g_icn_arrow_right.png") no-repeat scroll 13px 6px transparent;
|
||||
background-size: 8px;
|
||||
display: none;
|
||||
height: 22px;
|
||||
|
|
@ -2094,12 +2102,12 @@ background: transparent;
|
|||
}
|
||||
|
||||
.NB-feed-story .NB-feed-story-header:hover .NB-feed-story-manage-icon:hover {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 7px 1px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.NB-feed-story.NB-hover-inverse .NB-feed-story-header:hover .NB-feed-story-manage-icon:hover {
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 7px 1px;
|
||||
background: transparent url('/media/embed/icons/circular/g_icn_arrow_up.png') no-repeat 13px 6px;
|
||||
background-size: 8px;
|
||||
}
|
||||
|
||||
|
|
@ -5469,7 +5477,7 @@ form.opml_import_form input {
|
|||
.NB-menu-manage-container .NB-menu-manage-arrow {
|
||||
width: 19px;
|
||||
height: 20px;
|
||||
background: #F0FFF0 url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 2px 2px;
|
||||
background: #F0FFF0 url('/media/embed/icons/circular/g_icn_arrow_down.png') no-repeat 5px 6px;
|
||||
background-size: 8px;
|
||||
border-top: 1px solid #8ABCBE;
|
||||
border-left: 1px solid #8ABCBE;
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#import <QuartzCore/QuartzCore.h>
|
||||
#import "ASIHTTPRequest.h"
|
||||
#import "ActivityCell.h"
|
||||
#import "SmallActivityCell.h"
|
||||
|
||||
@implementation ActivityModule
|
||||
|
||||
|
|
@ -174,7 +175,12 @@
|
|||
return MINIMUM_ACTIVITY_HEIGHT;
|
||||
}
|
||||
|
||||
ActivityCell *activityCell = [[ActivityCell alloc] init];
|
||||
id activityCell;
|
||||
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
||||
activityCell = [[ActivityCell alloc] init];
|
||||
} else {
|
||||
activityCell = [[SmallActivityCell alloc] init];
|
||||
}
|
||||
|
||||
NSMutableDictionary *userProfile = [appDelegate.dictUserProfile mutableCopy];
|
||||
[userProfile setValue:@"You" forKey:@"username"];
|
||||
|
|
@ -189,13 +195,19 @@
|
|||
}
|
||||
|
||||
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||
ActivityCell *cell = [tableView
|
||||
dequeueReusableCellWithIdentifier:@"ActivityCell"];
|
||||
ActivityCell *cell = [tableView
|
||||
dequeueReusableCellWithIdentifier:@"ActivityCell"];
|
||||
if (cell == nil) {
|
||||
cell = [[ActivityCell alloc]
|
||||
initWithStyle:UITableViewCellStyleDefault
|
||||
reuseIdentifier:@"ActivityCell"];
|
||||
}
|
||||
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
|
||||
cell = [[ActivityCell alloc]
|
||||
initWithStyle:UITableViewCellStyleDefault
|
||||
reuseIdentifier:@"ActivityCell"];
|
||||
} else {
|
||||
cell = [[SmallActivityCell alloc]
|
||||
initWithStyle:UITableViewCellStyleDefault
|
||||
reuseIdentifier:@"ActivityCell"];
|
||||
}
|
||||
}
|
||||
|
||||
if (indexPath.row >= [appDelegate.userActivitiesArray count]) {
|
||||
// add in loading cell
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@
|
|||
appDelegate.userInteractionsArray = [appDelegate.userInteractionsArray arrayByAddingObjectsFromArray:newInteractions];
|
||||
}
|
||||
|
||||
|
||||
|
||||
[self refreshWithInteractions:appDelegate.userInteractionsArray];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ UIPopoverControllerDelegate> {
|
|||
- (void)pullToRefreshViewShouldRefresh:(PullToRefreshView *)view;
|
||||
- (void)showUserProfile;
|
||||
- (IBAction)showSettingsPopover:(id)sender;
|
||||
- (IBAction)showInteractionsPopover:(id)sender;
|
||||
- (NSDate *)pullToRefreshViewLastUpdated:(PullToRefreshView *)view;
|
||||
- (void)fadeSelectedCell;
|
||||
- (IBAction)tapAddSite:(id)sender;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
#import "NewsBlurAppDelegate.h"
|
||||
#import "NBContainerViewController.h"
|
||||
#import "DashboardViewController.h"
|
||||
#import "InteractionsModule.h"
|
||||
#import "ActivityModule.h"
|
||||
#import "FeedTableCell.h"
|
||||
#import "FeedsMenuViewController.h"
|
||||
#import "FeedDetailMenuViewController.h"
|
||||
|
|
@ -365,9 +367,10 @@ static const CGFloat kFolderTitleHeight = 28;
|
|||
// UIBarButtonItem *settingsButton = [[UIBarButtonItem alloc]
|
||||
// initWithCustomView:settings];
|
||||
|
||||
UIBarButtonItem *activityButton = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"nav_icn_activity_hover.png"] style:UIBarButtonItemStylePlain target:self action:@selector(showSettingsPopover:)];
|
||||
|
||||
|
||||
UIBarButtonItem *activityButton = [[UIBarButtonItem alloc]
|
||||
initWithImage:[UIImage imageNamed:@"nav_icn_activity_hover.png"]
|
||||
style:UIBarButtonItemStylePlain
|
||||
target:self action:@selector(showInteractionsPopover:)];
|
||||
self.navigationItem.rightBarButtonItem = activityButton;
|
||||
|
||||
NSMutableDictionary *sortedFolders = [[NSMutableDictionary alloc] init];
|
||||
|
|
@ -592,6 +595,30 @@ static const CGFloat kFolderTitleHeight = 28;
|
|||
}
|
||||
}
|
||||
|
||||
- (IBAction)showInteractionsPopover:(id)sender {
|
||||
if (self.popoverController == nil) {
|
||||
self.popoverController = [[WEPopoverController alloc]
|
||||
initWithContentViewController:appDelegate.dashboardViewController];
|
||||
|
||||
self.popoverController.delegate = self;
|
||||
} else {
|
||||
[self.popoverController dismissPopoverAnimated:YES];
|
||||
self.popoverController = nil;
|
||||
}
|
||||
|
||||
if ([self.popoverController respondsToSelector:@selector(setContainerViewProperties:)]) {
|
||||
[self.popoverController setContainerViewProperties:[self improvedContainerViewProperties]];
|
||||
}
|
||||
[self.popoverController setPopoverContentSize:CGSizeMake(self.view.frame.size.width - 20, self.view.frame.size.height - 60)];
|
||||
[self.popoverController presentPopoverFromBarButtonItem:self.navigationItem.rightBarButtonItem
|
||||
permittedArrowDirections:UIPopoverArrowDirectionUp
|
||||
animated:YES];
|
||||
|
||||
[appDelegate.dashboardViewController refreshInteractions];
|
||||
[appDelegate.dashboardViewController refreshActivity];
|
||||
}
|
||||
|
||||
|
||||
- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
|
||||
if (alertView.tag == 2) {
|
||||
if (buttonIndex == 0) {
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@
|
|||
437AA8CA159394E2005463F5 /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437AA8C8159394E2005463F5 /* ShareViewController.m */; };
|
||||
437AA8CB159394E2005463F5 /* ShareViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 437AA8C9159394E2005463F5 /* ShareViewController~ipad.xib */; };
|
||||
437F974C15ACA0ED0007136B /* DashboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F974A15ACA0ED0007136B /* DashboardViewController.m */; };
|
||||
437F974D15ACA0ED0007136B /* DashboardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 437F974B15ACA0ED0007136B /* DashboardViewController.xib */; };
|
||||
437F976F15AE21290007136B /* ActivityModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F976E15AE21280007136B /* ActivityModule.m */; };
|
||||
437F977215AE70E30007136B /* InteractionsModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 437F977115AE70E30007136B /* InteractionsModule.m */; };
|
||||
43821AD315D8703F0034A4EF /* 258-checkmark.png in Resources */ = {isa = PBXBuildFile; fileRef = 43821AD115D8703F0034A4EF /* 258-checkmark.png */; };
|
||||
|
|
@ -288,6 +287,8 @@
|
|||
78FC34FA11CA94900055C312 /* SBJsonBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 78FC34F211CA94900055C312 /* SBJsonBase.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
|
||||
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"; }; };
|
||||
FF1660C816D6E9A700AF8541 /* DashboardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF1660C716D6E9A700AF8541 /* DashboardViewController.xib */; };
|
||||
FF1660CA16D6E9B400AF8541 /* DashboardViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF1660C916D6E9B400AF8541 /* DashboardViewController~ipad.xib */; };
|
||||
FF2D8B331487250200057B80 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF2D8B321487250200057B80 /* Security.framework */; };
|
||||
FF2D8B351487250C00057B80 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF2D8B341487250C00057B80 /* MessageUI.framework */; };
|
||||
FF2D8C191487EFF000057B80 /* DefaultSHKConfigurator.m in Sources */ = {isa = PBXBuildFile; fileRef = FF2D8B4B1487EFF000057B80 /* DefaultSHKConfigurator.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
|
||||
|
|
@ -464,7 +465,6 @@
|
|||
437AA8C9159394E2005463F5 /* ShareViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "ShareViewController~ipad.xib"; path = "Classes/ShareViewController~ipad.xib"; sourceTree = "<group>"; };
|
||||
437F974915ACA0ED0007136B /* DashboardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DashboardViewController.h; sourceTree = "<group>"; };
|
||||
437F974A15ACA0ED0007136B /* DashboardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DashboardViewController.m; sourceTree = "<group>"; };
|
||||
437F974B15ACA0ED0007136B /* DashboardViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = DashboardViewController.xib; path = Classes/DashboardViewController.xib; sourceTree = "<group>"; };
|
||||
437F976D15AE21280007136B /* ActivityModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ActivityModule.h; sourceTree = "<group>"; };
|
||||
437F976E15AE21280007136B /* ActivityModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ActivityModule.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
|
||||
437F977015AE70E30007136B /* InteractionsModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InteractionsModule.h; sourceTree = "<group>"; };
|
||||
|
|
@ -771,6 +771,8 @@
|
|||
78FC34F511CA94900055C312 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = "<group>"; };
|
||||
78FC34F611CA94900055C312 /* SBJsonWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBJsonWriter.m; sourceTree = "<group>"; };
|
||||
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>"; };
|
||||
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>"; };
|
||||
FF2D8B321487250200057B80 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
|
||||
FF2D8B341487250C00057B80 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
|
||||
FF2D8B4A1487EFF000057B80 /* DefaultSHKConfigurator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultSHKConfigurator.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1525,6 +1527,7 @@
|
|||
43B8F017156603170008733D /* Resources-iPhone */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
FF1660C716D6E9A700AF8541 /* DashboardViewController.xib */,
|
||||
43B8F018156603170008733D /* AddSiteAutocompleteCell.xib */,
|
||||
43B8F019156603170008733D /* AddSiteViewController.xib */,
|
||||
43B8F01B156603170008733D /* FeedDetailViewController.xib */,
|
||||
|
|
@ -1549,9 +1552,9 @@
|
|||
isa = PBXGroup;
|
||||
children = (
|
||||
433323B5158901A40025064D /* Images */,
|
||||
437F974B15ACA0ED0007136B /* DashboardViewController.xib */,
|
||||
43C95C47158BEC440086C69B /* GoogleReaderViewController.xib */,
|
||||
43D045241565BC150085F811 /* LoginViewController~ipad.xib */,
|
||||
FF1660C916D6E9B400AF8541 /* DashboardViewController~ipad.xib */,
|
||||
43D0451F1565BC150085F811 /* MainWindow~ipad.xib */,
|
||||
43D045281565BC150085F811 /* MoveSiteViewController~ipad.xib */,
|
||||
FF67D3B816897AD80057A7DA /* TrainerViewController~ipad.xib */,
|
||||
|
|
@ -2062,7 +2065,6 @@
|
|||
43763AD2158F90B100B3DBE2 /* FontSettingsViewController.xib in Resources */,
|
||||
439DAB211590DA350019B0EB /* FeedsMenuViewController.xib in Resources */,
|
||||
437AA8CB159394E2005463F5 /* ShareViewController~ipad.xib in Resources */,
|
||||
437F974D15ACA0ED0007136B /* DashboardViewController.xib in Resources */,
|
||||
43081E2215AFE84200B24D7A /* ShareViewController.xib in Resources */,
|
||||
43A4C44215B00A26008787B5 /* 06-arrow-south.png in Resources */,
|
||||
43A4C44315B00A26008787B5 /* 06-arrow-south@2x.png in Resources */,
|
||||
|
|
@ -2272,6 +2274,8 @@
|
|||
FF85BF8216D6AF43002D334D /* g_icn_hidden.png in Resources */,
|
||||
FF85BF8316D6AF43002D334D /* g_icn_unread.png in Resources */,
|
||||
FF85BF8516D6C2B7002D334D /* clock2.png in Resources */,
|
||||
FF1660C816D6E9A700AF8541 /* DashboardViewController.xib in Resources */,
|
||||
FF1660CA16D6E9B400AF8541 /* DashboardViewController~ipad.xib in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
|
|||
1862
media/ios/Resources-iPhone/DashboardViewController.xib
Normal file
1862
media/ios/Resources-iPhone/DashboardViewController.xib
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,14 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
|
||||
<data>
|
||||
<int key="IBDocument.SystemTarget">1536</int>
|
||||
<string key="IBDocument.SystemVersion">12C2037</string>
|
||||
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
|
||||
<int key="IBDocument.SystemTarget">1552</int>
|
||||
<string key="IBDocument.SystemVersion">12C3006</string>
|
||||
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
|
||||
<string key="IBDocument.AppKitVersion">1187.34</string>
|
||||
<string key="IBDocument.HIToolboxVersion">625.00</string>
|
||||
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
|
||||
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string key="NS.object.0">1926</string>
|
||||
<string key="NS.object.0">2083</string>
|
||||
</object>
|
||||
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<int key="IBUIInterfaceOrientation">1</int>
|
||||
<int key="interfaceOrientation">1</int>
|
||||
</object>
|
||||
<object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
|
||||
<object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics" id="318578111">
|
||||
<string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
|
||||
<object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
|
|
@ -255,12 +255,23 @@
|
|||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<bool key="IBUIHorizontal">NO</bool>
|
||||
</object>
|
||||
<object class="IBUIViewController" id="109681540">
|
||||
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
|
||||
<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
|
||||
<int key="IBUIInterfaceOrientation">1</int>
|
||||
<int key="interfaceOrientation">1</int>
|
||||
</object>
|
||||
<reference key="IBUISimulatedDestinationMetrics" ref="318578111"/>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<bool key="IBUIHorizontal">NO</bool>
|
||||
</object>
|
||||
<object class="IBUIWindow" id="117978783">
|
||||
<reference key="NSNextResponder"/>
|
||||
<int key="NSvFlags">256</int>
|
||||
<string key="NSFrameSize">{320, 480}</string>
|
||||
<reference key="NSSuperview"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView"/>
|
||||
<object class="NSColor" key="IBUIBackgroundColor">
|
||||
<int key="NSColorSpace">1</int>
|
||||
<bytes key="NSRGB">MSAxIDEAA</bytes>
|
||||
|
|
@ -498,6 +509,14 @@
|
|||
</object>
|
||||
<int key="connectionID">176</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">dashboardViewController</string>
|
||||
<reference key="source" ref="664661524"/>
|
||||
<reference key="destination" ref="109681540"/>
|
||||
</object>
|
||||
<int key="connectionID">179</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">appDelegate</string>
|
||||
|
|
@ -650,6 +669,14 @@
|
|||
</object>
|
||||
<int key="connectionID">175</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBCocoaTouchOutletConnection" key="connection">
|
||||
<string key="label">appDelegate</string>
|
||||
<reference key="source" ref="109681540"/>
|
||||
<reference key="destination" ref="664661524"/>
|
||||
</object>
|
||||
<int key="connectionID">178</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBMutableOrderedSet" key="objectRecords">
|
||||
<object class="NSArray" key="orderedObjects">
|
||||
|
|
@ -819,6 +846,11 @@
|
|||
<reference key="object" ref="24323153"/>
|
||||
<reference key="parent" ref="0"/>
|
||||
</object>
|
||||
<object class="IBObjectRecord">
|
||||
<int key="objectID">177</int>
|
||||
<reference key="object" ref="109681540"/>
|
||||
<reference key="parent" ref="0"/>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="flattenedProperties">
|
||||
|
|
@ -866,6 +898,8 @@
|
|||
<string>170.IBPluginDependency</string>
|
||||
<string>174.CustomClassName</string>
|
||||
<string>174.IBPluginDependency</string>
|
||||
<string>177.CustomClassName</string>
|
||||
<string>177.IBPluginDependency</string>
|
||||
<string>3.CustomClassName</string>
|
||||
<string>3.IBPluginDependency</string>
|
||||
<string>39.IBPluginDependency</string>
|
||||
|
|
@ -921,6 +955,8 @@
|
|||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>TrainerViewController</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>DashboardViewController</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
|
||||
|
|
@ -946,7 +982,7 @@
|
|||
<reference key="dict.values" ref="0"/>
|
||||
</object>
|
||||
<nil key="sourceID"/>
|
||||
<int key="maxID">176</int>
|
||||
<int key="maxID">179</int>
|
||||
</object>
|
||||
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||
|
|
@ -2664,6 +2700,8 @@
|
|||
<string>sectionUntapped:</string>
|
||||
<string>sectionUntappedOutside:</string>
|
||||
<string>selectIntelligence</string>
|
||||
<string>showInteractionsPopover:</string>
|
||||
<string>showSettingsPopover:</string>
|
||||
<string>tapAddSite:</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
|
|
@ -2673,6 +2711,8 @@
|
|||
<string>UIButton</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="actionInfosByName">
|
||||
|
|
@ -2683,6 +2723,8 @@
|
|||
<string>sectionUntapped:</string>
|
||||
<string>sectionUntappedOutside:</string>
|
||||
<string>selectIntelligence</string>
|
||||
<string>showInteractionsPopover:</string>
|
||||
<string>showSettingsPopover:</string>
|
||||
<string>tapAddSite:</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
|
|
@ -2703,6 +2745,14 @@
|
|||
<string key="name">selectIntelligence</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">showInteractionsPopover:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">showSettingsPopover:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
</object>
|
||||
<object class="IBActionInfo">
|
||||
<string key="name">tapAddSite:</string>
|
||||
<string key="candidateClassName">id</string>
|
||||
|
|
@ -2713,6 +2763,7 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>addBarButton</string>
|
||||
<string>appDelegate</string>
|
||||
<string>feedScoreSlider</string>
|
||||
<string>feedTitlesTable</string>
|
||||
|
|
@ -2721,10 +2772,12 @@
|
|||
<string>innerView</string>
|
||||
<string>intelligenceControl</string>
|
||||
<string>noFocusMessage</string>
|
||||
<string>settingsBarButton</string>
|
||||
<string>toolbarLeftMargin</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UISlider</string>
|
||||
<string>UITableView</string>
|
||||
|
|
@ -2734,12 +2787,14 @@
|
|||
<string>UISegmentedControl</string>
|
||||
<string>UIView</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>addBarButton</string>
|
||||
<string>appDelegate</string>
|
||||
<string>feedScoreSlider</string>
|
||||
<string>feedTitlesTable</string>
|
||||
|
|
@ -2748,10 +2803,15 @@
|
|||
<string>innerView</string>
|
||||
<string>intelligenceControl</string>
|
||||
<string>noFocusMessage</string>
|
||||
<string>settingsBarButton</string>
|
||||
<string>toolbarLeftMargin</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addBarButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">appDelegate</string>
|
||||
<string key="candidateClassName">NewsBlurAppDelegate</string>
|
||||
|
|
@ -2784,6 +2844,10 @@
|
|||
<string key="name">noFocusMessage</string>
|
||||
<string key="candidateClassName">UIView</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">settingsBarButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">toolbarLeftMargin</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
|
|
@ -3295,13 +3359,15 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>appDelegate</string>
|
||||
<string>closeButton</string>
|
||||
<string>navBar</string>
|
||||
<string>webView</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIWebView</string>
|
||||
<string>UINavigationBar</string>
|
||||
<string>TrainerWebView</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
|
||||
|
|
@ -3310,6 +3376,7 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>appDelegate</string>
|
||||
<string>closeButton</string>
|
||||
<string>navBar</string>
|
||||
<string>webView</string>
|
||||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
|
|
@ -3322,9 +3389,13 @@
|
|||
<string key="name">closeButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">navBar</string>
|
||||
<string key="candidateClassName">UINavigationBar</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">webView</string>
|
||||
<string key="candidateClassName">UIWebView</string>
|
||||
<string key="candidateClassName">TrainerWebView</string>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
|
|
@ -3333,6 +3404,14 @@
|
|||
<string key="minorKey">./Classes/TrainerViewController.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">TrainerWebView</string>
|
||||
<string key="superclassName">UIWebView</string>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBProjectSource</string>
|
||||
<string key="minorKey">./Classes/TrainerWebView.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">UserProfileViewController</string>
|
||||
<string key="superclassName">UIViewController</string>
|
||||
|
|
@ -3347,7 +3426,7 @@
|
|||
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
|
||||
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
|
||||
<real value="1536" key="NS.object.0"/>
|
||||
<real value="1552" key="NS.object.0"/>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
|
||||
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
|
||||
|
|
@ -3355,6 +3434,6 @@
|
|||
</object>
|
||||
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
|
||||
<int key="IBDocument.defaultPropertyAccessControl">3</int>
|
||||
<string key="IBCocoaTouchPluginVersion">1926</string>
|
||||
<string key="IBCocoaTouchPluginVersion">2083</string>
|
||||
</data>
|
||||
</archive>
|
||||
|
|
|
|||
|
|
@ -582,7 +582,7 @@ static NSDictionary *sharersDictionary = nil;
|
|||
|
||||
+ (id)allocWithZone:(NSZone *)zone
|
||||
{
|
||||
return [[self currentHelper] retain];
|
||||
return [[self currentHelper] retain];
|
||||
}
|
||||
|
||||
- (id)copyWithZone:(NSZone *)zone
|
||||
|
|
|
|||
|
|
@ -3132,17 +3132,17 @@
|
|||
if (inverse) {
|
||||
var $align = $item;
|
||||
if (type == 'feed') {
|
||||
left = toplevel ? 2 : -20;
|
||||
top = toplevel ? 1 : 1;
|
||||
left = toplevel ? 2 : -22;
|
||||
top = toplevel ? 1 : 3;
|
||||
} else if (type == 'socialfeed') {
|
||||
left = 1;
|
||||
top = 1;
|
||||
} else if (type == 'folder') {
|
||||
left = toplevel ? 0 : -20;
|
||||
top = toplevel ? 1 : 1;
|
||||
left = toplevel ? 0 : -21;
|
||||
top = toplevel ? 3 : 3;
|
||||
} else if (type == 'story') {
|
||||
left = 4;
|
||||
top = 2;
|
||||
left = 7;
|
||||
top = 1;
|
||||
$align = $('.NB-story-manage-icon,.NB-feed-story-manage-icon', $item);
|
||||
if (!$align.is(':visible')) {
|
||||
$align = $('.NB-storytitles-sentiment', $item);
|
||||
|
|
@ -3161,19 +3161,19 @@
|
|||
} else {
|
||||
var $align = $item;
|
||||
if (type == 'feed') {
|
||||
left = toplevel ? 2 : 0;
|
||||
top = toplevel ? 21 : 21;
|
||||
left = toplevel ? 0 : -2;
|
||||
top = toplevel ? 20 : 19;
|
||||
$align = $('.NB-feedlist-manage-icon', $item);
|
||||
} else if (type == 'socialfeed') {
|
||||
left = toplevel ? 2 : -18;
|
||||
top = toplevel ? 21 : 21;
|
||||
$align = $('.NB-feedlist-manage-icon', $item);
|
||||
} else if (type == 'folder') {
|
||||
left = toplevel ? 2 : -20;
|
||||
top = toplevel ? 22 : 22;
|
||||
left = toplevel ? 0 : -22;
|
||||
top = toplevel ? 21 : 18;
|
||||
} else if (type == 'story') {
|
||||
left = 4;
|
||||
top = 18;
|
||||
left = 7;
|
||||
top = 19;
|
||||
$align = $('.NB-story-manage-icon,.NB-feed-story-manage-icon', $item);
|
||||
if (!$align.is(':visible')) {
|
||||
$align = $('.NB-storytitles-sentiment', $item);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue