keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Convert FingerprintViewController to programmatic layout.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 3508feaec3
commit 93a587c896
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File

14
Signal/src/ViewControllers/FingerprintViewController.m
Unescape Escape View File

@ -164,7 +164,7 @@ typedef void (^CustomLayoutBlock)();
addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(scanButtonTapped:)]]; addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(scanButtonTapped:)]];
[mainView addSubview:scanButton]; [mainView addSubview:scanButton];
[scanButton autoPinWidthToSuperview]; [scanButton autoPinWidthToSuperview];
[scanButton autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:12.f]; [scanButton autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:ScaleFromIPhone5To7Plus(12.f, 25.f)];
UILabel *scanButtonLabel = [UILabel new]; UILabel *scanButtonLabel = [UILabel new];
scanButtonLabel.text = NSLocalizedString(@"SCAN_CODE_ACTION", scanButtonLabel.text = NSLocalizedString(@"SCAN_CODE_ACTION",
@ -191,16 +191,14 @@ typedef void (^CustomLayoutBlock)();
@"Paragraph(s) shown alongside the safety number when verifying privacy with {{contact name}}"); @"Paragraph(s) shown alongside the safety number when verifying privacy with {{contact name}}");
UILabel *instructionsLabel = [UILabel new]; UILabel *instructionsLabel = [UILabel new];
instructionsLabel.text = [NSString stringWithFormat:instructionsFormat, self.contactName]; instructionsLabel.text = [NSString stringWithFormat:instructionsFormat, self.contactName];
UIFont *instructionsFont = [UIFont ows_dynamicTypeBodyFont]; instructionsLabel.font = [UIFont ows_regularFontWithSize:ScaleFromIPhone5To7Plus(11.f, 16.f)];
instructionsFont = [instructionsFont fontWithSize:instructionsFont.pointSize * 0.65f];
instructionsLabel.font = instructionsFont;
instructionsLabel.textColor = darkGrey; instructionsLabel.textColor = darkGrey;
instructionsLabel.textAlignment = NSTextAlignmentCenter; instructionsLabel.textAlignment = NSTextAlignmentCenter;
instructionsLabel.numberOfLines = 0; instructionsLabel.numberOfLines = 0;
instructionsLabel.lineBreakMode = NSLineBreakByWordWrapping; instructionsLabel.lineBreakMode = NSLineBreakByWordWrapping;
[mainView addSubview:instructionsLabel]; [mainView addSubview:instructionsLabel];
[instructionsLabel autoPinWidthToSuperviewWithMargin:16.f]; [instructionsLabel autoPinWidthToSuperviewWithMargin:16.f];
[instructionsLabel autoPinEdge:ALEdgeBottom toEdge:ALEdgeTop ofView:scanButton withOffset:-20.f]; [instructionsLabel autoPinEdge:ALEdgeBottom toEdge:ALEdgeTop ofView:scanButton withOffset:-ScaleFromIPhone5To7Plus(20.f, 30.f)];
// Fingerprint Label // Fingerprint Label
UILabel *fingerprintLabel = [UILabel new]; UILabel *fingerprintLabel = [UILabel new];
@ -216,14 +214,14 @@ typedef void (^CustomLayoutBlock)();
fingerprintLabel.userInteractionEnabled = YES; fingerprintLabel.userInteractionEnabled = YES;
[mainView addSubview:fingerprintLabel]; [mainView addSubview:fingerprintLabel];
[fingerprintLabel autoPinWidthToSuperviewWithMargin:36.f]; [fingerprintLabel autoPinWidthToSuperviewWithMargin:36.f];
[fingerprintLabel autoPinEdge:ALEdgeBottom toEdge:ALEdgeTop ofView:instructionsLabel withOffset:-8.f]; [fingerprintLabel autoPinEdge:ALEdgeBottom toEdge:ALEdgeTop ofView:instructionsLabel withOffset:-ScaleFromIPhone5To7Plus(8.f, 15.f)];
// Fingerprint Image // Fingerprint Image
CustomLayoutView *fingerprintView = [CustomLayoutView new]; CustomLayoutView *fingerprintView = [CustomLayoutView new];
[mainView addSubview:fingerprintView]; [mainView addSubview:fingerprintView];
[fingerprintView autoPinWidthToSuperview]; [fingerprintView autoPinWidthToSuperview];
[fingerprintView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:10.f]; [fingerprintView autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:ScaleFromIPhone5To7Plus(10.f, 25.f)];
[fingerprintView autoPinEdge:ALEdgeBottom toEdge:ALEdgeTop ofView:fingerprintLabel withOffset:-10.f]; [fingerprintView autoPinEdge:ALEdgeBottom toEdge:ALEdgeTop ofView:fingerprintLabel withOffset:-ScaleFromIPhone5To7Plus(10.f, 15.f)];
[fingerprintView [fingerprintView
addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self
action:@selector(fingerprintViewTapped:)]]; action:@selector(fingerprintViewTapped:)]];

Write Preview
Loading…
Cancel
Save