mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
Merge branch 'charlesmchen/suppressLegalLinks'
This commit is contained in:
commit
aa88050919
|
@ -49,12 +49,15 @@
|
|||
accessoryText:[[[NSBundle mainBundle] infoDictionary]
|
||||
objectForKey:@"CFBundleVersion"]]];
|
||||
|
||||
#ifdef SHOW_LEGAL_TERMS_LINK
|
||||
[informationSection addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"SETTINGS_LEGAL_TERMS_CELL",
|
||||
@"table cell label")
|
||||
actionBlock:^{
|
||||
[[UIApplication sharedApplication]
|
||||
openURL:[NSURL URLWithString:kLegalTermsUrlString]];
|
||||
}]];
|
||||
#endif
|
||||
|
||||
[contents addSection:informationSection];
|
||||
|
||||
OWSTableSection *helpSection = [OWSTableSection new];
|
||||
|
|
|
@ -79,6 +79,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi
|
|||
headerLabel.textColor = [UIColor whiteColor];
|
||||
headerLabel.font = [UIFont ows_mediumFontWithSize:ScaleFromIPhone5To7Plus(20.f, 24.f)];
|
||||
|
||||
#ifdef SHOW_LEGAL_TERMS_LINK
|
||||
NSString *legalTopMatterFormat = NSLocalizedString(@"REGISTRATION_LEGAL_TOP_MATTER_FORMAT",
|
||||
@"legal disclaimer, embeds a tappable {{link title}} which is styled as a hyperlink");
|
||||
NSString *legalTopMatterLinkWord = NSLocalizedString(
|
||||
|
@ -103,8 +104,12 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi
|
|||
UITapGestureRecognizer *tapGesture =
|
||||
[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTapLegalTerms:)];
|
||||
[legalTopMatterLabel addGestureRecognizer:tapGesture];
|
||||
#endif
|
||||
|
||||
UIStackView *headerContent = [[UIStackView alloc] initWithArrangedSubviews:@[ headerLabel, legalTopMatterLabel ]];
|
||||
UIStackView *headerContent = [[UIStackView alloc] initWithArrangedSubviews:@[ headerLabel ]];
|
||||
#ifdef SHOW_LEGAL_TERMS_LINK
|
||||
[headerContent addArrangedSubview:legalTopMatterLabel];
|
||||
#endif
|
||||
headerContent.axis = UILayoutConstraintAxisVertical;
|
||||
headerContent.alignment = UIStackViewAlignmentCenter;
|
||||
headerContent.spacing = ScaleFromIPhone5To7Plus(8, 16);
|
||||
|
@ -244,6 +249,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi
|
|||
[spinnerView autoPinTrailingToSuperviewMarginWithInset:20.f];
|
||||
[spinnerView stopAnimating];
|
||||
|
||||
#ifdef SHOW_LEGAL_TERMS_LINK
|
||||
NSString *bottomTermsLinkText = NSLocalizedString(@"REGISTRATION_LEGAL_TERMS_LINK",
|
||||
@"one line label below submit button on registration screen, which links to an external webpage.");
|
||||
UIButton *bottomLegalLinkButton = [UIButton new];
|
||||
|
@ -262,6 +268,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi
|
|||
withOffset:ScaleFromIPhone5To7Plus(8, 12)];
|
||||
[bottomLegalLinkButton setCompressionResistanceHigh];
|
||||
[bottomLegalLinkButton setContentHuggingHigh];
|
||||
#endif
|
||||
}
|
||||
|
||||
- (void)viewDidAppear:(BOOL)animated
|
||||
|
|
|
@ -18,6 +18,7 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
|
|||
#define textSecureHTTPTimeOut 10
|
||||
|
||||
#define kLegalTermsUrlString @"https://signal.org/legal/"
|
||||
//#define SHOW_LEGAL_TERMS_LINK
|
||||
|
||||
//#ifndef DEBUG
|
||||
|
||||
|
|
Loading…
Reference in a new issue