Skip to content

Match iPhone 6 and 6+ or any device size #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msmobileapps wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Match iPhone 6 and 6+ or any device size #85

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c5b7ff8
Match iPhone 6 and 6+ or any device size
msmobileapps Nov 9, 2015
e472ba1
Typo fix
msmobileapps Nov 9, 2015
a3d9fee
Try no space from status bar
msmobileapps Nov 9, 2015
57a34c6
Try removing bar padding
msmobileapps Nov 9, 2015
817845b
Attempts to match iPhone 6
msmobileapps Nov 9, 2015
a22fd28
_screen ratio as a property
msmobileapps Nov 9, 2015
43ecd9c
status bar height
msmobileapps Nov 9, 2015
b9459ee
bottom fix
msmobileapps Nov 9, 2015
64c8aac
attempt to resolve status bar offset
msmobileapps Nov 10, 2015
220c957
fixing layout attempt
msmobileapps Nov 10, 2015
9bbfa88
fixing layout attempts
msmobileapps Nov 10, 2015
077ee8f
fixing layout attempts
msmobileapps Nov 10, 2015
065884f
fixing layout attempts
msmobileapps Nov 10, 2015
59b306d
fixing layout attempts
msmobileapps Nov 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions Classes/TWMessageBarManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@
// Quartz
#import <QuartzCore/QuartzCore.h>

CGFloat const kIphone45ScreenWidth = 320;

// Numerics (TWMessageBarStyleSheet)
CGFloat const kTWMessageBarStyleSheetMessageBarAlpha = 0.96f;

CGFloat const kNavBarHeight = 64;

// Numerics (TWMessageView)
CGFloat const kTWMessageViewBarPadding = 10.0f;
CGFloat const kTWMessageViewBarPadding = 15.0f;
CGFloat const kTWMessageViewIconSize = 36.0f;
CGFloat const kTWMessageViewTextOffset = 2.0f;
NSUInteger const kTWMessageViewiOS7Identifier = 7;
Expand Down Expand Up @@ -62,6 +66,8 @@ @interface TWMessageView : UIView

@property (nonatomic, assign) CGFloat duration;

@property (nonatomic, assign) CGFloat screenRatio;

@property (nonatomic, assign) UIStatusBarStyle statusBarStyle;
@property (nonatomic, assign) BOOL statusBarHidden;

Expand Down Expand Up @@ -496,6 +502,8 @@ - (void)dealloc

- (void)drawRect:(CGRect)rect
{
_screenRatio = [UIScreen mainScreen].bounds.size.width / kIphone45ScreenWidth;

CGContextRef context = UIGraphicsGetCurrentContext();

if ([self.delegate respondsToSelector:@selector(styleSheetForMessageView:)])
Expand Down Expand Up @@ -528,21 +536,21 @@ - (void)drawRect:(CGRect)rect
}
CGContextRestoreGState(context);

CGFloat xOffset = kTWMessageViewBarPadding;
CGFloat yOffset = kTWMessageViewBarPadding + [self statusBarOffset];
CGFloat xOffset = kTWMessageViewBarPadding * _screenRatio;
CGFloat yOffset = kTWMessageViewBarPadding * _screenRatio;

// icon
CGContextSaveGState(context);
{
if ([styleSheet respondsToSelector:@selector(iconImageForMessageType:)])
{
[[styleSheet iconImageForMessageType:self.messageType] drawInRect:CGRectMake(xOffset, yOffset, kTWMessageViewIconSize, kTWMessageViewIconSize)];
[[styleSheet iconImageForMessageType:self.messageType] drawInRect:CGRectMake(xOffset, yOffset, kTWMessageViewIconSize * _screenRatio, kTWMessageViewIconSize * _screenRatio)];
}
}
CGContextRestoreGState(context);

yOffset -= kTWMessageViewTextOffset;
xOffset += kTWMessageViewIconSize + kTWMessageViewBarPadding;
xOffset += kTWMessageViewIconSize * _screenRatio + kTWMessageViewBarPadding * _screenRatio;

CGSize titleLabelSize = [self titleSize];
CGSize descriptionLabelSize = [self descriptionSize];
Expand Down Expand Up @@ -594,9 +602,7 @@ - (void)drawRect:(CGRect)rect

- (CGFloat)height
{
CGSize titleLabelSize = [self titleSize];
CGSize descriptionLabelSize = [self descriptionSize];
return MAX((kTWMessageViewBarPadding * 2) + titleLabelSize.height + descriptionLabelSize.height + [self statusBarOffset], (kTWMessageViewBarPadding * 2) + kTWMessageViewIconSize + [self statusBarOffset]);
return kNavBarHeight;
}

- (CGFloat)width
Expand All @@ -606,7 +612,7 @@ - (CGFloat)width

- (CGFloat)statusBarOffset
{
return [[UIDevice currentDevice] isRunningiOS7OrLater] ? [self statusBarFrame].size.height : 0.0;
return 0.0;
}

- (CGFloat)availableWidth
Expand Down