diff --git a/clients/ios/Classes/AddSiteTableCell.m b/clients/ios/Classes/AddSiteTableCell.m
index e3e71ec09..d0b7b2dd5 100644
--- a/clients/ios/Classes/AddSiteTableCell.m
+++ b/clients/ios/Classes/AddSiteTableCell.m
@@ -64,7 +64,6 @@ static UIFont *indicatorFont = nil;
if (highlighted) {
textColor = UIColorFromRGB(0x686868); //0x686868
}
- [textColor set];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle defaultParagraphStyle] mutableCopy];
paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
@@ -73,6 +72,7 @@ static UIFont *indicatorFont = nil;
[self.siteTitle
drawInRect:CGRectMake(leftMargin, 6, rect.size.width - rightMargin, 21)
withAttributes:@{NSFontAttributeName: font,
+ NSForegroundColorAttributeName: textColor,
NSParagraphStyleAttributeName: paragraphStyle}];
textColor = UIColorFromRGB(0x333333);
@@ -92,12 +92,12 @@ static UIFont *indicatorFont = nil;
if (highlighted) {
textColor = UIColorFromRGB(0x686868);
}
- [textColor set];
paragraphStyle.alignment = NSTextAlignmentRight;
[self.siteSubscribers
drawInRect:CGRectMake(leftMargin + (rect.size.width - rightMargin) / 2 - 10, 42 + adjustForSocial, (rect.size.width - rightMargin) / 2 + 10, 15.0)
withAttributes:@{NSFontAttributeName: font,
+ NSForegroundColorAttributeName: textColor,
NSParagraphStyleAttributeName: paragraphStyle}];
// feed bar
diff --git a/clients/ios/Classes/DashboardViewController.h b/clients/ios/Classes/DashboardViewController.h
index 3e408768a..dcd511b49 100644
--- a/clients/ios/Classes/DashboardViewController.h
+++ b/clients/ios/Classes/DashboardViewController.h
@@ -19,7 +19,7 @@
ActivityModule *activitiesModule;
UIWebView *feedbackWebView;
UIToolbar *toolbar;
- UIToolbar *topToolbar;
+ UINavigationBar *topToolbar;
UISegmentedControl *segmentedButton;
}
@@ -28,7 +28,7 @@
@property (nonatomic) IBOutlet ActivityModule *activitiesModule;
@property (nonatomic) IBOutlet UIWebView *feedbackWebView;
-@property (nonatomic) IBOutlet UIToolbar *topToolbar;
+@property (nonatomic) IBOutlet UINavigationBar *topToolbar;
@property (nonatomic) IBOutlet UIToolbar *toolbar;
@property (nonatomic) IBOutlet UISegmentedControl *segmentedButton;
diff --git a/clients/ios/Classes/DashboardViewController.m b/clients/ios/Classes/DashboardViewController.m
index 065b7893c..e802e1d39 100644
--- a/clients/ios/Classes/DashboardViewController.m
+++ b/clients/ios/Classes/DashboardViewController.m
@@ -42,8 +42,6 @@
self.feedbackWebView.delegate = self;
self.segmentedButton.selectedSegmentIndex = 0;
- self.topToolbar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
-
// preload feedback
self.feedbackWebView.scalesPageToFit = YES;
@@ -59,7 +57,10 @@
NSURLRequest *requestObj = [NSURLRequest requestWithURL:url];
//Load the request in the UIWebView.
[self.feedbackWebView loadRequest:requestObj];
-
+
+ CGRect topToolbarFrame = self.topToolbar.frame;
+ topToolbarFrame.size.height += 20;
+ self.topToolbar.frame = topToolbarFrame;
}
- (void)viewDidUnload {
diff --git a/clients/ios/Classes/FolderTitleView.m b/clients/ios/Classes/FolderTitleView.m
index 4750377c5..9ef4b5341 100644
--- a/clients/ios/Classes/FolderTitleView.m
+++ b/clients/ios/Classes/FolderTitleView.m
@@ -98,7 +98,6 @@
// Folder title
UIColor *textColor = [UIColor colorWithRed:0.3 green:0.3 blue:0.3 alpha:1.0];
- [textColor set];
UIFont *font = [UIFont boldSystemFontOfSize:11];
NSString *folderTitle;
if (section == 0) {
@@ -121,6 +120,7 @@
[folderTitle
drawInRect:CGRectMake(36.0, 10, rect.size.width - 36 - 36 - countWidth, 14)
withAttributes:@{NSFontAttributeName: font,
+ NSForegroundColorAttributeName: textColor,
NSParagraphStyleAttributeName: paragraphStyle}];
UIButton *invisibleHeaderButton = [UIButton buttonWithType:UIButtonTypeCustom];
diff --git a/clients/ios/Classes/NBContainerViewController.m b/clients/ios/Classes/NBContainerViewController.m
index 07117824e..1bd717795 100644
--- a/clients/ios/Classes/NBContainerViewController.m
+++ b/clients/ios/Classes/NBContainerViewController.m
@@ -99,6 +99,8 @@
object:nil];
self.view.backgroundColor = UIColorFromRGB(0xC2C5BE);
+ self.navigationController.navigationBar.translucent = NO;
+ self.masterNavigationController.navigationBar.translucent = NO;
self.masterNavigationController = appDelegate.navigationController;
self.feedsViewController = appDelegate.feedsViewController;
@@ -120,9 +122,11 @@
UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:self.storyPageControl];
self.storyNavigationController = nav;
+ self.storyNavigationController.navigationBar.translucent = NO;
UINavigationController *shareNav = [[UINavigationController alloc] initWithRootViewController:self.shareViewController];
self.shareNavigationController = shareNav;
+ self.shareNavigationController.navigationBar.translucent = NO;
// set default y coordinate for feedDetailY from saved preferences
NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults];
diff --git a/clients/ios/Classes/NewsBlurAppDelegate.m b/clients/ios/Classes/NewsBlurAppDelegate.m
index 620170506..1c14459fe 100644
--- a/clients/ios/Classes/NewsBlurAppDelegate.m
+++ b/clients/ios/Classes/NewsBlurAppDelegate.m
@@ -1026,13 +1026,15 @@
- (void)showOriginalStory:(NSURL *)url {
self.activeOriginalStoryURL = url;
+ UINavigationController *navController = [[UINavigationController alloc]
+ initWithRootViewController:self.originalStoryViewController];
+ navController.navigationBar.translucent = NO;
+ self.originalStoryViewNavController = navController;
+
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
- [self.masterContainerViewController presentViewController:originalStoryViewController
+ [self.masterContainerViewController presentViewController:self.originalStoryViewNavController
animated:YES completion:nil];
} else {
- self.originalStoryViewNavController = [[UINavigationController alloc]
- initWithRootViewController:originalStoryViewController];
- self.originalStoryViewNavController.navigationBar.translucent = NO;
[self.navigationController presentViewController:self.originalStoryViewNavController
animated:YES completion:nil];
}
diff --git a/clients/ios/Classes/OriginalStoryViewController.h b/clients/ios/Classes/OriginalStoryViewController.h
index 48beba714..d4dfcbb01 100644
--- a/clients/ios/Classes/OriginalStoryViewController.h
+++ b/clients/ios/Classes/OriginalStoryViewController.h
@@ -11,7 +11,7 @@
@class NewsBlurAppDelegate;
-static const CGFloat kNavBarHeight = 58.0f;
+static const CGFloat kNavBarHeight = 78.0f;
static const CGFloat kLabelHeight = 18.0f;
static const CGFloat kMargin = 6.0f;
static const CGFloat kSpacer = 2.0f;
@@ -37,7 +37,7 @@ static const CGFloat kButtonWidth = 68.0f;
}
@property (nonatomic) IBOutlet NewsBlurAppDelegate *appDelegate;
-@property (nonatomic) IBOutlet UIView *navBar;
+@property (nonatomic) IBOutlet UINavigationBar *navBar;
@property (nonatomic) IBOutlet UIBarButtonItem *closeButton;
@property (nonatomic) IBOutlet UIWebView *webView;
@property (nonatomic) IBOutlet UIBarButtonItem* back;
diff --git a/clients/ios/Classes/OriginalStoryViewController.m b/clients/ios/Classes/OriginalStoryViewController.m
index 8fc95255b..d828ed02d 100644
--- a/clients/ios/Classes/OriginalStoryViewController.m
+++ b/clients/ios/Classes/OriginalStoryViewController.m
@@ -72,14 +72,8 @@
[self layoutForInterfaceOrientation:toInterfaceOrientation];
}
-- (void)viewDidLoad {
- CGRect navBarFrame = self.view.bounds;
- navBarFrame.size.height = kNavBarHeight;
- navBarFrame.origin.y += 20;
- navBar = [[UINavigationBar alloc] initWithFrame:navBarFrame];
- [self.view addSubview:navBar];
-
- CGRect labelFrame = CGRectMake(kMargin, kSpacer,
+- (void)viewDidLoad {
+ CGRect labelFrame = CGRectMake(kMargin, kSpacer + 20,
navBar.bounds.size.width - 2*kMargin,
kLabelHeight);
@@ -102,7 +96,7 @@
action:@selector(doCloseOriginalStoryViewController)];
close.width = kButtonWidth;
CGRect closeButtonFrame = CGRectMake(-20,
- kSpacer*2.0 + kLabelHeight - 7.0f,
+ kSpacer*2.0 + kLabelHeight - 7.0f + 20,
kButtonWidth + kMargin,
44.0);
TransparentToolbar* tools = [[TransparentToolbar alloc]
@@ -114,7 +108,7 @@
CGRect addressFrame = CGRectMake(closeButtonFrame.origin.x +
closeButtonFrame.size.width +
kMargin,
- kSpacer*2.0 + kLabelHeight,
+ kSpacer*2.0 + kLabelHeight + 20,
labelFrame.size.width
- kButtonWidth - kMargin*2 + 20,
kAddressHeight);
@@ -167,6 +161,8 @@
navBarFrame.size.height = kNavBarHeight;
navBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
navBar.frame = navBarFrame;
+ navBar.translucent = NO;
+ toolbar.translucent = NO;
}
- (IBAction)webViewGoBack:(id)sender {
diff --git a/clients/ios/Classes/SiteCell.m b/clients/ios/Classes/SiteCell.m
index 6a65dbefa..023053c4c 100644
--- a/clients/ios/Classes/SiteCell.m
+++ b/clients/ios/Classes/SiteCell.m
@@ -58,13 +58,13 @@ static UIFont *indicatorFont = nil;
font = [UIFont fontWithName:@"Helvetica-Bold" size:11];
textColor = UIColorFromRGB(0x606060);
- [textColor set];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle defaultParagraphStyle] mutableCopy];
paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
paragraphStyle.alignment = NSTextAlignmentLeft;
[self.siteTitle drawInRect:CGRectMake(leftMargin + 20, 6, rect.size.width - 20, 21)
withAttributes:@{NSFontAttributeName: font,
+ NSForegroundColorAttributeName: textColor,
NSParagraphStyleAttributeName: paragraphStyle}];
// feed bar
diff --git a/clients/ios/Resources-iPad/Classes/DashboardViewController~ipad.xib b/clients/ios/Resources-iPad/Classes/DashboardViewController~ipad.xib
index e6dbdc280..5ad176560 100644
--- a/clients/ios/Resources-iPad/Classes/DashboardViewController~ipad.xib
+++ b/clients/ios/Resources-iPad/Classes/DashboardViewController~ipad.xib
@@ -8,11 +8,10 @@
-
-
+
@@ -21,35 +20,27 @@
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -76,4 +67,7 @@
+
+
+
\ No newline at end of file
diff --git a/clients/ios/Resources-iPad/Classes/MoveSiteViewController~ipad.xib b/clients/ios/Resources-iPad/Classes/MoveSiteViewController~ipad.xib
index cb105a0ff..50bc56907 100644
--- a/clients/ios/Resources-iPad/Classes/MoveSiteViewController~ipad.xib
+++ b/clients/ios/Resources-iPad/Classes/MoveSiteViewController~ipad.xib
@@ -1,6692 +1,135 @@
-
-
-
- 1552
- 12F37
- 3084
- 1187.39
- 626.00
-
-
- IBProxyObject
- IBUIActivityIndicatorView
- IBUIBarButtonItem
- IBUIImageView
- IBUILabel
- IBUINavigationBar
- IBUINavigationItem
- IBUIPickerView
- IBUITextField
- IBUIView
-
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
-
-
-
-
-
-
-
-
- 0
- IBIPadFramework
-
- YES
- 3
-
- 2083
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/clients/ios/Resources-iPhone/AddSiteViewController.xib b/clients/ios/Resources-iPhone/AddSiteViewController.xib
index a2bbf5406..60049c4bb 100644
--- a/clients/ios/Resources-iPhone/AddSiteViewController.xib
+++ b/clients/ios/Resources-iPhone/AddSiteViewController.xib
@@ -1,3323 +1,162 @@
-
-
-
- 1552
- 12C3006
- 3084
- 1187.34
- 625.00
-
-
-
-
-
-
-
- 0
- IBCocoaTouchFramework
-
-
- YES
- 3
-
- 2083
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/clients/ios/Resources-iPhone/MoveSiteViewController.xib b/clients/ios/Resources-iPhone/MoveSiteViewController.xib
index 54e54d44c..764439f65 100644
--- a/clients/ios/Resources-iPhone/MoveSiteViewController.xib
+++ b/clients/ios/Resources-iPhone/MoveSiteViewController.xib
@@ -1,2272 +1,138 @@
-
-
-
- 1552
- 12F37
- 3084
- 1187.39
- 626.00
-
-
- IBProxyObject
- IBUIActivityIndicatorView
- IBUIBarButtonItem
- IBUILabel
- IBUINavigationBar
- IBUINavigationItem
- IBUIPickerView
- IBUITextField
- IBUIView
-
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaTouchFramework
-
- YES
- 3
- 2083
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/clients/ios/Resources-iPhone/OriginalStoryViewController.xib b/clients/ios/Resources-iPhone/OriginalStoryViewController.xib
index cec982723..aa8edb208 100644
--- a/clients/ios/Resources-iPhone/OriginalStoryViewController.xib
+++ b/clients/ios/Resources-iPhone/OriginalStoryViewController.xib
@@ -23,7 +23,7 @@
-
+
@@ -31,10 +31,9 @@
-
-
+
+
-
diff --git a/media/img/reader/default_profile_photo.png b/media/img/reader/default_profile_photo.png
index 3f9d09b35..6d13e8809 100644
Binary files a/media/img/reader/default_profile_photo.png and b/media/img/reader/default_profile_photo.png differ