mirror of
https://github.com/writeas/writefreely-swiftui-multiplatform.git
synced 2024-11-15 01:11:02 +00:00
Add a11y labels/hints to post list and settings
This commit is contained in:
parent
1d1d4927b3
commit
03a568cfdc
@ -20,6 +20,10 @@ struct PostListView: View {
|
||||
)
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .primaryAction) {
|
||||
// We have to add a Spacer as a sibling view to the Button in some kind of Stack, so that any a11y
|
||||
// modifiers are applied as expected: bug report filed as FB8956392.
|
||||
ZStack {
|
||||
Spacer()
|
||||
Button(action: {
|
||||
let managedPost = WFAPost(context: self.managedObjectContext)
|
||||
managedPost.createdDate = Date()
|
||||
@ -46,7 +50,14 @@ struct PostListView: View {
|
||||
}
|
||||
}, label: {
|
||||
Image(systemName: "square.and.pencil")
|
||||
.scaleEffect(1.25) // These modifiers compensate for the resizing
|
||||
.padding(.vertical, 12) // done to the Image (and the button tap target)
|
||||
.padding(.leading, 12) // by the SwiftUI layout system from adding a
|
||||
.padding(.trailing, 8) // Spacer in this ZStack (FB8956392).
|
||||
})
|
||||
.accessibilityLabel(Text("Compose"))
|
||||
.accessibilityHint(Text("Compose a new local draft"))
|
||||
}
|
||||
}
|
||||
ToolbarItem(placement: .bottomBar) {
|
||||
HStack {
|
||||
@ -55,6 +66,8 @@ struct PostListView: View {
|
||||
}, label: {
|
||||
Image(systemName: "gear")
|
||||
})
|
||||
.accessibilityLabel(Text("Settings"))
|
||||
.accessibilityHint(Text("Open the Settings sheet"))
|
||||
Spacer()
|
||||
Text(postCount == 1 ? "\(postCount) post" : "\(postCount) posts")
|
||||
.foregroundColor(.secondary)
|
||||
@ -70,6 +83,8 @@ struct PostListView: View {
|
||||
}, label: {
|
||||
Image(systemName: "arrow.clockwise")
|
||||
})
|
||||
.accessibilityLabel(Text("Refresh Posts"))
|
||||
.accessibilityHint(Text("Fetch changes from the server"))
|
||||
.disabled(!model.account.isLoggedIn)
|
||||
}
|
||||
}
|
||||
|
@ -7,12 +7,12 @@
|
||||
<key>WriteFreely-MultiPlatform (iOS).xcscheme_^#shared#^_</key>
|
||||
<dict>
|
||||
<key>orderHint</key>
|
||||
<integer>0</integer>
|
||||
<integer>1</integer>
|
||||
</dict>
|
||||
<key>WriteFreely-MultiPlatform (macOS).xcscheme_^#shared#^_</key>
|
||||
<dict>
|
||||
<key>orderHint</key>
|
||||
<integer>1</integer>
|
||||
<integer>0</integer>
|
||||
</dict>
|
||||
</dict>
|
||||
</dict>
|
||||
|
@ -9,6 +9,8 @@ struct RemoteChangePromptView: View {
|
||||
@Environment(\.horizontalSizeClass) var horizontalSizeClass
|
||||
@State private var promptText: String = "This is placeholder prompt text. Replace it?"
|
||||
@State private var promptIcon: Image = Image(systemName: "questionmark.square.dashed")
|
||||
@State private var accessibilityLabel: String = "Replace"
|
||||
@State private var accessibilityHint: String = "Replace this text with an accessibility hint"
|
||||
@State var remoteChangeType: RemotePostChangeType
|
||||
@State var buttonHandler: () -> Void
|
||||
|
||||
@ -18,6 +20,8 @@ struct RemoteChangePromptView: View {
|
||||
.font(horizontalSizeClass == .compact ? .caption : .body)
|
||||
.foregroundColor(.secondary)
|
||||
Button(action: buttonHandler, label: { promptIcon })
|
||||
.accessibilityLabel(Text(accessibilityLabel))
|
||||
.accessibilityHint(Text(accessibilityHint))
|
||||
}
|
||||
.padding(EdgeInsets(top: 10, leading: 20, bottom: 10, trailing: 20))
|
||||
.background(Color(UIColor.secondarySystemBackground))
|
||||
@ -28,9 +32,13 @@ struct RemoteChangePromptView: View {
|
||||
case .remoteCopyUpdated:
|
||||
promptText = "Newer copy on server. Replace local copy?"
|
||||
promptIcon = Image(systemName: "square.and.arrow.down")
|
||||
accessibilityLabel = "Update post"
|
||||
accessibilityHint = "Replace this post with the server version"
|
||||
case .remoteCopyDeleted:
|
||||
promptText = "Post deleted from server. Delete local copy?"
|
||||
promptIcon = Image(systemName: "trash")
|
||||
accessibilityLabel = "Delete"
|
||||
accessibilityHint = "Delete this post from your device"
|
||||
}
|
||||
})
|
||||
}
|
||||
|
@ -15,6 +15,8 @@ struct SettingsHeaderView: View {
|
||||
}, label: {
|
||||
Image(systemName: "xmark.circle")
|
||||
})
|
||||
.accessibilityLabel(Text("Close"))
|
||||
.accessibilityHint(Text("Dismiss the Settings sheet"))
|
||||
}
|
||||
Text("WriteFreely v\(Bundle.main.appMarketingVersion) (build \(Bundle.main.appBuildVersion))")
|
||||
.font(.caption)
|
||||
|
Loading…
Reference in New Issue
Block a user