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

PycKamil · web-flow · commit 3dec92a1ddc5 · 2022-03-10T14:48:14.000-08:00
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

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ internal class StringOptionViewController: UITableViewController {`
`51`	`51`	`title = tweak.tweakName`
`52`	`52`	`toolbarItems = [`
`53`	`53`	`UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),`
`54`		`- UIBarButtonItem(title: TweaksViewController.dismissButtonTitle, style: .done, target: self, action: #selector(self.dismissButtonTapped))`
	`54`	`+ UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.dismissButtonTapped))`
`55`	`55`	`]`
`56`	`56`
`57`	`57`	`self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Reset", style: .plain, target: self, action: #selector(StringOptionViewController.restoreDefaultValue))`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ internal final class TweakCollectionViewController: UIViewController {`
`39`	`39`
`40`	`40`	`toolbarItems = [`
`41`	`41`	`UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),`
`42`		`- UIBarButtonItem(title: TweaksViewController.dismissButtonTitle, style: .done, target: self, action: #selector(self.dismissButtonTapped))`
	`42`	`+ UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.dismissButtonTapped))`
`43`	`43`	`]`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ internal final class TweakColorEditViewController: UIViewController {`
`77`	`77`	`title = tweak.tweakName`
`78`	`78`	`toolbarItems = [`
`79`	`79`	`UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),`
`80`		`- UIBarButtonItem(title: TweaksViewController.dismissButtonTitle, style: .done, target: self, action: #selector(self.dismissButtonTapped))`
	`80`	`+ UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.dismissButtonTapped))`
`81`	`81`	`]`
`82`	`82`
`83`	`83`	`view.tintColor = AppTheme.Colors.controlGrayscale`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ internal final class TweaksCollectionsListViewController: UIViewController {`
`61`	`61`
`62`	`62`	`toolbarItems = [`
`63`	`63`	`UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil),`
`64`		`- UIBarButtonItem(title: "Dismiss", style: .done, target: self, action: #selector(self.dismissButtonTapped))`
	`64`	`+ UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.dismissButtonTapped))`
`65`	`65`	`]`
`66`	`66`	`}`
`67`	`67`