diff --git a/Signal/src/Loki/Components/Button.swift b/Signal/src/Loki/Components/Button.swift index d94d18b89..f8b0ceb1d 100644 --- a/Signal/src/Loki/Components/Button.swift +++ b/Signal/src/Loki/Components/Button.swift @@ -63,7 +63,7 @@ final class Button : UIButton { layer.borderColor = borderColor.cgColor layer.borderWidth = Values.borderThickness let fontSize = (size == .small) ? Values.smallFontSize : Values.mediumFontSize - titleLabel!.font = Fonts.spaceMono(ofSize: fontSize) + titleLabel!.font = .boldSystemFont(ofSize: fontSize) setTitleColor(textColor, for: UIControl.State.normal) } } diff --git a/Signal/src/Loki/View Controllers/DeviceLinksVC.swift b/Signal/src/Loki/View Controllers/DeviceLinksVC.swift index 3b54c62bc..10a232e70 100644 --- a/Signal/src/Loki/View Controllers/DeviceLinksVC.swift +++ b/Signal/src/Loki/View Controllers/DeviceLinksVC.swift @@ -24,7 +24,7 @@ final class DeviceLinksVC : UIViewController, UITableViewDataSource, UITableView explanationLabel.lineBreakMode = .byWordWrapping explanationLabel.textAlignment = .center explanationLabel.text = NSLocalizedString("You haven't linked any devices yet", comment: "") - let linkNewDeviceButton = Button(style: .prominentOutline, size: .medium) + let linkNewDeviceButton = Button(style: .prominentOutline, size: .large) linkNewDeviceButton.setTitle(NSLocalizedString("Link a Device", comment: ""), for: UIControl.State.normal) linkNewDeviceButton.addTarget(self, action: #selector(linkNewDevice), for: UIControl.Event.touchUpInside) linkNewDeviceButton.set(.width, to: 160) diff --git a/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift b/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift index cb46342ab..5d849b8ca 100644 --- a/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift +++ b/Signal/src/Loki/View Controllers/NewClosedGroupVC.swift @@ -105,7 +105,7 @@ final class NewClosedGroupVC : UIViewController, UITableViewDataSource, UITableV explanationLabel.lineBreakMode = .byWordWrapping explanationLabel.textAlignment = .center explanationLabel.text = NSLocalizedString("You don't have any contacts yet", comment: "") - let createNewPrivateChatButton = Button(style: .prominentOutline, size: .medium) + let createNewPrivateChatButton = Button(style: .prominentOutline, size: .large) createNewPrivateChatButton.setTitle(NSLocalizedString("Start a Session", comment: ""), for: UIControl.State.normal) createNewPrivateChatButton.addTarget(self, action: #selector(createNewPrivateChat), for: UIControl.Event.touchUpInside) createNewPrivateChatButton.set(.width, to: 160) diff --git a/Signal/src/Loki/View Controllers/SeedVC.swift b/Signal/src/Loki/View Controllers/SeedVC.swift index e0fd439a0..0dd6d4cc2 100644 --- a/Signal/src/Loki/View Controllers/SeedVC.swift +++ b/Signal/src/Loki/View Controllers/SeedVC.swift @@ -71,7 +71,8 @@ final class SeedVC : UIViewController { let navigationBarTitleLabel = UILabel() navigationBarTitleLabel.text = NSLocalizedString("Your Recovery Phrase", comment: "") navigationBarTitleLabel.textColor = Colors.text - navigationBarTitleLabel.font = .boldSystemFont(ofSize: Values.veryLargeFontSize) + let titleLabelFontSize = isSmallScreen ? Values.largeFontSize : Values.veryLargeFontSize + navigationBarTitleLabel.font = .boldSystemFont(ofSize: titleLabelFontSize) navigationItem.titleView = navigationBarTitleLabel // Set up navigation bar buttons let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close)) @@ -145,7 +146,7 @@ final class SeedVC : UIViewController { let mainStackView = UIStackView(arrangedSubviews: [ topSpacer, topStackViewContainer, bottomSpacer, copyButtonContainer ]) mainStackView.axis = .vertical mainStackView.alignment = .fill - mainStackView.layoutMargins = UIEdgeInsets(top: 0, leading: 0, bottom: isSmallScreen ? Values.smallSpacing : Values.mediumSpacing, trailing: 0) + mainStackView.layoutMargins = UIEdgeInsets(top: 0, leading: 0, bottom: Values.mediumSpacing, trailing: 0) mainStackView.isLayoutMarginsRelativeArrangement = true view.addSubview(mainStackView) mainStackView.pin(.leading, to: .leading, of: view)