Browse Source

API switch to remove accessibility descripttion.

pull/92/head
Abhishek 5 years ago
parent
commit
ba7b1cd187
  1. 2
      Clocker/Onboarding/OnboardingParentViewController.swift
  2. 25
      Clocker/Overall App/Themer.swift
  3. 8
      Clocker/Panel/ParentPanelController.swift
  4. 2
      Clocker/Panel/UI/TimezoneDataSource.swift

2
Clocker/Onboarding/OnboardingParentViewController.swift

@ -71,7 +71,7 @@ class OnboardingParentViewController: NSViewController {
if #available(OSX 10.16, *) { if #available(OSX 10.16, *) {
negativeButton.controlSize = .large negativeButton.controlSize = .large
positiveButton.controlSize = .large positiveButton.controlSize = .large
backButton.image = Themer.shared().symbolImage(for: "chevron.left.circle.fill", accessibilityDescription: "back-button") backButton.image = Themer.shared().symbolImage(for: "chevron.left.circle.fill")
backButton.bezelStyle = .recessed backButton.bezelStyle = .recessed
backButton.isBordered = false backButton.isBordered = false
backButton.font = NSFont.systemFont(ofSize: 24) backButton.font = NSFont.systemFont(ofSize: 24)

25
Clocker/Overall App/Themer.swift

@ -152,7 +152,7 @@ extension Themer {
func shutdownImage() -> NSImage { func shutdownImage() -> NSImage {
if #available(macOS 10.16, *) { if #available(macOS 10.16, *) {
return symbolImage(for: "ellipsis.circle", nil) return symbolImage(for: "ellipsis.circle")
} }
if #available(macOS 10.14, *) { if #available(macOS 10.14, *) {
@ -171,7 +171,7 @@ extension Themer {
func preferenceImage() -> NSImage { func preferenceImage() -> NSImage {
if #available(macOS 10.16, *) { if #available(macOS 10.16, *) {
return symbolImage(for: "gear", nil) return symbolImage(for: "gear")
} }
if #available(macOS 10.14, *) { if #available(macOS 10.14, *) {
@ -187,13 +187,13 @@ extension Themer {
return return
themeIndex == .light themeIndex == .light
? NSImage(named: NSImage.Name("Settings"))! ? NSImage(named: NSImage.Name("Settings"))!
: NSImage(named: NSImage.Name("Settings-White"))! : NSImage(named: NSImage.Name("Settings-White"))!
} }
func pinImage() -> NSImage { func pinImage() -> NSImage {
if #available(macOS 10.16, *) { if #available(macOS 10.16, *) {
return symbolImage(for: "macwindow.on.rectangle", nil) return symbolImage(for: "macwindow.on.rectangle")
} }
if #available(macOS 10.14, *) { if #available(macOS 10.14, *) {
@ -317,7 +317,7 @@ extension Themer {
func sharingImage() -> NSImage { func sharingImage() -> NSImage {
if #available(macOS 10.16, *) { if #available(macOS 10.16, *) {
return symbolImage(for: "square.and.arrow.up.on.square.fill", nil) return symbolImage(for: "square.and.arrow.up.on.square.fill")
} }
if #available(macOS 10.14, *) { if #available(macOS 10.14, *) {
@ -445,9 +445,14 @@ extension Themer {
NSColor(deviceRed: 42.0 / 255.0, green: 55.0 / 255.0, blue: 62.0 / 255.0, alpha: 1.0) NSColor(deviceRed: 42.0 / 255.0, green: 55.0 / 255.0, blue: 62.0 / 255.0, alpha: 1.0)
} }
func symbolImage(for _: String, _: String?) -> NSImage { func symbolImage(for name: String) -> NSImage {
// Dummy image for older xcodes assert(name.count > 0)
return NSImage(named: NSImage.Name("Calendar Tab Icon"))!
// return NSImage(systemSymbolName: name, accessibilityDescription: accessibilityDescription)! if #available(OSX 10.16, *) {
return NSImage(systemSymbolName: name, accessibilityDescription: name)!
} else {
// Dummy image for older xcodes
return NSImage(named: NSImage.Name("Calendar Tab Icon"))!
}
} }
} }

8
Clocker/Panel/ParentPanelController.swift

@ -167,9 +167,11 @@ class ParentPanelController: NSWindowController {
showDebugVersionViewIfNeccesary() showDebugVersionViewIfNeccesary()
if #available(macOS 10.16, *) { #if DEBUG
// mainTableView.style = .fullWidth if #available(macOS 10.16, *) {
} mainTableView.style = .fullWidth
}
#endif
} }
private func showDebugVersionViewIfNeccesary() { private func showDebugVersionViewIfNeccesary() {

2
Clocker/Panel/UI/TimezoneDataSource.swift

@ -136,7 +136,7 @@ extension TimezoneDataSource: NSTableViewDataSource, NSTableViewDelegate {
}) })
if #available(OSX 10.16, *) { if #available(OSX 10.16, *) {
swipeToDelete.image = Themer.shared().symbolImage(for: "trash.fill", "Trash Button") swipeToDelete.image = Themer.shared().symbolImage(for: "trash.fill")
} else { } else {
swipeToDelete.image = NSImage(named: NSImage.Name("Trash")) swipeToDelete.image = NSImage(named: NSImage.Name("Trash"))

Loading…
Cancel
Save