mirrors/metatext
1
0
Fork 0
mirror of https://github.com/metabolist/metatext.git synced 2024-11-25 09:41:00 +00:00
Code Issues Projects Releases Wiki Activity

Mute and report cleanup

Browse source
This commit is contained in:
Justin Mazzocchi 2021-02-15 14:14:55 -08:00
parent 8e6793fbf5
commit a5483a87d2
No known key found for this signature in database
GPG key ID: E223E6937AAFB01C
4 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Localizations/Localizable.strings
View file

@ -27,12 +27,12 @@
"account.joined-%@" = "Joined %@";
"account.locked.accessibility-label" = "Locked account";
"account.mute" = "Mute";
"account.mute.indefinite" = "Indefnite";
"account.mute.indefinite" = "Indefinite";
"account.mute.confirm-%@" = "Are you sure you want to mute %@?";
"account.mute.confirm.explanation" = "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.";
"account.mute.confirm.hide-notifications" = "Hide notifications from this user?";
"account.mute.confirm.duration" = "Duration";
"account.mute.target-%@" = "Muting %@";
"account.mute.target-%@" = "Mute %@";
"account.muted" = "Muted";
"account.reject-follow-request-button.accessibility-label" = "Reject follow request";
"account.request" = "Request";
@ -245,9 +245,9 @@
"notifications.unknown" = "Notification from %@";
"remove" = "Remove";
"report" = "Report";
"report.additional-comments" = "Additional comments";
"report.hint" = "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:";
"report.placeholder" = "Additional comments";
"report.target-%@" = "Reporting %@";
"report.target-%@" = "Report %@";
"report.forward.hint" = "The account is from another server. Send an anonymized copy of the report there as well?";
"report.forward-%@" = "Forward report to %@";
"search.scope.all" = "All";
@ -302,7 +302,6 @@
"status.visibility.unlisted.description" = "Visible for all, but not in public timelines";
"status.visibility.private.description" = "Visible for followers only";
"status.visibility.direct.description" = "Visible for mentioned users only";
"submit" = "Submit";
"tag.accessibility-recent-uses-%ld" = "%ld recent uses";
"tag.accessibility-hint.post" = "View posts associated with trend";
"tag.accessibility-hint.toot" = "View toots associated with trend";

22
Views/SwiftUI/MuteView.swift
View file

@ -11,21 +11,23 @@ struct MuteView: View {
var body: some View {
Form {
VStack(alignment: .leading, spacing: .defaultSpacing) {
Text("account.mute.confirm-\(viewModel.accountName)")
Text("account.mute.confirm.explanation")
}
Toggle("account.mute.confirm.hide-notifications", isOn: $viewModel.notifications)
Picker("account.mute.confirm.duration", selection: $viewModel.duration) {
ForEach(MuteViewModel.Duration.allCases) { duration in
Text(verbatim: duration.title).tag(duration)
Section {
VStack(alignment: .leading, spacing: .defaultSpacing) {
Text("account.mute.confirm-\(viewModel.accountName)")
Text("account.mute.confirm.explanation")
}
Toggle("account.mute.confirm.hide-notifications", isOn: $viewModel.notifications)
Picker("account.mute.confirm.duration", selection: $viewModel.duration) {
ForEach(MuteViewModel.Duration.allCases) { duration in
Text(verbatim: duration.title).tag(duration)
}
}
}
Group {
Section {
if viewModel.loading {
ProgressView()
} else {
Button("account.mute") {
Button("account.mute.target-\(viewModel.accountName)") {
viewModel.mute()
}
}

28
Views/SwiftUI/ReportView.swift
View file

@ -19,25 +19,25 @@ struct ReportView: View {
}
Section {
Text("report.hint")
ZStack(alignment: .leading) {
if viewModel.elements.comment.isEmpty {
Text("report.placeholder").foregroundColor(.secondary)
}
TextEditor(text: $viewModel.elements.comment)
}
if !viewModel.isLocalAccount {
}
Section(header: Text("report.additional-comments")) {
TextEditor(text: $viewModel.elements.comment)
.accessibility(label: Text("report.additional-comments"))
}
if !viewModel.isLocalAccount {
Section {
VStack(alignment: .leading) {
Text("report.forward.hint")
Toggle("report.forward-\(viewModel.accountHost)", isOn: $viewModel.elements.forward)
}
}
Group {
if viewModel.loading {
ProgressView()
} else {
Button("submit") {
viewModel.report()
}
}
Section {
if viewModel.loading {
ProgressView()
} else {
Button("report.target-\(viewModel.accountName)") {
viewModel.report()
}
}
}

1
Views/SwiftUI/View Repesentables/ReportStatusView.swift
View file

@ -17,6 +17,7 @@ struct ReportStatusView: UIViewRepresentable {
view.buttonsStackView.isHidden = true
view.translatesAutoresizingMaskIntoConstraints = false
view.isUserInteractionEnabled = false
view.accessibilityLabel = view.accessibilityAttributedLabel?.string
return view
}