Custom segmented controls on iOS. Damn it looks fine.
|
@ -211,27 +211,27 @@
|
|||
border: 1px solid #606060;
|
||||
border-color: #E5E5E5 #CDCDCD #CDCDCD #E5E5E5;
|
||||
background: #DCDCDC;
|
||||
background: linear-gradient(top, #DCDCDC, #D2D2D2);
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#DCDCDC), to(#D2D2D2));
|
||||
background: linear-gradient(to top, #DCDCDC, #D2D2D2);
|
||||
}
|
||||
|
||||
.NB-modal-submit-green {
|
||||
border-color: rgba(255, 255, 255, .3) rgba(0, 0, 0, .2) rgba(0, 0, 0, .3) rgba(255, 255, 255, .2);
|
||||
background-color: #217412;
|
||||
background-image: linear-gradient(bottom, #216200, #217412);
|
||||
background-image: -webkit-linear-gradient(bottom, #216200, #217412);
|
||||
background-image: linear-gradient(to top, #216200, #217412);
|
||||
font-weight: bold;
|
||||
color: #FCFCFC;
|
||||
}
|
||||
.NB-modal-submit-green:hover {
|
||||
background-color: #216200;
|
||||
background-image: linear-gradient(bottom, #1E5000, #216200);
|
||||
background-image: -webkit-linear-gradient(bottom, #1E5000, #216200);
|
||||
background-image: linear-gradient(to top, #1E5000, #216200);
|
||||
}
|
||||
.NB-modal-submit-green:active {
|
||||
background-color: #1E5000;
|
||||
background-image: linear-gradient(bottom, #1B3F00, #1E5000);
|
||||
background-image: -webkit-linear-gradient(bottom, #1B3F00, #1E5000);
|
||||
background-image: linear-gradient(to top, #1B3F00, #1E5000);
|
||||
}
|
||||
|
||||
.NB-modal-submit-back,
|
||||
|
@ -241,8 +241,8 @@
|
|||
text-shadow: 0 -1px 0 rgba(255, 255, 255, .3);
|
||||
border-color: rgba(255, 255, 255, .3) rgba(0, 0, 0, .2) rgba(0, 0, 0, .3) rgba(255, 255, 255, .2);
|
||||
background-color: #d5d4dB;
|
||||
background-image: linear-gradient(bottom, #CBCAD3, #d5d4dB);
|
||||
background-image: -webkit-linear-gradient(bottom, #CBCAD3, #d5d4dB);
|
||||
background-image: linear-gradient(to top, #CBCAD3, #d5d4dB);
|
||||
color: #505050;
|
||||
}
|
||||
.NB-modal-submit-back:hover,
|
||||
|
@ -250,16 +250,16 @@
|
|||
.NB-modal-submit-close:hover,
|
||||
.NB-modal-submit-grey:hover {
|
||||
background-color: #CBCAD3;
|
||||
background-image: linear-gradient(bottom, #BDBCC7, #CBCAD3);
|
||||
background-image: -webkit-linear-gradient(bottom, #BDBCC7, #CBCAD3);
|
||||
background-image: linear-gradient(to top, #BDBCC7, #CBCAD3);
|
||||
}
|
||||
.NB-modal-submit-back:active,
|
||||
.NB-modal-submit-reset:active,
|
||||
.NB-modal-submit-close:active,
|
||||
.NB-modal-submit-grey:active {
|
||||
background-color: #BDBCC7;
|
||||
background-image: linear-gradient(bottom, #ADACBB, #BDBCC7);
|
||||
background-image: -webkit-linear-gradient(bottom, #ADACBB, #BDBCC7);
|
||||
background-image: linear-gradient(to top, #ADACBB, #BDBCC7);
|
||||
}
|
||||
.NB-modal-submit-save.NB-disabled,
|
||||
.NB-modal-submit-green.NB-disabled,
|
||||
|
|
|
@ -186,15 +186,11 @@
|
|||
UITableViewCell *cell = [[UITableViewCell alloc] init];
|
||||
cell.frame = CGRectMake(0, 0, 240, kMenuOptionHeight);
|
||||
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
UIFont *font = [UIFont boldSystemFontOfSize:11.0f];
|
||||
NSDictionary *attributes = [NSDictionary dictionaryWithObject:font forKey:UITextAttributeFont];
|
||||
|
||||
orderSegmentedControl.frame = CGRectMake(8, 7, cell.frame.size.width - 8*2,
|
||||
kMenuOptionHeight - 7*2);
|
||||
[orderSegmentedControl setTitle:[@"Newest first" uppercaseString] forSegmentAtIndex:0];
|
||||
[orderSegmentedControl setTitle:[@"Oldest" uppercaseString] forSegmentAtIndex:1];
|
||||
[orderSegmentedControl setTitleTextAttributes:attributes forState:UIControlStateNormal];
|
||||
[orderSegmentedControl setTintColor:UIColorFromRGB(0x738570)];
|
||||
|
||||
[cell addSubview:orderSegmentedControl];
|
||||
|
||||
|
@ -205,15 +201,10 @@
|
|||
UITableViewCell *cell = [[UITableViewCell alloc] init];
|
||||
cell.frame = CGRectMake(0, 0, 240, kMenuOptionHeight);
|
||||
cell.selectionStyle = UITableViewCellSelectionStyleNone;
|
||||
UIFont *font = [UIFont boldSystemFontOfSize:11.0f];
|
||||
NSDictionary *attributes = [NSDictionary dictionaryWithObject:font forKey:UITextAttributeFont];
|
||||
|
||||
readFilterSegmentedControl.frame = CGRectMake(8, 7, cell.frame.size.width - 8*2,
|
||||
kMenuOptionHeight - 7*2);
|
||||
[readFilterSegmentedControl setTitle:[@"All stories" uppercaseString] forSegmentAtIndex:0];
|
||||
[readFilterSegmentedControl setTitle:[@"Unread only" uppercaseString] forSegmentAtIndex:1];
|
||||
[readFilterSegmentedControl setTitleTextAttributes:attributes forState:UIControlStateNormal];
|
||||
[readFilterSegmentedControl setTintColor:UIColorFromRGB(0x738570)];
|
||||
|
||||
[cell addSubview:readFilterSegmentedControl];
|
||||
|
||||
|
|
|
@ -40,6 +40,7 @@ UIPopoverControllerDelegate> {
|
|||
UIBarButtonItem * homeButton;
|
||||
UIBarButtonItem * addBarButton;
|
||||
UIBarButtonItem * settingsBarButton;
|
||||
UIBarButtonItem * activitiesButton;
|
||||
UISegmentedControl * intelligenceControl;
|
||||
WEPopoverController *popoverController;
|
||||
Class popoverClass;
|
||||
|
@ -53,6 +54,7 @@ UIPopoverControllerDelegate> {
|
|||
@property (nonatomic) IBOutlet UIBarButtonItem * homeButton;
|
||||
@property (nonatomic) IBOutlet UIBarButtonItem * addBarButton;
|
||||
@property (nonatomic) IBOutlet UIBarButtonItem * settingsBarButton;
|
||||
@property (nonatomic) IBOutlet UIBarButtonItem * activitiesButton;
|
||||
@property (nonatomic) NSMutableDictionary *activeFeedLocations;
|
||||
@property (nonatomic) NSMutableDictionary *stillVisibleFeeds;
|
||||
@property (nonatomic) NSMutableDictionary *visibleFolders;
|
||||
|
|
|
@ -65,6 +65,7 @@ static const CGFloat kFolderTitleHeight = 28;
|
|||
@synthesize inPullToRefresh_;
|
||||
@synthesize addBarButton;
|
||||
@synthesize settingsBarButton;
|
||||
@synthesize activitiesButton;
|
||||
|
||||
#pragma mark -
|
||||
#pragma mark Globals
|
||||
|
@ -93,11 +94,59 @@ static const CGFloat kFolderTitleHeight = 28;
|
|||
imageCache = [[NSCache alloc] init];
|
||||
[imageCache setDelegate:self];
|
||||
|
||||
[self.intelligenceControl setWidth:50 forSegmentAtIndex:0];
|
||||
[self.intelligenceControl setWidth:68 forSegmentAtIndex:1];
|
||||
[self.intelligenceControl setWidth:36 forSegmentAtIndex:0];
|
||||
[self.intelligenceControl setWidth:64 forSegmentAtIndex:1];
|
||||
[self.intelligenceControl setWidth:62 forSegmentAtIndex:2];
|
||||
self.intelligenceControl.hidden = YES;
|
||||
|
||||
UIImage *unselectedBackgroundImage = [[UIImage imageNamed:@"segment_inactive"]
|
||||
resizableImageWithCapInsets:UIEdgeInsetsMake(6, 6, 6, 6)];
|
||||
[[UISegmentedControl appearance] setBackgroundImage:unselectedBackgroundImage
|
||||
forState:UIControlStateNormal
|
||||
barMetrics:UIBarMetricsDefault];
|
||||
UIImage *selectedBackgroundImage = [[UIImage imageNamed:@"segment_active"]
|
||||
resizableImageWithCapInsets:UIEdgeInsetsMake(6, 6, 6, 6)];
|
||||
[[UISegmentedControl appearance] setBackgroundImage:selectedBackgroundImage
|
||||
forState:UIControlStateSelected
|
||||
barMetrics:UIBarMetricsDefault];
|
||||
UIImage *bothUnselectedImage = [[UIImage imageNamed:@"segment_unselected"]
|
||||
resizableImageWithCapInsets:UIEdgeInsetsMake(6, 6, 6, 6)];
|
||||
[[UISegmentedControl appearance] setDividerImage:bothUnselectedImage
|
||||
forLeftSegmentState:UIControlStateNormal
|
||||
rightSegmentState:UIControlStateNormal
|
||||
barMetrics:UIBarMetricsDefault];
|
||||
UIImage *leftSelectedImage = [[UIImage imageNamed:@"segment_left_selected"]
|
||||
resizableImageWithCapInsets:UIEdgeInsetsMake(6, 6, 6, 6)];
|
||||
[[UISegmentedControl appearance] setDividerImage:leftSelectedImage
|
||||
forLeftSegmentState:UIControlStateSelected
|
||||
rightSegmentState:UIControlStateNormal
|
||||
barMetrics:UIBarMetricsDefault];
|
||||
UIImage *rightSelectedImage = [[UIImage imageNamed:@"segment_right_selected"]
|
||||
resizableImageWithCapInsets:UIEdgeInsetsMake(6, 6, 6, 6)];
|
||||
[[UISegmentedControl appearance] setDividerImage:rightSelectedImage
|
||||
forLeftSegmentState:UIControlStateNormal
|
||||
rightSegmentState:UIControlStateSelected
|
||||
barMetrics:UIBarMetricsDefault];
|
||||
[[UISegmentedControl appearance]
|
||||
setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
|
||||
[UIFont boldSystemFontOfSize:11.0f], UITextAttributeFont,
|
||||
UIColorFromRGB(0x505050), 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,
|
||||
UIColorFromRGB(0xF0F0F0), UITextAttributeTextShadowColor,
|
||||
[NSValue valueWithUIOffset:UIOffsetMake(0, -1)], UITextAttributeTextShadowOffset,
|
||||
nil]
|
||||
forState:UIControlStateSelected];
|
||||
[[UISegmentedControl appearance] setContentPositionAdjustment:UIOffsetMake(4, 0) forSegmentType:UISegmentedControlSegmentLeft barMetrics:UIBarMetricsDefault];
|
||||
[[UISegmentedControl appearance] setContentPositionAdjustment:UIOffsetMake(-4, 0) forSegmentType:UISegmentedControlSegmentRight barMetrics:UIBarMetricsDefault];
|
||||
|
||||
|
||||
appDelegate.activeClassifiers = [NSMutableDictionary dictionary];
|
||||
}
|
||||
|
||||
|
@ -344,27 +393,30 @@ static const CGFloat kFolderTitleHeight = 28;
|
|||
|
||||
UIImage *addImage = [UIImage imageNamed:@"nav_icn_add.png"];
|
||||
UIButton *addButton = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
addButton.bounds = CGRectMake( 0, 0, addImage.size.width, addImage.size.height);
|
||||
[addButton sizeToFit];
|
||||
[addButton setImage:addImage forState:UIControlStateNormal];
|
||||
[addButton addTarget:self action:@selector(tapAddSite:) forControlEvents:UIControlEventTouchUpInside];
|
||||
[addBarButton setCustomView:addButton];
|
||||
|
||||
UIImage *settingsImage = [UIImage imageNamed:@"nav_icn_settings.png"];
|
||||
UIButton *settingsButton = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
settingsButton.bounds = CGRectMake( 0, 0, settingsImage.size.width, settingsImage.size.height);
|
||||
[settingsButton sizeToFit];
|
||||
[settingsButton setImage:settingsImage forState:UIControlStateNormal];
|
||||
[settingsButton addTarget:self action:@selector(showSettingsPopover:) forControlEvents:UIControlEventTouchUpInside];
|
||||
[settingsBarButton setCustomView:settingsButton];
|
||||
|
||||
UIBarButtonItem *spacer = [[UIBarButtonItem alloc]
|
||||
initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace
|
||||
target:nil action:nil];
|
||||
spacer.width = 12;
|
||||
UIImage *activityImage = [UIImage imageNamed:@"nav_icn_activity_hover.png"];
|
||||
UIButton *activityButton = [UIButton buttonWithType:UIButtonTypeCustom];
|
||||
activityButton.bounds = CGRectMake( 0, 0, activityImage.size.width / 2, activityImage.size.height / 2);
|
||||
[activityButton setImage:activityImage forState:UIControlStateNormal];
|
||||
[activityButton sizeToFit];
|
||||
[activityButton addTarget:self action:@selector(showInteractionsPopover:) forControlEvents:UIControlEventTouchUpInside];
|
||||
activityButton.contentEdgeInsets = UIEdgeInsetsMake(0, -10, 0, 10);
|
||||
UIBarButtonItem *activityBarButton = [[UIBarButtonItem alloc]
|
||||
initWithCustomView:activityButton];
|
||||
self.navigationItem.rightBarButtonItem = activityBarButton;
|
||||
activitiesButton = [[UIBarButtonItem alloc]
|
||||
initWithCustomView:activityButton];
|
||||
self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects:spacer, activitiesButton, nil];
|
||||
|
||||
NSMutableDictionary *sortedFolders = [[NSMutableDictionary alloc] init];
|
||||
NSArray *sortedArray;
|
||||
|
@ -602,8 +654,8 @@ static const CGFloat kFolderTitleHeight = 28;
|
|||
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
|
||||
[self.popoverController setPopoverContentSize:CGSizeMake(self.view.frame.size.width - 36, self.view.frame.size.height - 60)];
|
||||
[self.popoverController presentPopoverFromBarButtonItem:self.activitiesButton
|
||||
permittedArrowDirections:UIPopoverArrowDirectionUp
|
||||
animated:YES];
|
||||
|
||||
|
|
|
@ -182,16 +182,7 @@
|
|||
43A4C48D15B00A26008787B5 /* slide_left@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43215B00A26008787B5 /* slide_left@2x.png */; };
|
||||
43A4C48E15B00A26008787B5 /* slide_right.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43315B00A26008787B5 /* slide_right.png */; };
|
||||
43A4C48F15B00A26008787B5 /* slide_right@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43415B00A26008787B5 /* slide_right@2x.png */; };
|
||||
43A4C49015B00A26008787B5 /* thumbs_down.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43515B00A26008787B5 /* thumbs_down.png */; };
|
||||
43A4C49115B00A26008787B5 /* thumbs_down@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43615B00A26008787B5 /* thumbs_down@2x.png */; };
|
||||
43A4C49215B00A26008787B5 /* thumbs_up.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43715B00A26008787B5 /* thumbs_up.png */; };
|
||||
43A4C49315B00A26008787B5 /* thumbs_up@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43815B00A26008787B5 /* thumbs_up@2x.png */; };
|
||||
43A4C49415B00A26008787B5 /* toolbar_back_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43915B00A26008787B5 /* toolbar_back_button.png */; };
|
||||
43A4C49515B00A26008787B5 /* train.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43A15B00A26008787B5 /* train.png */; };
|
||||
43A4C49615B00A26008787B5 /* unread_color.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43B15B00A26008787B5 /* unread_color.png */; };
|
||||
43A4C49715B00A26008787B5 /* unread_color@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43C15B00A26008787B5 /* unread_color@2x.png */; };
|
||||
43A4C49815B00A26008787B5 /* unread.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43D15B00A26008787B5 /* unread.png */; };
|
||||
43A4C49915B00A26008787B5 /* unread@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43E15B00A26008787B5 /* unread@2x.png */; };
|
||||
43A4C49A15B00A26008787B5 /* warning.gif in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C43F15B00A26008787B5 /* warning.gif */; };
|
||||
43A4C49B15B00A26008787B5 /* warning.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C44015B00A26008787B5 /* warning.png */; };
|
||||
43A4C49C15B00A26008787B5 /* world.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4C44115B00A26008787B5 /* world.png */; };
|
||||
|
@ -234,7 +225,6 @@
|
|||
43C3D40815D4680C0066D36D /* green_focus.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40715D4680C0066D36D /* green_focus.png */; };
|
||||
43C3D40A15D468BA0066D36D /* all.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40915D468BA0066D36D /* all.png */; };
|
||||
43C3D40C15D469010066D36D /* unread_yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40B15D469010066D36D /* unread_yellow.png */; };
|
||||
43C3D40E15D469DF0066D36D /* unread_yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40D15D469DF0066D36D /* unread_yellow@2x.png */; };
|
||||
43C3D41015D46D2B0066D36D /* green_focus@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40F15D46D2B0066D36D /* green_focus@2x.png */; };
|
||||
43C3D41215D46D330066D36D /* all@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41115D46D330066D36D /* all@2x.png */; };
|
||||
43C3D41415D473660066D36D /* silver_button.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41315D473660066D36D /* silver_button.png */; };
|
||||
|
@ -290,6 +280,15 @@
|
|||
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 */; };
|
||||
FF29708B16DD7AA400E92F85 /* segment_active.png in Resources */ = {isa = PBXBuildFile; fileRef = FF29708916DD7AA400E92F85 /* segment_active.png */; };
|
||||
FF29708C16DD7AA400E92F85 /* segment_inactive.png in Resources */ = {isa = PBXBuildFile; fileRef = FF29708A16DD7AA400E92F85 /* segment_inactive.png */; };
|
||||
FF29708E16DD7C8A00E92F85 /* segment_left_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = FF29708D16DD7C8A00E92F85 /* segment_left_selected.png */; };
|
||||
FF29709016DD7FD800E92F85 /* segment_unselected.png in Resources */ = {isa = PBXBuildFile; fileRef = FF29708F16DD7FD800E92F85 /* segment_unselected.png */; };
|
||||
FF29709216DD80F700E92F85 /* segment_right_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = FF29709116DD80F700E92F85 /* segment_right_selected.png */; };
|
||||
FF29709416DD8CB000E92F85 /* unread_yellow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF29709316DD8CB000E92F85 /* unread_yellow@2x.png */; };
|
||||
FF29709616DD9F2600E92F85 /* nav_icn_settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF29709516DD9F2600E92F85 /* nav_icn_settings@2x.png */; };
|
||||
FF29709816DD9F7400E92F85 /* nav_icn_add@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF29709716DD9F7400E92F85 /* nav_icn_add@2x.png */; };
|
||||
FF29709A16DDA02200E92F85 /* nav_icn_activity_hover@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF29709916DDA02200E92F85 /* nav_icn_activity_hover@2x.png */; };
|
||||
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"; }; };
|
||||
|
@ -627,16 +626,7 @@
|
|||
43A4C43215B00A26008787B5 /* slide_left@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "slide_left@2x.png"; sourceTree = "<group>"; };
|
||||
43A4C43315B00A26008787B5 /* slide_right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = slide_right.png; sourceTree = "<group>"; };
|
||||
43A4C43415B00A26008787B5 /* slide_right@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "slide_right@2x.png"; sourceTree = "<group>"; };
|
||||
43A4C43515B00A26008787B5 /* thumbs_down.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumbs_down.png; sourceTree = "<group>"; };
|
||||
43A4C43615B00A26008787B5 /* thumbs_down@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumbs_down@2x.png"; sourceTree = "<group>"; };
|
||||
43A4C43715B00A26008787B5 /* thumbs_up.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumbs_up.png; sourceTree = "<group>"; };
|
||||
43A4C43815B00A26008787B5 /* thumbs_up@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumbs_up@2x.png"; sourceTree = "<group>"; };
|
||||
43A4C43915B00A26008787B5 /* toolbar_back_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_back_button.png; sourceTree = "<group>"; };
|
||||
43A4C43A15B00A26008787B5 /* train.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = train.png; sourceTree = "<group>"; };
|
||||
43A4C43B15B00A26008787B5 /* unread_color.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unread_color.png; sourceTree = "<group>"; };
|
||||
43A4C43C15B00A26008787B5 /* unread_color@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unread_color@2x.png"; sourceTree = "<group>"; };
|
||||
43A4C43D15B00A26008787B5 /* unread.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unread.png; sourceTree = "<group>"; };
|
||||
43A4C43E15B00A26008787B5 /* unread@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unread@2x.png"; sourceTree = "<group>"; };
|
||||
43A4C43F15B00A26008787B5 /* warning.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = warning.gif; sourceTree = "<group>"; };
|
||||
43A4C44015B00A26008787B5 /* warning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = warning.png; sourceTree = "<group>"; };
|
||||
43A4C44115B00A26008787B5 /* world.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = world.png; sourceTree = "<group>"; };
|
||||
|
@ -681,7 +671,6 @@
|
|||
43C3D40715D4680C0066D36D /* green_focus.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = green_focus.png; sourceTree = "<group>"; };
|
||||
43C3D40915D468BA0066D36D /* all.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = all.png; sourceTree = "<group>"; };
|
||||
43C3D40B15D469010066D36D /* unread_yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unread_yellow.png; sourceTree = "<group>"; };
|
||||
43C3D40D15D469DF0066D36D /* unread_yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unread_yellow@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D40F15D46D2B0066D36D /* green_focus@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "green_focus@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D41115D46D330066D36D /* all@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "all@2x.png"; sourceTree = "<group>"; };
|
||||
43C3D41315D473660066D36D /* silver_button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = silver_button.png; sourceTree = "<group>"; };
|
||||
|
@ -776,6 +765,15 @@
|
|||
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>"; };
|
||||
FF1660CC16D6FD8A00AF8541 /* SmallInteractionCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SmallInteractionCell.m; sourceTree = "<group>"; };
|
||||
FF29708916DD7AA400E92F85 /* segment_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = segment_active.png; sourceTree = "<group>"; };
|
||||
FF29708A16DD7AA400E92F85 /* segment_inactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = segment_inactive.png; sourceTree = "<group>"; };
|
||||
FF29708D16DD7C8A00E92F85 /* segment_left_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = segment_left_selected.png; sourceTree = "<group>"; };
|
||||
FF29708F16DD7FD800E92F85 /* segment_unselected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = segment_unselected.png; sourceTree = "<group>"; };
|
||||
FF29709116DD80F700E92F85 /* segment_right_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = segment_right_selected.png; sourceTree = "<group>"; };
|
||||
FF29709316DD8CB000E92F85 /* unread_yellow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "unread_yellow@2x.png"; sourceTree = "<group>"; };
|
||||
FF29709516DD9F2600E92F85 /* nav_icn_settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav_icn_settings@2x.png"; sourceTree = "<group>"; };
|
||||
FF29709716DD9F7400E92F85 /* nav_icn_add@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav_icn_add@2x.png"; sourceTree = "<group>"; };
|
||||
FF29709916DDA02200E92F85 /* nav_icn_activity_hover@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "nav_icn_activity_hover@2x.png"; 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>"; };
|
||||
|
@ -1230,6 +1228,7 @@
|
|||
431B857615A132B600DCE497 /* Images */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
FF29708816DD7AA400E92F85 /* segmented */,
|
||||
FF85BF8416D6C2B7002D334D /* clock2.png */,
|
||||
FF85BF7A16D6AD6F002D334D /* g_icn_folder_rss.png */,
|
||||
FF85BF7B16D6AD6F002D334D /* g_icn_folder.png */,
|
||||
|
@ -1239,8 +1238,11 @@
|
|||
FF85BF7316D6A972002D334D /* ak-icon-blurblogs.png */,
|
||||
FF85BF7016D6A90D002D334D /* ak-icon-global.png */,
|
||||
FF85BF6216D5A5A8002D334D /* nav_icn_add.png */,
|
||||
FF29709716DD9F7400E92F85 /* nav_icn_add@2x.png */,
|
||||
FF85BF5E16D5A587002D334D /* nav_icn_activity_hover.png */,
|
||||
FF29709916DDA02200E92F85 /* nav_icn_activity_hover@2x.png */,
|
||||
FF85BF5F16D5A587002D334D /* nav_icn_settings.png */,
|
||||
FF29709516DD9F2600E92F85 /* nav_icn_settings@2x.png */,
|
||||
FF85BF7E16D6AF43002D334D /* g_icn_focus.png */,
|
||||
FF85BF7F16D6AF43002D334D /* g_icn_hidden.png */,
|
||||
FF85BF8016D6AF43002D334D /* g_icn_unread.png */,
|
||||
|
@ -1278,8 +1280,8 @@
|
|||
43C3D41E15D478570066D36D /* redButtonActivated@2x.png */,
|
||||
43C3D41515D477B40066D36D /* red_button.png */,
|
||||
43C3D41315D473660066D36D /* silver_button.png */,
|
||||
43C3D40D15D469DF0066D36D /* unread_yellow@2x.png */,
|
||||
43C3D40B15D469010066D36D /* unread_yellow.png */,
|
||||
FF29709316DD8CB000E92F85 /* unread_yellow@2x.png */,
|
||||
43C3D40915D468BA0066D36D /* all.png */,
|
||||
43C3D41115D46D330066D36D /* all@2x.png */,
|
||||
43C3D40715D4680C0066D36D /* green_focus.png */,
|
||||
|
@ -1403,16 +1405,7 @@
|
|||
43A4C43215B00A26008787B5 /* slide_left@2x.png */,
|
||||
43A4C43315B00A26008787B5 /* slide_right.png */,
|
||||
43A4C43415B00A26008787B5 /* slide_right@2x.png */,
|
||||
43A4C43515B00A26008787B5 /* thumbs_down.png */,
|
||||
43A4C43615B00A26008787B5 /* thumbs_down@2x.png */,
|
||||
43A4C43715B00A26008787B5 /* thumbs_up.png */,
|
||||
43A4C43815B00A26008787B5 /* thumbs_up@2x.png */,
|
||||
43A4C43915B00A26008787B5 /* toolbar_back_button.png */,
|
||||
43A4C43A15B00A26008787B5 /* train.png */,
|
||||
43A4C43B15B00A26008787B5 /* unread_color.png */,
|
||||
43A4C43C15B00A26008787B5 /* unread_color@2x.png */,
|
||||
43A4C43D15B00A26008787B5 /* unread.png */,
|
||||
43A4C43E15B00A26008787B5 /* unread@2x.png */,
|
||||
43A4C43F15B00A26008787B5 /* warning.gif */,
|
||||
43A4C44015B00A26008787B5 /* warning.png */,
|
||||
43A4C44115B00A26008787B5 /* world.png */,
|
||||
|
@ -1629,6 +1622,18 @@
|
|||
path = Source;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
FF29708816DD7AA400E92F85 /* segmented */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
FF29708D16DD7C8A00E92F85 /* segment_left_selected.png */,
|
||||
FF29708F16DD7FD800E92F85 /* segment_unselected.png */,
|
||||
FF29709116DD80F700E92F85 /* segment_right_selected.png */,
|
||||
FF29708916DD7AA400E92F85 /* segment_active.png */,
|
||||
FF29708A16DD7AA400E92F85 /* segment_inactive.png */,
|
||||
);
|
||||
path = segmented;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
FF2D8B481487EFF000057B80 /* ShareKit */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
@ -2148,16 +2153,7 @@
|
|||
43A4C48D15B00A26008787B5 /* slide_left@2x.png in Resources */,
|
||||
43A4C48E15B00A26008787B5 /* slide_right.png in Resources */,
|
||||
43A4C48F15B00A26008787B5 /* slide_right@2x.png in Resources */,
|
||||
43A4C49015B00A26008787B5 /* thumbs_down.png in Resources */,
|
||||
43A4C49115B00A26008787B5 /* thumbs_down@2x.png in Resources */,
|
||||
43A4C49215B00A26008787B5 /* thumbs_up.png in Resources */,
|
||||
43A4C49315B00A26008787B5 /* thumbs_up@2x.png in Resources */,
|
||||
43A4C49415B00A26008787B5 /* toolbar_back_button.png in Resources */,
|
||||
43A4C49515B00A26008787B5 /* train.png in Resources */,
|
||||
43A4C49615B00A26008787B5 /* unread_color.png in Resources */,
|
||||
43A4C49715B00A26008787B5 /* unread_color@2x.png in Resources */,
|
||||
43A4C49815B00A26008787B5 /* unread.png in Resources */,
|
||||
43A4C49915B00A26008787B5 /* unread@2x.png in Resources */,
|
||||
43A4C49A15B00A26008787B5 /* warning.gif in Resources */,
|
||||
43A4C49B15B00A26008787B5 /* warning.png in Resources */,
|
||||
43A4C49C15B00A26008787B5 /* world.png in Resources */,
|
||||
|
@ -2213,7 +2209,6 @@
|
|||
43C3D40815D4680C0066D36D /* green_focus.png in Resources */,
|
||||
43C3D40A15D468BA0066D36D /* all.png in Resources */,
|
||||
43C3D40C15D469010066D36D /* unread_yellow.png in Resources */,
|
||||
43C3D40E15D469DF0066D36D /* unread_yellow@2x.png in Resources */,
|
||||
43C3D41015D46D2B0066D36D /* green_focus@2x.png in Resources */,
|
||||
43C3D41215D46D330066D36D /* all@2x.png in Resources */,
|
||||
43C3D41415D473660066D36D /* silver_button.png in Resources */,
|
||||
|
@ -2281,6 +2276,15 @@
|
|||
FF85BF8516D6C2B7002D334D /* clock2.png in Resources */,
|
||||
FF1660C816D6E9A700AF8541 /* DashboardViewController.xib in Resources */,
|
||||
FF1660CA16D6E9B400AF8541 /* DashboardViewController~ipad.xib in Resources */,
|
||||
FF29708B16DD7AA400E92F85 /* segment_active.png in Resources */,
|
||||
FF29708C16DD7AA400E92F85 /* segment_inactive.png in Resources */,
|
||||
FF29708E16DD7C8A00E92F85 /* segment_left_selected.png in Resources */,
|
||||
FF29709016DD7FD800E92F85 /* segment_unselected.png in Resources */,
|
||||
FF29709216DD80F700E92F85 /* segment_right_selected.png in Resources */,
|
||||
FF29709416DD8CB000E92F85 /* unread_yellow@2x.png in Resources */,
|
||||
FF29709616DD9F2600E92F85 /* nav_icn_settings@2x.png in Resources */,
|
||||
FF29709816DD9F7400E92F85 /* nav_icn_add@2x.png in Resources */,
|
||||
FF29709A16DDA02200E92F85 /* nav_icn_activity_hover@2x.png in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
|
@ -94,7 +94,6 @@
|
|||
<string key="NSFrame">{{70, 8}, {180, 30}}</string>
|
||||
<reference key="NSSuperview" ref="895374018"/>
|
||||
<reference key="NSWindow"/>
|
||||
<reference key="NSNextKeyView"/>
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<int key="IBSegmentControlStyle">2</int>
|
||||
<int key="IBNumberOfSegments">3</int>
|
||||
|
@ -155,7 +154,7 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBUIBarButtonItem" id="816230383">
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<float key="IBUIWidth">38</float>
|
||||
<float key="IBUIWidth">22</float>
|
||||
<reference key="IBUIToolbar" ref="895374018"/>
|
||||
</object>
|
||||
<object class="IBUIBarButtonItem" id="403674562">
|
||||
|
@ -175,7 +174,7 @@
|
|||
</object>
|
||||
<object class="IBUIBarButtonItem" id="934474311">
|
||||
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
|
||||
<float key="IBUIWidth">38</float>
|
||||
<float key="IBUIWidth">22</float>
|
||||
<reference key="IBUIToolbar" ref="895374018"/>
|
||||
</object>
|
||||
</object>
|
||||
|
@ -2169,6 +2168,7 @@
|
|||
<string>sectionUntapped:</string>
|
||||
<string>sectionUntappedOutside:</string>
|
||||
<string>selectIntelligence</string>
|
||||
<string>showInteractionsPopover:</string>
|
||||
<string>showSettingsPopover:</string>
|
||||
<string>tapAddSite:</string>
|
||||
</object>
|
||||
|
@ -2180,6 +2180,7 @@
|
|||
<string>id</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
<string>id</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="actionInfosByName">
|
||||
|
@ -2190,6 +2191,7 @@
|
|||
<string>sectionUntapped:</string>
|
||||
<string>sectionUntappedOutside:</string>
|
||||
<string>selectIntelligence</string>
|
||||
<string>showInteractionsPopover:</string>
|
||||
<string>showSettingsPopover:</string>
|
||||
<string>tapAddSite:</string>
|
||||
</object>
|
||||
|
@ -2211,6 +2213,10 @@
|
|||
<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>
|
||||
|
@ -2225,6 +2231,7 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>activitiesButton</string>
|
||||
<string>addBarButton</string>
|
||||
<string>appDelegate</string>
|
||||
<string>feedScoreSlider</string>
|
||||
|
@ -2240,6 +2247,7 @@
|
|||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>UIBarButtonItem</string>
|
||||
<string>NewsBlurAppDelegate</string>
|
||||
<string>UISlider</string>
|
||||
<string>UITableView</string>
|
||||
|
@ -2256,6 +2264,7 @@
|
|||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>activitiesButton</string>
|
||||
<string>addBarButton</string>
|
||||
<string>appDelegate</string>
|
||||
<string>feedScoreSlider</string>
|
||||
|
@ -2270,6 +2279,10 @@
|
|||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">activitiesButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
</object>
|
||||
<object class="IBToOneOutletInfo">
|
||||
<string key="name">addBarButton</string>
|
||||
<string key="candidateClassName">UIBarButtonItem</string>
|
||||
|
@ -2906,9 +2919,9 @@
|
|||
</object>
|
||||
<object class="NSArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>{80, 16}</string>
|
||||
<string>{80, 16}</string>
|
||||
<string>{57, 16}</string>
|
||||
<string>{19, 9}</string>
|
||||
<string>{54, 10}</string>
|
||||
<string>{58, 10}</string>
|
||||
</object>
|
||||
</object>
|
||||
<string key="IBCocoaTouchPluginVersion">2083</string>
|
||||
|
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 511 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 756 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 3 KiB |
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 822 B |
BIN
media/ios/Resources/nav_icn_activity_hover@2x.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 294 B |
BIN
media/ios/Resources/nav_icn_add@2x.png
Normal file
After Width: | Height: | Size: 456 B |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 1 KiB |
BIN
media/ios/Resources/nav_icn_settings@2x.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
BIN
media/ios/Resources/segmented/segment_active.png
Normal file
After Width: | Height: | Size: 647 B |
BIN
media/ios/Resources/segmented/segment_inactive.png
Normal file
After Width: | Height: | Size: 658 B |
BIN
media/ios/Resources/segmented/segment_left_selected.png
Normal file
After Width: | Height: | Size: 383 B |
BIN
media/ios/Resources/segmented/segment_right_selected.png
Normal file
After Width: | Height: | Size: 393 B |
BIN
media/ios/Resources/segmented/segment_unselected.png
Normal file
After Width: | Height: | Size: 302 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 831 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 577 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 595 B |
Before Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 3 KiB |