tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix profile action sheet on ipad

Browse Source 
Changelog-Fixed: Fix hidden profile action sheet when clicking ...
This commit is contained in:
William Casarin
2023-01-30 16:39:52 -08:00
parent 889c584487
commit dfb681cc02
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
damus/Views/ConfigView.swift
View File

@@ -130,9 +130,9 @@ struct ConfigView: View {
if state.is_privkey_user { if state.is_privkey_user {
Section(NSLocalizedString("Delete", comment: "Section title for deleting the user")) { Section(NSLocalizedString("Delete", comment: "Section title for deleting the user")) {
Button(NSLocalizedString("Delete Account", comment: "Button to delete the user's account."), role: .destructive) { Button(NSLocalizedString("Delete Account", comment: "Button to delete the user's account."), role: .destructive) {
confirm_delete_account = true confirm_delete_account = true
} }
} }
} }
} }

35
damus/Views/ProfileView.swift
View File

@@ -175,6 +175,24 @@ struct ProfileView: View {
Image(systemName: "ellipsis.circle") Image(systemName: "ellipsis.circle")
.profile_button_style(scheme: colorScheme) .profile_button_style(scheme: colorScheme)
} }
.confirmationDialog(NSLocalizedString("Actions", comment: "Title for confirmation dialog to either share, report, or block a profile."), isPresented: $action_sheet_presented) {
Button(NSLocalizedString("Share", comment: "Button to share the link to a profile.")) {
show_share_sheet = true
}
// Only allow reporting if logged in with private key and the currently viewed profile is not the logged in profile.
if profile.pubkey != damus_state.pubkey && damus_state.is_privkey_user {
Button(NSLocalizedString("Report", comment: "Button to report a profile."), role: .destructive) {
let target: ReportTarget = .user(profile.pubkey)
notify(.report, target)
}
Button(NSLocalizedString("Block", comment: "Button to block a profile."), role: .destructive) {
notify(.block, profile.pubkey)
}
}
}
} }
var ShareButton: some View { var ShareButton: some View {
@@ -375,23 +393,6 @@ struct ProfileView: View {
} }
} }
} }
.confirmationDialog(NSLocalizedString("Actions", comment: "Title for confirmation dialog to either share, report, or block a profile."), isPresented: $action_sheet_presented) {
Button(NSLocalizedString("Share", comment: "Button to share the link to a profile.")) {
show_share_sheet = true
}
// Only allow reporting if logged in with private key and the currently viewed profile is not the logged in profile.
if profile.pubkey != damus_state.pubkey && damus_state.is_privkey_user {
Button(NSLocalizedString("Report", comment: "Button to report a profile."), role: .destructive) {
let target: ReportTarget = .user(profile.pubkey)
notify(.report, target)
}
Button(NSLocalizedString("Block", comment: "Button to block a profile."), role: .destructive) {
notify(.block, profile.pubkey)
}
}
}
.ignoresSafeArea() .ignoresSafeArea()
} }
} }