From 2ff5ad532dc119e7011e2b41dd42ddbf9b19c1da Mon Sep 17 00:00:00 2001 From: Vivian Phung <9276753+VPhung24@users.noreply.github.com> Date: Tue, 22 Nov 2022 20:33:01 -0500 Subject: [PATCH] update extension kit --- NfcWriter.xcodeproj/project.pbxproj | 18 +-------- .../xcshareddata/swiftpm/Package.resolved | 4 +- NfcWriter/Extensions/UIImage+Extensions.swift | 20 ---------- .../Extensions/UserDefaults+Extensions.swift | 39 ------------------- 4 files changed, 3 insertions(+), 78 deletions(-) delete mode 100644 NfcWriter/Extensions/UIImage+Extensions.swift delete mode 100644 NfcWriter/Extensions/UserDefaults+Extensions.swift diff --git a/NfcWriter.xcodeproj/project.pbxproj b/NfcWriter.xcodeproj/project.pbxproj index cded5a6..485629d 100644 --- a/NfcWriter.xcodeproj/project.pbxproj +++ b/NfcWriter.xcodeproj/project.pbxproj @@ -26,14 +26,12 @@ 0855DF622900E3080025858B /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0855DF612900E3080025858B /* SnapshotHelper.swift */; }; 08EC165B290AFDEB00C26DC5 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08EC165A290AFDEB00C26DC5 /* MainViewController.swift */; }; 08EC165D290B0ED300C26DC5 /* MyContactViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08EC165C290B0ED300C26DC5 /* MyContactViewController.swift */; }; - 08EC165F290B487200C26DC5 /* UserDefaults+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08EC165E290B487200C26DC5 /* UserDefaults+Extensions.swift */; }; 08EC169A290B7FE000C26DC5 /* FirebaseHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08EC1699290B7FE000C26DC5 /* FirebaseHelpers.swift */; }; 08EC169E290B823B00C26DC5 /* NFCTagManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08EC169D290B823B00C26DC5 /* NFCTagManager.swift */; }; 08FFA989292D770900410B69 /* VivUIExtensionsUserDefaultsContactTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08FFA988292D770900410B69 /* VivUIExtensionsUserDefaultsContactTests.swift */; }; 08FFA992292D780C00410B69 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = 08FFA991292D780C00410B69 /* FirebaseStorage */; }; 08FFA994292D786C00410B69 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 08FFA993292D786B00410B69 /* README.md */; }; 08FFA996292D787B00410B69 /* LICENSE.md in Resources */ = {isa = PBXBuildFile; fileRef = 08FFA995292D787B00410B69 /* LICENSE.md */; }; - 08FFA9A1292D803900410B69 /* UIImage+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08FFA99F292D803900410B69 /* UIImage+Extensions.swift */; }; 08FFA9A4292D81E500410B69 /* VivUIExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 08FFA9A3292D81E500410B69 /* VivUIExtensions */; }; 08FFA9A7292D8EBB00410B69 /* NfcButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08FFA9A6292D8EBB00410B69 /* NfcButton.swift */; }; /* End PBXBuildFile section */ @@ -81,14 +79,12 @@ 0855DF632900F1DB0025858B /* NfcWriterRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NfcWriterRelease.entitlements; sourceTree = ""; }; 08EC165A290AFDEB00C26DC5 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; 08EC165C290B0ED300C26DC5 /* MyContactViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyContactViewController.swift; sourceTree = ""; }; - 08EC165E290B487200C26DC5 /* UserDefaults+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+Extensions.swift"; sourceTree = ""; }; 08EC1699290B7FE000C26DC5 /* FirebaseHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseHelpers.swift; sourceTree = ""; }; 08EC169D290B823B00C26DC5 /* NFCTagManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFCTagManager.swift; sourceTree = ""; }; 08FFA986292D770900410B69 /* NfcWriterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NfcWriterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 08FFA988292D770900410B69 /* VivUIExtensionsUserDefaultsContactTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VivUIExtensionsUserDefaultsContactTests.swift; sourceTree = ""; }; 08FFA993292D786B00410B69 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; }; 08FFA995292D787B00410B69 /* LICENSE.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = SOURCE_ROOT; }; - 08FFA99F292D803900410B69 /* UIImage+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+Extensions.swift"; sourceTree = ""; }; 08FFA9A6292D8EBB00410B69 /* NfcButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NfcButton.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -131,15 +127,6 @@ path = "View Controllers"; sourceTree = ""; }; - 081477D12927458500F176B2 /* Extensions */ = { - isa = PBXGroup; - children = ( - 08EC165E290B487200C26DC5 /* UserDefaults+Extensions.swift */, - 08FFA99F292D803900410B69 /* UIImage+Extensions.swift */, - ); - path = Extensions; - sourceTree = ""; - }; 081477D2292745FC00F176B2 /* Models */ = { isa = PBXGroup; children = ( @@ -196,7 +183,6 @@ 081AF85A28FDF71E00425075 /* SceneDelegate.swift */, 08FFA9A5292D8EA600410B69 /* Views */, 080ABF63290BAAF30068BA7E /* View Controllers */, - 081477D12927458500F176B2 /* Extensions */, 081477D2292745FC00F176B2 /* Models */, 081477D3292746BF00F176B2 /* Managers */, 081477D42927470500F176B2 /* Utilities */, @@ -414,7 +400,6 @@ buildActionMask = 2147483647; files = ( 081AF87428FE08FF00425075 /* APIManager.swift in Sources */, - 08EC165F290B487200C26DC5 /* UserDefaults+Extensions.swift in Sources */, 08EC165D290B0ED300C26DC5 /* MyContactViewController.swift in Sources */, 081AF85D28FDF71E00425075 /* SearchViewController.swift in Sources */, 08EC169A290B7FE000C26DC5 /* FirebaseHelpers.swift in Sources */, @@ -426,7 +411,6 @@ 080ABF65290C8E5D0068BA7E /* NFCButtonStyle.swift in Sources */, 08EC169E290B823B00C26DC5 /* NFCTagManager.swift in Sources */, 08EC165B290AFDEB00C26DC5 /* MainViewController.swift in Sources */, - 08FFA9A1292D803900410B69 /* UIImage+Extensions.swift in Sources */, 081AF87128FDFD2700425075 /* TwitterHandleModel.swift in Sources */, 081AF87D28FF1DCA00425075 /* TagNFCViewController.swift in Sources */, ); @@ -813,7 +797,7 @@ repositoryURL = "https://github.com/VPhung24/VivUIExtensions.git"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 1.0.1; + minimumVersion = 1.0.2; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/NfcWriter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NfcWriter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index f24b67b..cf9de93 100644 --- a/NfcWriter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/NfcWriter.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -113,8 +113,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/VPhung24/VivUIExtensions.git", "state" : { - "revision" : "771061f6d28579b1701cf8cd3a2914535630aef9", - "version" : "1.0.1" + "revision" : "6013547f99734728bfee248675bbf9214cabe7a1", + "version" : "1.0.2" } } ], diff --git a/NfcWriter/Extensions/UIImage+Extensions.swift b/NfcWriter/Extensions/UIImage+Extensions.swift deleted file mode 100644 index 67530d6..0000000 --- a/NfcWriter/Extensions/UIImage+Extensions.swift +++ /dev/null @@ -1,20 +0,0 @@ -// -// UIImage+Extensions.swift -// NfcWriter -// -// Created by Vivian Phung on 11/22/22. -// - -import UIKit - -extension UIImage { - func resizeImageToWidth(newWidth: CGFloat) -> UIImage { - let scale = newWidth / self.size.width - let newHeight = self.size.height * scale - UIGraphicsBeginImageContext(CGSize(width: newWidth, height: newHeight)) - self.draw(in: CGRect(x: 0, y: 0, width: newWidth, height: newHeight)) - let newImage = UIGraphicsGetImageFromCurrentImageContext() - UIGraphicsEndImageContext() - return newImage!.withRenderingMode(.alwaysOriginal) - } -} diff --git a/NfcWriter/Extensions/UserDefaults+Extensions.swift b/NfcWriter/Extensions/UserDefaults+Extensions.swift deleted file mode 100644 index 3fb279e..0000000 --- a/NfcWriter/Extensions/UserDefaults+Extensions.swift +++ /dev/null @@ -1,39 +0,0 @@ -// -// UserDefaults+Extensions.swift -// NfcWriter -// -// Created by Vivian Phung on 10/27/22. -// - -import Foundation -import Contacts - -extension UserDefaults { - /** - Sets the value of the specified default key to the specified contact value. - */ - func set(_ value: CNContact, forKey defaultName: String) { - do { - let data: Data = try NSKeyedArchiver.archivedData(withRootObject: value, requiringSecureCoding: true) - UserDefaults.standard.set(data, forKey: defaultName) - } catch { - print("error setting contact as user default") - } - } - - /** - returns the contact associated with the specified key - */ - func contact(forKey defaultName: String) -> CNContact? { - if let data = UserDefaults.standard.data(forKey: defaultName) { - do { - if let loadedContact = try NSKeyedUnarchiver.unarchivedObject(ofClasses: [CNContact.self], from: data) as? CNContact { - return loadedContact - } - } catch { - print("error decoding contact from user defaults") - } - } - return nil - } -}