From 081ba51af4e5247c4d801cc16b2d14b463a4b014 Mon Sep 17 00:00:00 2001 From: hmzbg <79955445+hmzbg@users.noreply.github.com> Date: Sun, 7 Mar 2021 11:58:47 +0300 Subject: [PATCH] Revert "Updates Delta to 1.1" --- Cores/DeltaCore | 2 +- Delta.xcodeproj/project.pbxproj | 4 -- Delta/Base.lproj/PauseMenu.storyboard | 29 +++---------- .../Segues/SaveStatesStoryboardSegue.swift | 2 +- .../PhotoLibraryImportOption.swift | 1 - Delta/Importing/ImportController.swift | 1 - Delta/Pause Menu/Cheats/CheatTextView.swift | 3 ++ .../SaveStatesCollectionHeaderView.swift | 2 +- .../SaveStatesViewController.swift | 43 ++++--------------- Delta/Settings/Settings.swift | 13 +----- Delta/Supporting Files/Info.plist | 8 ++-- 11 files changed, 26 insertions(+), 82 deletions(-) diff --git a/Cores/DeltaCore b/Cores/DeltaCore index bcedcc293..5fd73cc46 160000 --- a/Cores/DeltaCore +++ b/Cores/DeltaCore @@ -1 +1 @@ -Subproject commit bcedcc293badfc9e4f07f3c66f496bf828450874 +Subproject commit 5fd73cc46963b506ec077dfd9f66d7e5d997acfb diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj index f4984b992..411f8f3ef 100644 --- a/Delta.xcodeproj/project.pbxproj +++ b/Delta.xcodeproj/project.pbxproj @@ -1320,11 +1320,9 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "Delta/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.1; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DDEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.Delta; PROVISIONING_PROFILE = ""; @@ -1345,11 +1343,9 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "Delta/Supporting Files/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.1; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DIMPACTOR"; PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.Delta; PROVISIONING_PROFILE = ""; diff --git a/Delta/Base.lproj/PauseMenu.storyboard b/Delta/Base.lproj/PauseMenu.storyboard index d91da9ae9..3f5661fd4 100644 --- a/Delta/Base.lproj/PauseMenu.storyboard +++ b/Delta/Base.lproj/PauseMenu.storyboard @@ -1,9 +1,9 @@ - + - + @@ -160,28 +160,13 @@ - - - - - - - - - - + + + + + - - - diff --git a/Delta/Game Selection/Segues/SaveStatesStoryboardSegue.swift b/Delta/Game Selection/Segues/SaveStatesStoryboardSegue.swift index c4862dd74..517ee6178 100644 --- a/Delta/Game Selection/Segues/SaveStatesStoryboardSegue.swift +++ b/Delta/Game Selection/Segues/SaveStatesStoryboardSegue.swift @@ -24,7 +24,7 @@ class SaveStatesStoryboardSegue: UIStoryboardSegue saveStatesViewController.loadViewIfNeeded() let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(SaveStatesStoryboardSegue.handleDoneButton)) - saveStatesViewController.navigationItem.leftBarButtonItem = doneButton + saveStatesViewController.navigationItem.rightBarButtonItem = doneButton guard saveStatesViewController.theme == .translucent else { return } diff --git a/Delta/Importing/Import Options/PhotoLibraryImportOption.swift b/Delta/Importing/Import Options/PhotoLibraryImportOption.swift index 4639c0180..918d0847b 100644 --- a/Delta/Importing/Import Options/PhotoLibraryImportOption.swift +++ b/Delta/Importing/Import Options/PhotoLibraryImportOption.swift @@ -30,7 +30,6 @@ class PhotoLibraryImportOption: NSObject, ImportOption let imagePickerController = UIImagePickerController() imagePickerController.delegate = self - imagePickerController.modalPresentationStyle = .fullScreen imagePickerController.sourceType = .photoLibrary imagePickerController.mediaTypes = [kUTTypeImage as String] imagePickerController.view.backgroundColor = .white diff --git a/Delta/Importing/ImportController.swift b/Delta/Importing/ImportController.swift index 0c7d8782b..c57ac3a60 100644 --- a/Delta/Importing/ImportController.swift +++ b/Delta/Importing/ImportController.swift @@ -120,7 +120,6 @@ class ImportController: NSObject let documentBrowserViewController = UIDocumentBrowserViewController(forOpeningFilesWithContentTypes: Array(self.documentTypes)) documentBrowserViewController.delegate = self - documentBrowserViewController.modalPresentationStyle = .fullScreen documentBrowserViewController.browserUserInterfaceStyle = .dark documentBrowserViewController.allowsPickingMultipleItems = true documentBrowserViewController.allowsDocumentCreation = false diff --git a/Delta/Pause Menu/Cheats/CheatTextView.swift b/Delta/Pause Menu/Cheats/CheatTextView.swift index b3cb25b9e..d545c9cd2 100644 --- a/Delta/Pause Menu/Cheats/CheatTextView.swift +++ b/Delta/Pause Menu/Cheats/CheatTextView.swift @@ -33,6 +33,9 @@ class CheatTextView: UITextView super.init(coder: aDecoder) self.layoutManager.delegate = self + + self.textContainer.widthTracksTextView = false + self.textContainer.heightTracksTextView = false } } diff --git a/Delta/Pause Menu/Save States/SaveStatesCollectionHeaderView.swift b/Delta/Pause Menu/Save States/SaveStatesCollectionHeaderView.swift index 26ec89aaf..b4f8ec7ce 100644 --- a/Delta/Pause Menu/Save States/SaveStatesCollectionHeaderView.swift +++ b/Delta/Pause Menu/Save States/SaveStatesCollectionHeaderView.swift @@ -55,7 +55,7 @@ class SaveStatesCollectionHeaderView: UICollectionReusableView self.textLabel.font = UIFont(descriptor: fontDescriptor, size: 0.0) self.textLabel.textAlignment = .center - self.addSubview(self.textLabel) + self.vibrancyView.contentView.addSubview(self.textLabel) // Auto Layout self.textLabel.leadingAnchor.constraint(equalTo: self.leadingAnchor, constant: 20).isActive = true diff --git a/Delta/Pause Menu/Save States/SaveStatesViewController.swift b/Delta/Pause Menu/Save States/SaveStatesViewController.swift index 85bd35388..6d8472256 100644 --- a/Delta/Pause Menu/Save States/SaveStatesViewController.swift +++ b/Delta/Pause Menu/Save States/SaveStatesViewController.swift @@ -54,7 +54,7 @@ class SaveStatesViewController: UICollectionViewController didSet { if self.isViewLoaded { - self.update() + self.updateTheme() } } } @@ -70,8 +70,6 @@ class SaveStatesViewController: UICollectionViewController private var emulatorCoreSaveState: SaveStateProtocol? - @IBOutlet private var sortButton: UIButton! - required init?(coder aDecoder: NSCoder) { self.dataSource = RSTFetchedResultsCollectionViewPrefetchingDataSource(fetchedResultsController: NSFetchedResultsController()) @@ -108,7 +106,7 @@ extension SaveStatesViewController case .loading: self.title = NSLocalizedString("Load State", comment: "") self.placeholderView.detailTextLabel.text = NSLocalizedString("You can create a new save state by pressing the Save State option in the pause menu.", comment: "") - self.navigationItem.rightBarButtonItems?.removeFirst() + self.navigationItem.rightBarButtonItem = nil } // Manually update prototype cell properties @@ -125,7 +123,7 @@ extension SaveStatesViewController self.navigationController?.navigationBar.barStyle = .blackTranslucent self.navigationController?.toolbar.barStyle = .blackTranslucent - self.update() + self.updateTheme() } override func viewWillDisappear(_ animated: Bool) @@ -197,12 +195,12 @@ private extension SaveStatesViewController let fetchRequest: NSFetchRequest = SaveState.fetchRequest() fetchRequest.returnsObjectsAsFaults = false fetchRequest.predicate = NSPredicate(format: "%K == %@", #keyPath(SaveState.game), self.game) - fetchRequest.sortDescriptors = [NSSortDescriptor(key: #keyPath(SaveState.type), ascending: true), NSSortDescriptor(key: #keyPath(SaveState.creationDate), ascending: Settings.sortSaveStatesByOldestFirst)] + fetchRequest.sortDescriptors = [NSSortDescriptor(key: #keyPath(SaveState.type), ascending: true), NSSortDescriptor(key: #keyPath(SaveState.creationDate), ascending: true)] self.dataSource.fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.shared.viewContext, sectionNameKeyPath: #keyPath(SaveState.type), cacheName: nil) } - func update() + func updateTheme() { switch self.theme { @@ -222,8 +220,6 @@ private extension SaveStatesViewController self.placeholderView.textLabel.textColor = UIColor.white self.placeholderView.detailTextLabel.textColor = UIColor.white } - - self.sortButton.transform = CGAffineTransform.identity.rotated(by: Settings.sortSaveStatesByOldestFirst ? 0 : .pi) } //MARK: - Configure Views - @@ -271,16 +267,12 @@ private extension SaveStatesViewController } headerView.textLabel.text = title + headerView.textLabel.textColor = UIColor.white switch self.theme { - case .opaque: - headerView.textLabel.textColor = UIColor.lightGray - headerView.isTextLabelVibrancyEnabled = false - - case .translucent: - headerView.textLabel.textColor = UIColor.white - headerView.isTextLabelVibrancyEnabled = true + case .opaque: headerView.isTextLabelVibrancyEnabled = false + case .translucent: headerView.isTextLabelVibrancyEnabled = true } } @@ -437,25 +429,6 @@ private extension SaveStatesViewController } } - @IBAction func changeSortOrder(_ sender: UIButton) - { - Settings.sortSaveStatesByOldestFirst.toggle() - - UIView.transition(with: self.collectionView, duration: 0.4, options: .transitionCrossDissolve, animations: { - self.updateDataSource() - }, completion: nil) - - UIView.animate(withDuration: 0.4) { - self.update() - } - - let toastView = RSTToastView() - toastView.textLabel.text = Settings.sortSaveStatesByOldestFirst ? NSLocalizedString("Oldest First", comment: "") : NSLocalizedString("Newest First", comment: "") - toastView.presentationEdge = .top - toastView.tintColor = UIColor.deltaPurple - toastView.show(in: self.view, duration: 2.0) - } - //MARK: - Convenience Methods - func correctedSectionForSectionIndex(_ section: Int) -> Section diff --git a/Delta/Settings/Settings.swift b/Delta/Settings/Settings.swift index 63c4b5bd5..bbfd78926 100644 --- a/Delta/Settings/Settings.swift +++ b/Delta/Settings/Settings.swift @@ -54,8 +54,7 @@ struct Settings let defaults = [#keyPath(UserDefaults.translucentControllerSkinOpacity): 0.7, #keyPath(UserDefaults.gameShortcutsMode): GameShortcutsMode.recent.rawValue, #keyPath(UserDefaults.isButtonHapticFeedbackEnabled): true, - #keyPath(UserDefaults.isThumbstickHapticFeedbackEnabled): true, - #keyPath(UserDefaults.sortSaveStatesByOldestFirst): true] as [String : Any] + #keyPath(UserDefaults.isThumbstickHapticFeedbackEnabled): true] as [String : Any] UserDefaults.standard.register(defaults: defaults) } } @@ -169,14 +168,6 @@ extension Settings } } - static var sortSaveStatesByOldestFirst: Bool { - set { UserDefaults.standard.sortSaveStatesByOldestFirst = newValue } - get { - let sortByOldestFirst = UserDefaults.standard.sortSaveStatesByOldestFirst - return sortByOldestFirst - } - } - static func preferredControllerSkin(for system: System, traits: DeltaCore.ControllerSkin.Traits) -> ControllerSkin? { guard let userDefaultsKey = self.preferredControllerSkinKey(for: system, traits: traits) else { return nil } @@ -279,6 +270,4 @@ private extension UserDefaults @NSManaged var isButtonHapticFeedbackEnabled: Bool @NSManaged var isThumbstickHapticFeedbackEnabled: Bool - - @NSManaged var sortSaveStatesByOldestFirst: Bool } diff --git a/Delta/Supporting Files/Info.plist b/Delta/Supporting Files/Info.plist index c5c64f490..44b021727 100644 --- a/Delta/Supporting Files/Info.plist +++ b/Delta/Supporting Files/Info.plist @@ -128,7 +128,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - $(MARKETING_VERSION) + 1.1 CFBundleSignature ???? CFBundleURLTypes @@ -161,7 +161,7 @@ CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 14 Fabric APIKey @@ -222,8 +222,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIUserInterfaceStyle - Light UTExportedTypeDeclarations @@ -371,5 +369,7 @@ + UIUserInterfaceStyle + Light