Skip to content

Commit

Permalink
Merge pull request #4821 from wikimedia/image-recs-voiceover
Browse files Browse the repository at this point in the history
Image Recommendations - Hide feature when VoiceOver is on
  • Loading branch information
tonisevener committed Apr 25, 2024
2 parents 23bbf28 + 341e8b5 commit d172db3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Wikipedia/Code/ExploreFeedSettingsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ class ExploreFeedSettingsViewController: BaseExploreFeedSettingsViewController {
let continueReading = FeedCard(contentGroupKind: .continueReading, displayType: displayType)
let relatedPages = FeedCard(contentGroupKind: .relatedPages, displayType: displayType)
let suggestedEdits = FeedCard(contentGroupKind: .suggestedEdits, displayType: displayType)
if FeatureFlags.needsImageRecommendations {
if FeatureFlags.needsImageRecommendations && !UIAccessibility.isVoiceOverRunning {
return [inTheNews, onThisDay, featuredArticle, topRead, places, randomizer, pictureOfTheDay, continueReading, relatedPages, suggestedEdits]
} else {
return [inTheNews, onThisDay, featuredArticle, topRead, places, randomizer, pictureOfTheDay, continueReading, relatedPages]
Expand Down
5 changes: 3 additions & 2 deletions Wikipedia/Code/ExploreViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo
#if UITEST
presentUITestHelperController()
#endif

presentImageRecommendationsFeatureAnnouncementIfNeeded()
if !UIAccessibility.isVoiceOverRunning {
presentImageRecommendationsFeatureAnnouncementIfNeeded()
}
}

override func viewWillHaveFirstAppearance(_ animated: Bool) {
Expand Down
2 changes: 1 addition & 1 deletion Wikipedia/Code/WMFSuggestedEditsContentSource.m
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ - (void)loadNewContentInManagedObjectContext:(nonnull NSManagedObjectContext *)m

[group waitInBackgroundWithCompletion:^{
if (currentUser) {
if ((currentUser.editCount > 50 && !currentUser.isBlocked && hasImageRecommendations) || WMFFeatureFlags.forceImageRecommendationsExploreCard) {
if ((currentUser.editCount > 50 && !currentUser.isBlocked && hasImageRecommendations && !UIAccessibilityIsVoiceOverRunning()) || WMFFeatureFlags.forceImageRecommendationsExploreCard) {

NSURL *URL = [WMFContentGroup suggestedEditsURL];

Expand Down

0 comments on commit d172db3

Please sign in to comment.