From d50c4ffa37ac510e81e4a5daa5aa86567190fb26 Mon Sep 17 00:00:00 2001 From: Wayne Nihart Date: Sun, 10 Mar 2019 22:55:19 -0600 Subject: [PATCH 1/4] =?UTF-8?q?Fix=20for=20"Accessibility=20=E2=80=9Cbulle?= =?UTF-8?q?ts=20hollow=E2=80=9D=20should=20be=20=E2=80=9Cmore=20options?= =?UTF-8?q?=E2=80=9D=20#2673?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed all occurrences of "bullets-hollow" to "chevron-down" to be consistent with the "More Options" button image used in MergeButton.swift --- Classes/Repository/RepositoryCodeBlobViewController.swift | 2 +- Classes/Repository/RepositoryCodeDirectoryViewController.swift | 2 +- Classes/Repository/RepositoryImageViewController.swift | 2 +- Classes/Repository/RepositoryViewController.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Classes/Repository/RepositoryCodeBlobViewController.swift b/Classes/Repository/RepositoryCodeBlobViewController.swift index d8716599e..7203489ab 100644 --- a/Classes/Repository/RepositoryCodeBlobViewController.swift +++ b/Classes/Repository/RepositoryCodeBlobViewController.swift @@ -26,7 +26,7 @@ final class RepositoryCodeBlobViewController: UIViewController, EmptyViewDelegat private lazy var moreOptionsItem: UIBarButtonItem = { let barButtonItem = UIBarButtonItem( - image: UIImage(named: "bullets-hollow"), + image: UIImage(named: "chevron-down"), target: self, action: #selector(RepositoryCodeBlobViewController.onShare(sender:)) ) diff --git a/Classes/Repository/RepositoryCodeDirectoryViewController.swift b/Classes/Repository/RepositoryCodeDirectoryViewController.swift index 74081f6ab..5dbd966dd 100644 --- a/Classes/Repository/RepositoryCodeDirectoryViewController.swift +++ b/Classes/Repository/RepositoryCodeDirectoryViewController.swift @@ -32,7 +32,7 @@ IndicatorInfoProvider { } private lazy var moreOptionsItem: UIBarButtonItem = { let barButtonItem = UIBarButtonItem( - image: UIImage(named: "bullets-hollow"), + image: UIImage(named: "chevron-down"), target: self, action: #selector(RepositoryCodeDirectoryViewController.onShare(sender:))) barButtonItem.isEnabled = false diff --git a/Classes/Repository/RepositoryImageViewController.swift b/Classes/Repository/RepositoryImageViewController.swift index e78c54375..583c11adc 100644 --- a/Classes/Repository/RepositoryImageViewController.swift +++ b/Classes/Repository/RepositoryImageViewController.swift @@ -35,7 +35,7 @@ UIScrollViewDelegate { private lazy var moreOptionsItem: UIBarButtonItem = { let barButtonItem = UIBarButtonItem( - image: UIImage(named: "bullets-hollow"), + image: UIImage(named: "chevron-down"), target: self, action: #selector(RepositoryImageViewController.onShare(sender:))) barButtonItem.isEnabled = false diff --git a/Classes/Repository/RepositoryViewController.swift b/Classes/Repository/RepositoryViewController.swift index 474badc4e..77474a2b9 100644 --- a/Classes/Repository/RepositoryViewController.swift +++ b/Classes/Repository/RepositoryViewController.swift @@ -104,7 +104,7 @@ EmptyViewDelegate { private func updateRightBarItems() { let moreItem = UIBarButtonItem( - image: UIImage(named: "bullets-hollow"), + image: UIImage(named: "chevron-down"), target: self, action: #selector(RepositoryViewController.onMore(sender:)) ) From bf7ae6e54af52c17daa04691236d521a5aa2659f Mon Sep 17 00:00:00 2001 From: Wayne Nihart Date: Sun, 10 Mar 2019 22:55:19 -0600 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"Fix=20for=20"Accessibility=20?= =?UTF-8?q?=E2=80=9Cbullets=20hollow=E2=80=9D=20should=20be=20=E2=80=9Cmor?= =?UTF-8?q?e=20options=E2=80=9D=20#2673"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d50c4ffa37ac510e81e4a5daa5aa86567190fb26. --- Classes/Repository/RepositoryCodeBlobViewController.swift | 2 +- Classes/Repository/RepositoryCodeDirectoryViewController.swift | 2 +- Classes/Repository/RepositoryImageViewController.swift | 2 +- Classes/Repository/RepositoryViewController.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Classes/Repository/RepositoryCodeBlobViewController.swift b/Classes/Repository/RepositoryCodeBlobViewController.swift index 7203489ab..d8716599e 100644 --- a/Classes/Repository/RepositoryCodeBlobViewController.swift +++ b/Classes/Repository/RepositoryCodeBlobViewController.swift @@ -26,7 +26,7 @@ final class RepositoryCodeBlobViewController: UIViewController, EmptyViewDelegat private lazy var moreOptionsItem: UIBarButtonItem = { let barButtonItem = UIBarButtonItem( - image: UIImage(named: "chevron-down"), + image: UIImage(named: "bullets-hollow"), target: self, action: #selector(RepositoryCodeBlobViewController.onShare(sender:)) ) diff --git a/Classes/Repository/RepositoryCodeDirectoryViewController.swift b/Classes/Repository/RepositoryCodeDirectoryViewController.swift index 5dbd966dd..74081f6ab 100644 --- a/Classes/Repository/RepositoryCodeDirectoryViewController.swift +++ b/Classes/Repository/RepositoryCodeDirectoryViewController.swift @@ -32,7 +32,7 @@ IndicatorInfoProvider { } private lazy var moreOptionsItem: UIBarButtonItem = { let barButtonItem = UIBarButtonItem( - image: UIImage(named: "chevron-down"), + image: UIImage(named: "bullets-hollow"), target: self, action: #selector(RepositoryCodeDirectoryViewController.onShare(sender:))) barButtonItem.isEnabled = false diff --git a/Classes/Repository/RepositoryImageViewController.swift b/Classes/Repository/RepositoryImageViewController.swift index 583c11adc..e78c54375 100644 --- a/Classes/Repository/RepositoryImageViewController.swift +++ b/Classes/Repository/RepositoryImageViewController.swift @@ -35,7 +35,7 @@ UIScrollViewDelegate { private lazy var moreOptionsItem: UIBarButtonItem = { let barButtonItem = UIBarButtonItem( - image: UIImage(named: "chevron-down"), + image: UIImage(named: "bullets-hollow"), target: self, action: #selector(RepositoryImageViewController.onShare(sender:))) barButtonItem.isEnabled = false diff --git a/Classes/Repository/RepositoryViewController.swift b/Classes/Repository/RepositoryViewController.swift index 77474a2b9..474badc4e 100644 --- a/Classes/Repository/RepositoryViewController.swift +++ b/Classes/Repository/RepositoryViewController.swift @@ -104,7 +104,7 @@ EmptyViewDelegate { private func updateRightBarItems() { let moreItem = UIBarButtonItem( - image: UIImage(named: "chevron-down"), + image: UIImage(named: "bullets-hollow"), target: self, action: #selector(RepositoryViewController.onMore(sender:)) ) From a000de8606bc74d3010ff5032e46c6f7f5158147 Mon Sep 17 00:00:00 2001 From: Wayne Nihart Date: Tue, 12 Mar 2019 15:50:09 -0600 Subject: [PATCH 3/4] =?UTF-8?q?Fix=20for=20"Accessibility=20=E2=80=9Cbulle?= =?UTF-8?q?ts=20hollow=E2=80=9D=20should=20be=20=E2=80=9Cmore=20options?= =?UTF-8?q?=E2=80=9D=20#2673?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added accessibilityLabel and set to moreOptions. --- Classes/Repository/RepositoryCodeBlobViewController.swift | 1 + Classes/Repository/RepositoryCodeDirectoryViewController.swift | 1 + Classes/Repository/RepositoryImageViewController.swift | 1 + 3 files changed, 3 insertions(+) diff --git a/Classes/Repository/RepositoryCodeBlobViewController.swift b/Classes/Repository/RepositoryCodeBlobViewController.swift index d8716599e..0c5b74e9a 100644 --- a/Classes/Repository/RepositoryCodeBlobViewController.swift +++ b/Classes/Repository/RepositoryCodeBlobViewController.swift @@ -30,6 +30,7 @@ final class RepositoryCodeBlobViewController: UIViewController, EmptyViewDelegat target: self, action: #selector(RepositoryCodeBlobViewController.onShare(sender:)) ) + barButtonItem.accessibilityLabel = Constants.Strings.moreOptions return barButtonItem }() diff --git a/Classes/Repository/RepositoryCodeDirectoryViewController.swift b/Classes/Repository/RepositoryCodeDirectoryViewController.swift index 74081f6ab..ad9e840d5 100644 --- a/Classes/Repository/RepositoryCodeDirectoryViewController.swift +++ b/Classes/Repository/RepositoryCodeDirectoryViewController.swift @@ -35,6 +35,7 @@ IndicatorInfoProvider { image: UIImage(named: "bullets-hollow"), target: self, action: #selector(RepositoryCodeDirectoryViewController.onShare(sender:))) + barButtonItem.accessibilityLabel = Constants.Strings.moreOptions barButtonItem.isEnabled = false return barButtonItem }() diff --git a/Classes/Repository/RepositoryImageViewController.swift b/Classes/Repository/RepositoryImageViewController.swift index e78c54375..6b67aa1b7 100644 --- a/Classes/Repository/RepositoryImageViewController.swift +++ b/Classes/Repository/RepositoryImageViewController.swift @@ -38,6 +38,7 @@ UIScrollViewDelegate { image: UIImage(named: "bullets-hollow"), target: self, action: #selector(RepositoryImageViewController.onShare(sender:))) + barButtonItem.accessibilityLabel = Constants.Strings.moreOptions barButtonItem.isEnabled = false return barButtonItem }() From ac1fdb7a50e61e9c209b9d9e17759345081e5190 Mon Sep 17 00:00:00 2001 From: Bas Broek Date: Thu, 14 Mar 2019 19:18:27 +0100 Subject: [PATCH 4/4] Fix double spaces --- Classes/Repository/RepositoryCodeBlobViewController.swift | 2 +- Classes/Repository/RepositoryCodeDirectoryViewController.swift | 2 +- Classes/Repository/RepositoryImageViewController.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Classes/Repository/RepositoryCodeBlobViewController.swift b/Classes/Repository/RepositoryCodeBlobViewController.swift index 0c5b74e9a..651184981 100644 --- a/Classes/Repository/RepositoryCodeBlobViewController.swift +++ b/Classes/Repository/RepositoryCodeBlobViewController.swift @@ -30,7 +30,7 @@ final class RepositoryCodeBlobViewController: UIViewController, EmptyViewDelegat target: self, action: #selector(RepositoryCodeBlobViewController.onShare(sender:)) ) - barButtonItem.accessibilityLabel = Constants.Strings.moreOptions + barButtonItem.accessibilityLabel = Constants.Strings.moreOptions return barButtonItem }() diff --git a/Classes/Repository/RepositoryCodeDirectoryViewController.swift b/Classes/Repository/RepositoryCodeDirectoryViewController.swift index ad9e840d5..193c0f0fd 100644 --- a/Classes/Repository/RepositoryCodeDirectoryViewController.swift +++ b/Classes/Repository/RepositoryCodeDirectoryViewController.swift @@ -35,7 +35,7 @@ IndicatorInfoProvider { image: UIImage(named: "bullets-hollow"), target: self, action: #selector(RepositoryCodeDirectoryViewController.onShare(sender:))) - barButtonItem.accessibilityLabel = Constants.Strings.moreOptions + barButtonItem.accessibilityLabel = Constants.Strings.moreOptions barButtonItem.isEnabled = false return barButtonItem }() diff --git a/Classes/Repository/RepositoryImageViewController.swift b/Classes/Repository/RepositoryImageViewController.swift index 6b67aa1b7..1a34e2afe 100644 --- a/Classes/Repository/RepositoryImageViewController.swift +++ b/Classes/Repository/RepositoryImageViewController.swift @@ -38,7 +38,7 @@ UIScrollViewDelegate { image: UIImage(named: "bullets-hollow"), target: self, action: #selector(RepositoryImageViewController.onShare(sender:))) - barButtonItem.accessibilityLabel = Constants.Strings.moreOptions + barButtonItem.accessibilityLabel = Constants.Strings.moreOptions barButtonItem.isEnabled = false return barButtonItem }()