diff --git a/Delta/Pause Menu/PauseViewController.swift b/Delta/Pause Menu/PauseViewController.swift index c3898b1..10a4d02 100644 --- a/Delta/Pause Menu/PauseViewController.swift +++ b/Delta/Pause Menu/PauseViewController.swift @@ -135,21 +135,21 @@ private extension PauseViewController guard self.emulatorCore != nil else { return } - self.saveStateItem = PauseItem(image: UIImage(named: "SaveSaveState")!, text: NSLocalizedString("Save State", comment: ""), action: { [unowned self] _ in + self.saveStateItem = PauseItem(image: #imageLiteral(resourceName: "SaveSaveState"), text: NSLocalizedString("Save State", comment: ""), action: { [unowned self] _ in self.saveStatesViewControllerMode = .saving self.performSegue(withIdentifier: "saveStates", sender: self) }) - self.loadStateItem = PauseItem(image: UIImage(named: "LoadSaveState")!, text: NSLocalizedString("Load State", comment: ""), action: { [unowned self] _ in + self.loadStateItem = PauseItem(image: #imageLiteral(resourceName: "LoadSaveState"), text: NSLocalizedString("Load State", comment: ""), action: { [unowned self] _ in self.saveStatesViewControllerMode = .loading self.performSegue(withIdentifier: "saveStates", sender: self) }) - self.cheatCodesItem = PauseItem(image: UIImage(named: "SmallPause")!, text: NSLocalizedString("Cheat Codes", comment: ""), action: { [unowned self] _ in + self.cheatCodesItem = PauseItem(image: #imageLiteral(resourceName: "CheatCodes"), text: NSLocalizedString("Cheat Codes", comment: ""), action: { [unowned self] _ in self.performSegue(withIdentifier: "cheats", sender: self) }) - self.fastForwardItem = PauseItem(image: UIImage(named: "FastForward")!, text: NSLocalizedString("Fast Forward", comment: ""), action: { _ in }) - self.sustainButtonsItem = PauseItem(image: UIImage(named: "SmallPause")!, text: NSLocalizedString("Sustain Buttons", comment: ""), action: { _ in }) + self.fastForwardItem = PauseItem(image: #imageLiteral(resourceName: "FastForward"), text: NSLocalizedString("Fast Forward", comment: ""), action: { _ in }) + self.sustainButtonsItem = PauseItem(image: #imageLiteral(resourceName: "SustainButtons"), text: NSLocalizedString("Sustain Buttons", comment: ""), action: { _ in }) } } diff --git a/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/Contents.json b/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/Contents.json similarity index 74% rename from Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/Contents.json rename to Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/Contents.json index aeba953..176fb71 100644 --- a/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/Contents.json +++ b/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "SmallPause.png", + "filename" : "cheats@1x.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "SmallPause@2x.png", + "filename" : "cheats@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "SmallPause@3x.png", + "filename" : "cheats@3x.png", "scale" : "3x" } ], diff --git a/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/cheats@1x.png b/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/cheats@1x.png new file mode 100644 index 0000000..cddacd4 Binary files /dev/null and b/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/cheats@1x.png differ diff --git a/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/cheats@2x.png b/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/cheats@2x.png new file mode 100644 index 0000000..0ea4aac Binary files /dev/null and b/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/cheats@2x.png differ diff --git a/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/cheats@3x.png b/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/cheats@3x.png new file mode 100644 index 0000000..44344fc Binary files /dev/null and b/Resources/Assets.xcassets/Pause Icons/CheatCodes.imageset/cheats@3x.png differ diff --git a/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause.png b/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause.png deleted file mode 100644 index 516a83b..0000000 Binary files a/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause.png and /dev/null differ diff --git a/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@2x.png b/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@2x.png deleted file mode 100644 index 0dff22c..0000000 Binary files a/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@2x.png and /dev/null differ diff --git a/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@3x.png b/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@3x.png deleted file mode 100644 index 0b1847d..0000000 Binary files a/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@3x.png and /dev/null differ diff --git a/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/Contents.json b/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/Contents.json new file mode 100644 index 0000000..1a8d12e --- /dev/null +++ b/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "sustain@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "sustain@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "sustain@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/sustain@1x.png b/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/sustain@1x.png new file mode 100644 index 0000000..254244a Binary files /dev/null and b/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/sustain@1x.png differ diff --git a/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/sustain@2x.png b/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/sustain@2x.png new file mode 100644 index 0000000..493e8b3 Binary files /dev/null and b/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/sustain@2x.png differ diff --git a/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/sustain@3x.png b/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/sustain@3x.png new file mode 100644 index 0000000..7362df8 Binary files /dev/null and b/Resources/Assets.xcassets/Pause Icons/SustainButtons.imageset/sustain@3x.png differ