Refine icons and spacing.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago committed by Michael Kirk
parent f9cb5d4243
commit a26afdbca9

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

@ -525,8 +525,8 @@ typedef enum : NSUInteger {
[self.navigationBarTitleView addSubview:self.navigationBarTitleLabel]; [self.navigationBarTitleView addSubview:self.navigationBarTitleLabel];
self.navigationBarSubtitleLabel = [UILabel new]; self.navigationBarSubtitleLabel = [UILabel new];
self.navigationBarSubtitleLabel.textColor = [UIColor colorWithWhite:0.85f alpha:1.f]; self.navigationBarSubtitleLabel.textColor = [UIColor colorWithWhite:0.9f alpha:1.f];
self.navigationBarSubtitleLabel.font = [UIFont ows_boldFontWithSize:9.f]; self.navigationBarSubtitleLabel.font = [UIFont ows_regularFontWithSize:9.f];
self.navigationBarSubtitleLabel.text = NSLocalizedString(@"MESSAGES_VIEW_TITLE_SUBTITLE", self.navigationBarSubtitleLabel.text = NSLocalizedString(@"MESSAGES_VIEW_TITLE_SUBTITLE",
@"The subtitle for the messages view title indicates that the title can be tapped to access settings for this conversation."); @"The subtitle for the messages view title indicates that the title can be tapped to access settings for this conversation.");
[self.navigationBarTitleView addSubview:self.navigationBarSubtitleLabel]; [self.navigationBarTitleView addSubview:self.navigationBarSubtitleLabel];
@ -550,22 +550,22 @@ typedef enum : NSUInteger {
if (disappearingMessagesConfiguration.isEnabled) { if (disappearingMessagesConfiguration.isEnabled) {
rightBarButtonItemCount++; rightBarButtonItemCount++;
} }
CGFloat rightBarButtonSize = 0; CGFloat barButtonSize = 0;
switch (rightBarButtonItemCount) { switch (rightBarButtonItemCount) {
case 0: case 0:
rightBarButtonSize = 65; barButtonSize = 70;
break; break;
case 1: case 1:
rightBarButtonSize = 100; barButtonSize = 105;
break; break;
default: default:
OWSAssert(0); OWSAssert(0);
// In production, fall through to the largest defined case. // In production, fall through to the largest defined case.
case 2: case 2:
rightBarButtonSize = 145; barButtonSize = 150;
break; break;
} }
CGFloat maxTitleViewWidth = kShortScreenDimension - rightBarButtonSize; CGFloat maxTitleViewWidth = kShortScreenDimension - barButtonSize;
const CGFloat titleViewWidth = MIN(maxTitleViewWidth, const CGFloat titleViewWidth = MIN(maxTitleViewWidth,
MAX(self.navigationBarTitleLabel.frame.size.width, MAX(self.navigationBarTitleLabel.frame.size.width,
self.navigationBarSubtitleLabel.frame.size.width)); self.navigationBarSubtitleLabel.frame.size.width));

Loading…
Cancel
Save