zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity

Improve style of "Check your Inbox" screen IOS-139 (#1000)

This commit is contained in:
Marcus Kida 2023-04-04 16:22:02 +02:00 committed by GitHub
parent 7bdc37ac05
commit 560003f78b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Localization/app.json
View File

@ -430,18 +430,18 @@
"resend": "Resend"
},
"dont_receive_email": {
"title": "Check your email",
"title": "Check your Email",
"description": "Check if your email address is correct as well as your junk folder if you haven’t.",
"resend_email": "Resend Email"
},
"open_email_app": {
"title": "Check your inbox.",
"title": "Check your Inbox.",
"description": "We just sent you an email. Check your junk folder if you haven’t.",
"mail": "Mail",
"open_email_client": "Open Email Client"
},
"didnt_get_link": {
"prefix": "Didn't get a Link?",
"prefix": "Didn’t get a link?",
"resend_in": "Resend (%@)",
"resend_now": "Resend now."
}

5
Mastodon/Scene/Onboarding/ConfirmEmail/MastodonConfirmEmailViewController.swift
View File

@ -153,7 +153,8 @@ extension MastodonConfirmEmailViewController {
let nowIn60Seconds = Date().addingTimeInterval(60)
let boldFont = UIFontMetrics(forTextStyle: .subheadline).scaledFont(for: .systemFont(ofSize: 15, weight: .bold))
let regularFont = UIFontMetrics(forTextStyle: .subheadline).scaledFont(for: .systemFont(ofSize: 15, weight: .regular))
let digitFont = UIFontMetrics(forTextStyle: .body).scaledFont(for: .monospacedDigitSystemFont(ofSize: 15, weight: .bold))
let timer = Timer(timeInterval: 1.0, repeats: true) { [weak self] in
guard Date() < nowIn60Seconds else {
self?.resendEmailButton.isEnabled = true
@ -176,7 +177,7 @@ extension MastodonConfirmEmailViewController {
var configuration = self?.resendEmailButton.configuration
let boldResendString = AttributedString(L10n.Scene.ConfirmEmail.DidntGetLink.resendIn(Int(nowIn60Seconds.timeIntervalSinceNow) + 1), attributes: .init([.font: boldFont]))
let boldResendString = AttributedString(L10n.Scene.ConfirmEmail.DidntGetLink.resendIn(Int(nowIn60Seconds.timeIntervalSinceNow) + 1), attributes: .init([.font: digitFont]))
var attributedTitle = AttributedString(L10n.Scene.ConfirmEmail.DidntGetLink.prefix, attributes: .init([.font: regularFont]))
attributedTitle.append(AttributedString(" "))

12
MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
View File

@ -701,8 +701,8 @@ public enum L10n {
public static let resend = L10n.tr("Localizable", "Scene.ConfirmEmail.Button.Resend", fallback: "Resend")
}
public enum DidntGetLink {
/// Didn't get a Link?
public static let `prefix` = L10n.tr("Localizable", "Scene.ConfirmEmail.DidntGetLink.Prefix", fallback: "Didn't get a Link?")
/// Didn’t get a link?
public static let `prefix` = L10n.tr("Localizable", "Scene.ConfirmEmail.DidntGetLink.Prefix", fallback: "Didn’t get a link?")
/// Resend (%@)
public static func resendIn(_ p1: Any) -> String {
return L10n.tr("Localizable", "Scene.ConfirmEmail.DidntGetLink.ResendIn", String(describing: p1), fallback: "Resend (%@)")
@ -715,8 +715,8 @@ public enum L10n {
public static let description = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.Description", fallback: "Check if your email address is correct as well as your junk folder if you haven’t.")
/// Resend Email
public static let resendEmail = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.ResendEmail", fallback: "Resend Email")
/// Check your email
public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.Title", fallback: "Check your email")
/// Check your Email
public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.DontReceiveEmail.Title", fallback: "Check your Email")
}
public enum OpenEmailApp {
/// We just sent you an email. Check your junk folder if you haven’t.
@ -725,8 +725,8 @@ public enum L10n {
public static let mail = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.Mail", fallback: "Mail")
/// Open Email Client
public static let openEmailClient = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.OpenEmailClient", fallback: "Open Email Client")
/// Check your inbox.
public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.Title", fallback: "Check your inbox.")
/// Check your Inbox.
public static let title = L10n.tr("Localizable", "Scene.ConfirmEmail.OpenEmailApp.Title", fallback: "Check your Inbox.")
}
}
public enum Discovery {

6
MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
View File

@ -249,16 +249,16 @@ uploaded to Mastodon.";
"Scene.Compose.Visibility.Public" = "Public";
"Scene.Compose.Visibility.Unlisted" = "Unlisted";
"Scene.ConfirmEmail.Button.Resend" = "Resend";
"Scene.ConfirmEmail.DidntGetLink.Prefix" = "Didn't get a Link?";
"Scene.ConfirmEmail.DidntGetLink.Prefix" = "Didn’t get a link?";
"Scene.ConfirmEmail.DidntGetLink.ResendIn" = "Resend (%@)";
"Scene.ConfirmEmail.DidntGetLink.ResendNow" = "Resend now.";
"Scene.ConfirmEmail.DontReceiveEmail.Description" = "Check if your email address is correct as well as your junk folder if you haven’t.";
"Scene.ConfirmEmail.DontReceiveEmail.ResendEmail" = "Resend Email";
"Scene.ConfirmEmail.DontReceiveEmail.Title" = "Check your email";
"Scene.ConfirmEmail.DontReceiveEmail.Title" = "Check your Email";
"Scene.ConfirmEmail.OpenEmailApp.Description" = "We just sent you an email. Check your junk folder if you haven’t.";
"Scene.ConfirmEmail.OpenEmailApp.Mail" = "Mail";
"Scene.ConfirmEmail.OpenEmailApp.OpenEmailClient" = "Open Email Client";
"Scene.ConfirmEmail.OpenEmailApp.Title" = "Check your inbox.";
"Scene.ConfirmEmail.OpenEmailApp.Title" = "Check your Inbox.";
"Scene.ConfirmEmail.TapTheLinkWeEmailedToYouToVerifyYourAccount" = "Tap the link we sent you to verify %@. We’ll wait right here.";
"Scene.ConfirmEmail.Title" = "Check Your Inbox";
"Scene.Discovery.Intro" = "These are the posts gaining traction in your corner of Mastodon.";

6
MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings
View File

@ -249,16 +249,16 @@ uploaded to Mastodon.";
"Scene.Compose.Visibility.Public" = "Public";
"Scene.Compose.Visibility.Unlisted" = "Unlisted";
"Scene.ConfirmEmail.Button.Resend" = "Resend";
"Scene.ConfirmEmail.DidntGetLink.Prefix" = "Didn't get a Link?";
"Scene.ConfirmEmail.DidntGetLink.Prefix" = "Didn’t get a link?";
"Scene.ConfirmEmail.DidntGetLink.ResendIn" = "Resend (%@)";
"Scene.ConfirmEmail.DidntGetLink.ResendNow" = "Resend now.";
"Scene.ConfirmEmail.DontReceiveEmail.Description" = "Check if your email address is correct as well as your junk folder if you haven’t.";
"Scene.ConfirmEmail.DontReceiveEmail.ResendEmail" = "Resend Email";
"Scene.ConfirmEmail.DontReceiveEmail.Title" = "Check your email";
"Scene.ConfirmEmail.DontReceiveEmail.Title" = "Check your Email";
"Scene.ConfirmEmail.OpenEmailApp.Description" = "We just sent you an email. Check your junk folder if you haven’t.";
"Scene.ConfirmEmail.OpenEmailApp.Mail" = "Mail";
"Scene.ConfirmEmail.OpenEmailApp.OpenEmailClient" = "Open Email Client";
"Scene.ConfirmEmail.OpenEmailApp.Title" = "Check your inbox.";
"Scene.ConfirmEmail.OpenEmailApp.Title" = "Check your Inbox.";
"Scene.ConfirmEmail.TapTheLinkWeEmailedToYouToVerifyYourAccount" = "Tap the link we sent you to verify %@. We’ll wait right here.";
"Scene.ConfirmEmail.Title" = "Check Your Inbox";
"Scene.Discovery.Intro" = "These are the posts gaining traction in your corner of Mastodon.";