Skip to content

#1160 update sent message alert #1216

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

Merged
tomholub merged 1 commit into from
Dec 13, 2021
Merged

#1160 update sent message alert #1216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 9 additions & 10 deletions FlowCrypt/Controllers/Compose/ComposeViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,17 @@ final class ComposeViewController: TableNodeViewController {
private func updateSpinner(with state: ComposeMessageService.State) {
switch state {
case .progressChanged(let progress):
showProgressHUD(
progress: progress,
label: state.message ?? "\(progress)"
)
case .messageSent:
showProgressHUDWithCustomImage(
imageName: "checkmark.circle",
label: "compose_sent".localized
)
if progress < 1 {
showProgressHUD(
progress: progress,
label: state.message ?? "\(progress)"
)
} else {
showIndeterminateHUD(with: "sending_title".localized)
}
case .startComposing, .validatingMessage:
showIndeterminateHUD(with: state.message ?? "")
case .idle:
case .idle, .messageSent:
hideSpinner()
}
}
Expand Down
8 changes: 4 additions & 4 deletions FlowCrypt/Functionality/Services/Compose Message Service/ComposeMessageService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,13 @@ extension ComposeMessageService {
case .idle:
return nil
case .validatingMessage:
return "Validating"
return "validating_title".localized
case .startComposing:
return "Encrypting"
return "encrypting_title".localized
case .progressChanged:
return "Uploading"
return "compose_uploading".localized
case .messageSent:
return "Message sent"
return "compose_message_sent".localized
}
}

Expand Down
2 changes: 2 additions & 0 deletions FlowCrypt/Resources/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"encrypting_title" = "Encrypting...";
"processing_title" = "Processing...";
"sending_title" = "Sending";
"validating_title" = "Validating";
"unknown_title" = "(unknown)";
"retry_title" = "Retry";
"ok" = "Ok";
Expand Down Expand Up @@ -82,6 +83,7 @@
"compose_quote_from" = "On %@ at %@ %@ wrote:"; // Date, time, sender
"compose_forward_successful" = "Message forwarded successfully";
"compose_encrypted_sent" = "Encrypted message sent";
"compose_message_sent" = "Message sent";
"compose_enter_subject" = "Enter subject";
"compose_enter_secure" = "Enter secure message";
"compose_recipient" = "Add Recipient";
Expand Down