From 5fabcd36d6af30cb9cde7d93ead69b1e6d1b4fd2 Mon Sep 17 00:00:00 2001 From: Andrew McKnight Date: Fri, 22 Sep 2023 16:08:42 -0800 Subject: [PATCH 1/2] remove commented buttons and unused ViewController.swift --- EmpowerPlant.xcodeproj/project.pbxproj | 4 - EmpowerPlant/Base.lproj/Main.storyboard | 400 ++++++++--------------- EmpowerPlant/ListAppViewController.swift | 79 ----- EmpowerPlant/ViewController.swift | 21 -- 4 files changed, 143 insertions(+), 361 deletions(-) delete mode 100644 EmpowerPlant/ViewController.swift diff --git a/EmpowerPlant.xcodeproj/project.pbxproj b/EmpowerPlant.xcodeproj/project.pbxproj index 5d0d432..f0535c0 100644 --- a/EmpowerPlant.xcodeproj/project.pbxproj +++ b/EmpowerPlant.xcodeproj/project.pbxproj @@ -15,7 +15,6 @@ D15FCDA927E00F0D00258BF3 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D15FCDA727E00F0D00258BF3 /* Model.xcdatamodeld */; }; D17C73B327D8291D006650AF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17C73B227D8291D006650AF /* AppDelegate.swift */; }; D17C73B527D8291D006650AF /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17C73B427D8291D006650AF /* SceneDelegate.swift */; }; - D17C73B727D8291D006650AF /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D17C73B627D8291D006650AF /* ViewController.swift */; }; D17C73BA27D8291D006650AF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D17C73B827D8291D006650AF /* Main.storyboard */; }; D17C73BC27D8291D006650AF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D17C73BB27D8291D006650AF /* Assets.xcassets */; }; D17C73BF27D8291D006650AF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D17C73BD27D8291D006650AF /* LaunchScreen.storyboard */; }; @@ -53,7 +52,6 @@ D15FCDA827E00F0D00258BF3 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = ""; }; D17C73B227D8291D006650AF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; D17C73B427D8291D006650AF /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - D17C73B627D8291D006650AF /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; D17C73B927D8291D006650AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; D17C73BB27D8291D006650AF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; D17C73BE27D8291D006650AF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; @@ -122,7 +120,6 @@ 8B21663B29D3F8C80009C890 /* RandomErrors.swift */, D17C73B227D8291D006650AF /* AppDelegate.swift */, D17C73B427D8291D006650AF /* SceneDelegate.swift */, - D17C73B627D8291D006650AF /* ViewController.swift */, D17C73B827D8291D006650AF /* Main.storyboard */, D15EDF13282BF80400FC13D6 /* Product+CoreDataClass.swift */, D15EDF11282BF7FB00FC13D6 /* Product+CoreDataProperties.swift */, @@ -321,7 +318,6 @@ buildActionMask = 2147483647; files = ( D17C73CC27D82EB8006650AF /* EmpowerPlantViewController.swift in Sources */, - D17C73B727D8291D006650AF /* ViewController.swift in Sources */, D17C73D227D83321006650AF /* ListAppViewController.swift in Sources */, D15EDF14282BF80400FC13D6 /* Product+CoreDataClass.swift in Sources */, D15FCDA927E00F0D00258BF3 /* Model.xcdatamodeld in Sources */, diff --git a/EmpowerPlant/Base.lproj/Main.storyboard b/EmpowerPlant/Base.lproj/Main.storyboard index 2190c53..0fb2a31 100644 --- a/EmpowerPlant/Base.lproj/Main.storyboard +++ b/EmpowerPlant/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -62,264 +62,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EmpowerPlant/ListAppViewController.swift b/EmpowerPlant/ListAppViewController.swift index 68b2b6c..475c26e 100644 --- a/EmpowerPlant/ListAppViewController.swift +++ b/EmpowerPlant/ListAppViewController.swift @@ -250,86 +250,7 @@ class ListAppViewController: UIViewController { } } - @IBAction func resetDSN(_ sender: Any) { - //self.dsnTextField.text = AppDelegate.defaultDSN - //self.dsnTextField.backgroundColor = UIColor.systemGreen - - //dispatchQueue.async { - //DSNStorage.shared.saveDSN(dsn: AppDelegate.defaultDSN) - //} - } - - @IBAction func showNibController(_ sender: Any) { - //let nib = NibViewController() - //nib.title = "Nib View Controller" - //navigationController?.pushViewController(nib, animated: false) - } - - @IBAction func showTableViewController(_ sender: Any) { - //let controller = TableViewController(style: .plain) - //controller.title = "Table View Controller" - //navigationController?.pushViewController(controller, animated: false) - } - - @IBAction func useCoreData(_ sender: Any) { - //let controller = CoreDataViewController() - //controller.title = "CoreData" - //navigationController?.pushViewController(controller, animated: false) - } - - @IBAction func performanceScenarios(_ sender: Any) { - //let controller = PerformanceViewController() - //controller.title = "Performance Scenarios" - //navigationController?.pushViewController(controller, animated: false) - } - - @IBAction func permissions(_ sender: Any) { - //let controller = PermissionsViewController() - // controller.title = "Permissions" - //navigationController?.pushViewController(controller, animated: true) - } - - @IBAction func flush(_ sender: Any) { - //SentrySDK.flush(timeout: 5) - } - @IBAction func close(_ sender: Any) { SentrySDK.close() } - - @IBAction func startSDK(_ sender: Any) { - //AppDelegate.startSentry() - } - - /* 20230310 - Omitted to insert 'Actions' - override func viewDidLoad() { - super.viewDidLoad() - - SentrySDK.capture(message: "Message from List App") - - // Do any additional setup after loading the view. - do { - try callMethodThatThrowsError() - } catch let error as NSError { - SentrySDK.capture(error: error) { (scope) in - scope.setLevel(.fatal) - } - } - } - - func callMethodThatThrowsError() throws{ - throw NSError(domain: "", code: 0, userInfo: [NSLocalizedDescriptionKey : "Handled Exception"]) - } - */ - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destination. - // Pass the selected object to the new view controller. - } - */ - } diff --git a/EmpowerPlant/ViewController.swift b/EmpowerPlant/ViewController.swift deleted file mode 100644 index e76550b..0000000 --- a/EmpowerPlant/ViewController.swift +++ /dev/null @@ -1,21 +0,0 @@ -// -// ViewController.swift -// EmpowerPlant -// -// Created by William Capozzoli on 3/8/22. -// - -import UIKit - -// This controller is not being used. It came with the project when the project was bootstrapped -// We created new controllers rather than refactor/renaming ViewController.swift -class ViewController: UIViewController { - - override func viewDidLoad() { - super.viewDidLoad() - // Do any additional setup after loading the view. - } - - -} - From 2d2b4394e200e18d171173fbdfdf0ded31f29a9d Mon Sep 17 00:00:00 2001 From: Andrew McKnight Date: Fri, 22 Sep 2023 16:11:26 -0800 Subject: [PATCH 2/2] spacing --- EmpowerPlant/Base.lproj/Main.storyboard | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/EmpowerPlant/Base.lproj/Main.storyboard b/EmpowerPlant/Base.lproj/Main.storyboard index 0fb2a31..c8dbeec 100644 --- a/EmpowerPlant/Base.lproj/Main.storyboard +++ b/EmpowerPlant/Base.lproj/Main.storyboard @@ -62,14 +62,14 @@ - + - +