diff --git a/Shared/Assets.xcassets/does.not.exist.imageset/Contents.json b/Shared/Assets.xcassets/does.not.exist.imageset/Contents.json new file mode 100644 index 0000000..f89ec02 --- /dev/null +++ b/Shared/Assets.xcassets/does.not.exist.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "does.not.exist.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "does.not.exist@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "does.not.exist@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist.png b/Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist.png new file mode 100644 index 0000000..6238655 Binary files /dev/null and b/Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist.png differ diff --git a/Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@2x.png b/Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@2x.png new file mode 100644 index 0000000..170275e Binary files /dev/null and b/Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@2x.png differ diff --git a/Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@3x.png b/Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@3x.png new file mode 100644 index 0000000..364bf5d Binary files /dev/null and b/Shared/Assets.xcassets/does.not.exist.imageset/does.not.exist@3x.png differ diff --git a/Shared/PostEditor/PostEditorStatusToolbarView.swift b/Shared/PostEditor/PostEditorStatusToolbarView.swift index 7d8cac4..cc02858 100644 --- a/Shared/PostEditor/PostEditorStatusToolbarView.swift +++ b/Shared/PostEditor/PostEditorStatusToolbarView.swift @@ -20,6 +20,8 @@ struct PostEditorStatusToolbarView: View { }, label: { Image(systemName: "square.and.arrow.down") }) + .accessibilityLabel(Text("Update post")) + .accessibilityHint(Text("Replace this post with the server version")) } .padding(.horizontal) .background(Color.primary.opacity(0.1)) @@ -45,6 +47,8 @@ struct PostEditorStatusToolbarView: View { }, label: { Image(systemName: "trash") }) + .accessibilityLabel(Text("Delete")) + .accessibilityHint(Text("Delete this post from your Mac")) } .padding(.horizontal) .background(Color.primary.opacity(0.1)) diff --git a/Shared/PostList/PostListView.swift b/Shared/PostList/PostListView.swift index e20651a..6f7d4fa 100644 --- a/Shared/PostList/PostListView.swift +++ b/Shared/PostList/PostListView.swift @@ -20,33 +20,50 @@ struct PostListView: View { ) .toolbar { ToolbarItem(placement: .primaryAction) { - Button(action: { - let managedPost = WFAPost(context: self.managedObjectContext) - managedPost.createdDate = Date() - managedPost.title = "" - managedPost.body = "" - managedPost.status = PostStatus.local.rawValue - managedPost.collectionAlias = nil - switch model.preferences.font { - case 1: - managedPost.appearance = "sans" - case 2: - managedPost.appearance = "wrap" - default: - managedPost.appearance = "serif" - } - if let languageCode = Locale.current.languageCode { - managedPost.language = languageCode - managedPost.rtl = Locale.characterDirection(forLanguage: languageCode) == .rightToLeft - } - withAnimation { - self.selectedCollection = nil - self.showAllPosts = false - self.model.selectedPost = managedPost - } - }, label: { - Image(systemName: "square.and.pencil") - }) + // 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() + managedPost.title = "" + managedPost.body = "" + managedPost.status = PostStatus.local.rawValue + managedPost.collectionAlias = nil + switch model.preferences.font { + case 1: + managedPost.appearance = "sans" + case 2: + managedPost.appearance = "wrap" + default: + managedPost.appearance = "serif" + } + if let languageCode = Locale.current.languageCode { + managedPost.language = languageCode + managedPost.rtl = Locale.characterDirection(forLanguage: languageCode) == .rightToLeft + } + withAnimation { + self.selectedCollection = nil + self.showAllPosts = false + self.model.selectedPost = managedPost + } + }, label: { + ZStack { + Image("does.not.exist") + .accessibilityHidden(true) + Image(systemName: "square.and.pencil") + .accessibilityHidden(true) + .imageScale(.large) // 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). + } + .frame(maxWidth: .infinity, maxHeight: .infinity) + }) + .accessibilityLabel(Text("Compose")) + .accessibilityHint(Text("Compose a new local draft")) + } } ToolbarItem(placement: .bottomBar) { HStack { @@ -54,7 +71,13 @@ struct PostListView: View { model.isPresentingSettingsView = true }, label: { Image(systemName: "gear") + .imageScale(.large) + .padding(.vertical, 12) + .padding(.leading, 8) + .padding(.trailing, 12) }) + .accessibilityLabel(Text("Settings")) + .accessibilityHint(Text("Open the Settings sheet")) Spacer() Text(postCount == 1 ? "\(postCount) post" : "\(postCount) posts") .foregroundColor(.secondary) @@ -69,7 +92,13 @@ struct PostListView: View { } }, label: { Image(systemName: "arrow.clockwise") + .imageScale(.large) + .padding(.vertical, 12) + .padding(.leading, 12) + .padding(.trailing, 8) }) + .accessibilityLabel(Text("Refresh Posts")) + .accessibilityHint(Text("Fetch changes from the server")) .disabled(!model.account.isLoggedIn) } } diff --git a/iOS/PostEditor/PostEditorView.swift b/iOS/PostEditor/PostEditorView.swift index e5dfbd7..d866cc7 100644 --- a/iOS/PostEditor/PostEditorView.swift +++ b/iOS/PostEditor/PostEditorView.swift @@ -80,6 +80,8 @@ struct PostEditorView: View { }, label: { Label("Publish…", systemImage: "paperplane") }) + .accessibilityHint(Text("Choose the blog you want to publish this post to")) + .disabled(post.body.count == 0) } else { Button(action: { if model.account.isLoggedIn { @@ -97,6 +99,7 @@ struct PostEditorView: View { }, label: { Label("Share", systemImage: "square.and.arrow.up") }) + .accessibilityHint(Text("Open the system share sheet to share a link to this post")) .disabled(post.postId == nil) // Button(action: { // print("Tapped 'Delete...' button") @@ -117,8 +120,20 @@ struct PostEditorView: View { } } }, label: { - Image(systemName: "ellipsis.circle") + ZStack { + Image("does.not.exist") + .accessibilityHidden(true) + Image(systemName: "ellipsis.circle") + .imageScale(.large) + .accessibilityHidden(true) + } }) + .accessibilityLabel(Text("Menu")) + .accessibilityHint(Text("Opens a context menu to publish, share, or move the post")) + .onTapGesture { + hideKeyboard() + } + .disabled(post.body.count == 0) } } } diff --git a/iOS/PostEditor/PostTextEditingView.swift b/iOS/PostEditor/PostTextEditingView.swift index a58fbae..51f5ed2 100644 --- a/iOS/PostEditor/PostTextEditingView.swift +++ b/iOS/PostEditor/PostTextEditingView.swift @@ -41,6 +41,7 @@ struct PostTextEditingView: View { .foregroundColor(Color(UIColor.placeholderText)) .padding(.horizontal, 4) .padding(.vertical, 8) + .accessibilityHidden(true) } PostTitleTextView( text: $post.title, @@ -49,6 +50,8 @@ struct PostTextEditingView: View { isFirstResponder: $titleIsFirstResponder, lineSpacing: horizontalSizeClass == .compact ? lineSpacingMultiplier / 2 : lineSpacingMultiplier ) + .accessibilityLabel(Text("Title (optional)")) + .accessibilityHint(Text("Add or edit the title for your post; use the Return key to skip to the body")) .frame(height: titleFieldHeight) .onChange(of: post.title) { _ in if post.status == PostStatus.published.rawValue && !updatingTitleFromServer { @@ -66,6 +69,7 @@ struct PostTextEditingView: View { .foregroundColor(Color(UIColor.placeholderText)) .padding(.horizontal, 4) .padding(.vertical, 8) + .accessibilityHidden(true) } PostBodyTextView( text: $post.body, @@ -73,6 +77,8 @@ struct PostTextEditingView: View { isFirstResponder: $bodyIsFirstResponder, lineSpacing: horizontalSizeClass == .compact ? lineSpacingMultiplier / 2 : lineSpacingMultiplier ) + .accessibilityLabel(Text("Body")) + .accessibilityHint(Text("Add or edit the body of your post")) .onChange(of: post.body) { _ in if post.status == PostStatus.published.rawValue && !updatingBodyFromServer { post.status = PostStatus.edited.rawValue diff --git a/iOS/PostEditor/RemoteChangePromptView.swift b/iOS/PostEditor/RemoteChangePromptView.swift index 0807155..184d6b3 100644 --- a/iOS/PostEditor/RemoteChangePromptView.swift +++ b/iOS/PostEditor/RemoteChangePromptView.swift @@ -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" } }) } diff --git a/iOS/Settings/SettingsHeaderView.swift b/iOS/Settings/SettingsHeaderView.swift index ca65578..090040b 100644 --- a/iOS/Settings/SettingsHeaderView.swift +++ b/iOS/Settings/SettingsHeaderView.swift @@ -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)