Switch from titled "Dismiss" button do system done (#158)

bryanjclark · Mar 10, 2022 · 3dec92a · 3dec92a
1 parent 7c06030
commit 3dec92a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/SwiftTweaks/StringOptionViewController.swift b/SwiftTweaks/StringOptionViewController.swift
@@ -51,7 +51,7 @@ internal class StringOptionViewController: UITableViewController {
 		title = tweak.tweakName
 		toolbarItems = [
 			UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),
-			UIBarButtonItem(title: TweaksViewController.dismissButtonTitle, style: .done, target: self, action: #selector(self.dismissButtonTapped))
+			UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.dismissButtonTapped))
 		]
 
 		self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Reset", style: .plain, target: self, action: #selector(StringOptionViewController.restoreDefaultValue))

diff --git a/SwiftTweaks/TweakCollectionViewController.swift b/SwiftTweaks/TweakCollectionViewController.swift
@@ -39,7 +39,7 @@ internal final class TweakCollectionViewController: UIViewController {
 
 		toolbarItems = [
 			UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),
-			UIBarButtonItem(title: TweaksViewController.dismissButtonTitle, style: .done, target: self, action: #selector(self.dismissButtonTapped))
+			UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.dismissButtonTapped))
 		]
 	}
 

diff --git a/SwiftTweaks/TweakColorEditViewController.swift b/SwiftTweaks/TweakColorEditViewController.swift
@@ -77,7 +77,7 @@ internal final class TweakColorEditViewController: UIViewController {
 		title = tweak.tweakName
 		toolbarItems = [
 			UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),
-			UIBarButtonItem(title: TweaksViewController.dismissButtonTitle, style: .done, target: self, action: #selector(self.dismissButtonTapped))
+			UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.dismissButtonTapped))
 		]
 
 		view.tintColor = AppTheme.Colors.controlGrayscale

diff --git a/SwiftTweaks/TweaksCollectionsListViewController.swift b/SwiftTweaks/TweaksCollectionsListViewController.swift
@@ -61,7 +61,7 @@ internal final class TweaksCollectionsListViewController: UIViewController {
 
 		toolbarItems = [
 			UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),
-			UIBarButtonItem(title: "Dismiss", style: .done, target: self, action: #selector(self.dismissButtonTapped))
+			UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.dismissButtonTapped))
 		]
 	}
 

diff --git a/SwiftTweaks/TweaksViewController.swift b/SwiftTweaks/TweaksViewController.swift
@@ -23,8 +23,6 @@ public final class TweaksViewController: UIViewController {
 	public unowned var delegate: TweaksViewControllerDelegate
 	internal var floatingTweaksWindowPresenter: FloatingTweaksWindowPresenter?
 
-	internal static let dismissButtonTitle = NSLocalizedString("Dismiss", comment: "Button to dismiss TweaksViewController.")
-
 	public init(tweakStore: TweakStore, delegate: TweaksViewControllerDelegate) {
 		self.tweakStore = tweakStore
 		self.delegate = delegate