mirror of
https://github.com/Dimillian/IceCubesApp.git
synced 2024-09-28 22:41:55 +00:00
Better sharing for status and account close #837
This commit is contained in:
parent
df98e0f987
commit
1f14311c2c
3 changed files with 11 additions and 5 deletions
|
@ -498,7 +498,7 @@ public struct AccountDetailView: View {
|
||||||
}
|
}
|
||||||
|
|
||||||
if let url = account.url {
|
if let url = account.url {
|
||||||
ShareLink(item: url) {
|
ShareLink(item: url, subject: Text(account.safeDisplayName)) {
|
||||||
Label("account.action.share", systemImage: "square.and.arrow.up")
|
Label("account.action.share", systemImage: "square.and.arrow.up")
|
||||||
}
|
}
|
||||||
Button { UIApplication.shared.open(url) } label: {
|
Button { UIApplication.shared.open(url) } label: {
|
||||||
|
|
|
@ -63,8 +63,11 @@ struct StatusActionsView: View {
|
||||||
HStack {
|
HStack {
|
||||||
ForEach(Actions.allCases, id: \.self) { action in
|
ForEach(Actions.allCases, id: \.self) { action in
|
||||||
if action == .share {
|
if action == .share {
|
||||||
if let url = viewModel.status.reblog?.url ?? viewModel.status.url {
|
if let urlString = viewModel.status.reblog?.url ?? viewModel.status.url,
|
||||||
ShareLink(item: url) {
|
let url = URL(string: urlString) {
|
||||||
|
ShareLink(item: url,
|
||||||
|
subject: Text(viewModel.status.reblog?.account.safeDisplayName ?? viewModel.status.account.safeDisplayName),
|
||||||
|
message: Text(viewModel.status.reblog?.content.asRawText ?? viewModel.status.content.asRawText)) {
|
||||||
Image(systemName: action.iconName(viewModel: viewModel))
|
Image(systemName: action.iconName(viewModel: viewModel))
|
||||||
}
|
}
|
||||||
.buttonStyle(.borderless)
|
.buttonStyle(.borderless)
|
||||||
|
|
|
@ -57,8 +57,11 @@ struct StatusRowContextMenu: View {
|
||||||
|
|
||||||
Divider()
|
Divider()
|
||||||
|
|
||||||
if let url = viewModel.status.reblog?.url ?? viewModel.status.url {
|
if let urlString = viewModel.status.reblog?.url ?? viewModel.status.url,
|
||||||
ShareLink(item: url) {
|
let url = URL(string: urlString) {
|
||||||
|
ShareLink(item: url,
|
||||||
|
subject: Text(viewModel.status.reblog?.account.safeDisplayName ?? viewModel.status.account.safeDisplayName),
|
||||||
|
message: Text(viewModel.status.reblog?.content.asRawText ?? viewModel.status.content.asRawText)) {
|
||||||
Label("status.action.share", systemImage: "square.and.arrow.up")
|
Label("status.action.share", systemImage: "square.and.arrow.up")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue