From d684754378fe530357d147bf18c8daece676fd50 Mon Sep 17 00:00:00 2001 From: Kennith Mann Date: Fri, 31 Jan 2020 14:31:37 -0600 Subject: [PATCH 1/2] Adding additional street and pobox fields Renamed Street to Street 1. Added Street 2. Added P.O. Box This should allow for a full address. --- PostalAddressRow.xcodeproj/project.pbxproj | 32 ++++- Sources/PostalAddressCell.swift | 88 ++++++++++--- Sources/PostalAddressCell.xib | 44 ++++++- Sources/PostalAddressRow.swift | 64 +++++++--- Sources/ba | 141 +++++++++++++++++++++ Sources/backup.xib | 101 +++++++++++++++ 6 files changed, 428 insertions(+), 42 deletions(-) create mode 100644 Sources/ba create mode 100644 Sources/backup.xib diff --git a/PostalAddressRow.xcodeproj/project.pbxproj b/PostalAddressRow.xcodeproj/project.pbxproj index 9740823..5e78d34 100644 --- a/PostalAddressRow.xcodeproj/project.pbxproj +++ b/PostalAddressRow.xcodeproj/project.pbxproj @@ -9,10 +9,13 @@ /* Begin PBXBuildFile section */ 28F828811C494B2C00330CF4 /* PostalAddressRow.h in Headers */ = {isa = PBXBuildFile; fileRef = 28F828801C494B2C00330CF4 /* PostalAddressRow.h */; settings = {ATTRIBUTES = (Public, ); }; }; 28F828881C494B2C00330CF4 /* PostalAddressRow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28F8287D1C494B2C00330CF4 /* PostalAddressRow.framework */; }; - 8F49F8AB1D871ED40058ACF9 /* Eureka.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F49F8AA1D871ED40058ACF9 /* Eureka.framework */; }; 8F58BC761D889B6400F14961 /* PostalAddressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F58BC751D889B6400F14961 /* PostalAddressCell.swift */; }; 8FDB703D1D871BAD0008694A /* PostalAddressRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FDB703C1D871BAD0008694A /* PostalAddressRow.swift */; }; 8FDB703F1D871C3F0008694A /* PostalAddressCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8FDB703E1D871C3F0008694A /* PostalAddressCell.xib */; }; + AA94F92223E4901D0080C161 /* Eureka.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA94F92123E4901C0080C161 /* Eureka.framework */; }; + AA94F92323E4901D0080C161 /* Eureka.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = AA94F92123E4901C0080C161 /* Eureka.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + AA94F92823E496FF0080C161 /* backup.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA94F92723E496FF0080C161 /* backup.xib */; }; + AA94F92A23E4A5E30080C161 /* ba in Resources */ = {isa = PBXBuildFile; fileRef = AA94F92923E4A5E30080C161 /* ba */; }; CB3F7D691F8BEF7900C856E5 /* PostalAddressRowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5142631F8BEECC00E20AD5 /* PostalAddressRowTests.swift */; }; /* End PBXBuildFile section */ @@ -26,15 +29,31 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + AAFF528723E48EE800C08DF8 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + AA94F92323E4901D0080C161 /* Eureka.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 28F8287D1C494B2C00330CF4 /* PostalAddressRow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PostalAddressRow.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 28F828801C494B2C00330CF4 /* PostalAddressRow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PostalAddressRow.h; sourceTree = ""; }; 28F828821C494B2C00330CF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 28F828871C494B2C00330CF4 /* PostalAddressRowTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PostalAddressRowTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 8F49F8AA1D871ED40058ACF9 /* Eureka.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Eureka.framework; path = Carthage/Build/iOS/Eureka.framework; sourceTree = ""; }; 8F58BC751D889B6400F14961 /* PostalAddressCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostalAddressCell.swift; sourceTree = ""; }; 8FDB703C1D871BAD0008694A /* PostalAddressRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostalAddressRow.swift; sourceTree = ""; }; 8FDB703E1D871C3F0008694A /* PostalAddressCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PostalAddressCell.xib; sourceTree = ""; }; + AA94F92123E4901C0080C161 /* Eureka.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Eureka.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + AA94F92723E496FF0080C161 /* backup.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = backup.xib; sourceTree = ""; }; + AA94F92923E4A5E30080C161 /* ba */ = {isa = PBXFileReference; lastKnownFileType = text; path = ba; sourceTree = ""; }; CB5142631F8BEECC00E20AD5 /* PostalAddressRowTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostalAddressRowTests.swift; sourceTree = SOURCE_ROOT; }; CB5142641F8BEECC00E20AD5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -44,7 +63,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8F49F8AB1D871ED40058ACF9 /* Eureka.framework in Frameworks */, + AA94F92223E4901D0080C161 /* Eureka.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -95,6 +114,8 @@ 8FDB703E1D871C3F0008694A /* PostalAddressCell.xib */, 8FDB703C1D871BAD0008694A /* PostalAddressRow.swift */, 8F58BC751D889B6400F14961 /* PostalAddressCell.swift */, + AA94F92723E496FF0080C161 /* backup.xib */, + AA94F92923E4A5E30080C161 /* ba */, ); path = Sources; sourceTree = ""; @@ -102,7 +123,7 @@ 8F49F8A91D871ED40058ACF9 /* Frameworks */ = { isa = PBXGroup; children = ( - 8F49F8AA1D871ED40058ACF9 /* Eureka.framework */, + AA94F92123E4901C0080C161 /* Eureka.framework */, ); name = Frameworks; sourceTree = ""; @@ -138,6 +159,7 @@ 28F828791C494B2C00330CF4 /* Frameworks */, 28F8287A1C494B2C00330CF4 /* Headers */, 28F8287B1C494B2C00330CF4 /* Resources */, + AAFF528723E48EE800C08DF8 /* Embed Frameworks */, ); buildRules = ( ); @@ -210,6 +232,8 @@ buildActionMask = 2147483647; files = ( 8FDB703F1D871C3F0008694A /* PostalAddressCell.xib in Resources */, + AA94F92823E496FF0080C161 /* backup.xib in Resources */, + AA94F92A23E4A5E30080C161 /* ba in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Sources/PostalAddressCell.swift b/Sources/PostalAddressCell.swift index 4e23228..232350f 100644 --- a/Sources/PostalAddressCell.swift +++ b/Sources/PostalAddressCell.swift @@ -15,7 +15,9 @@ import Eureka * Protocol for cells that contain a postal address */ public protocol PostalAddressCellConformance { - var streetTextField: UITextField? { get } + var street1TextField: UITextField? { get } + var street2TextField: UITextField? { get } + var poboxTextField: UITextField? { get } var stateTextField: UITextField? { get } var postalCodeTextField: UITextField? { get } var cityTextField: UITextField? { get } @@ -25,7 +27,9 @@ public protocol PostalAddressCellConformance { /// Base class that implements the cell logic for the PostalAddressRow open class _PostalAddressCell: Cell, CellType, PostalAddressCellConformance, UITextFieldDelegate { - @IBOutlet open var streetTextField: UITextField? + @IBOutlet open var street1TextField: UITextField? + @IBOutlet open var street2TextField: UITextField? + @IBOutlet open var poboxTextField: UITextField? @IBOutlet open var firstSeparatorView: UIView? @IBOutlet open var stateTextField: UITextField? @IBOutlet open var postalCodeTextField: UITextField? @@ -47,12 +51,16 @@ open class _PostalAddressCell: Cell, CellType, PostalAd open override func awakeFromNib() { super.awakeFromNib() - textFieldOrdering = [streetTextField, postalCodeTextField, cityTextField, stateTextField, countryTextField] + textFieldOrdering = [street1TextField, street2TextField, poboxTextField, postalCodeTextField, cityTextField, stateTextField, countryTextField] } deinit { - streetTextField?.delegate = nil - streetTextField?.removeTarget(self, action: nil, for: .allEvents) + street1TextField?.delegate = nil + street1TextField?.removeTarget(self, action: nil, for: .allEvents) + street2TextField?.delegate = nil + street2TextField?.removeTarget(self, action: nil, for: .allEvents) + poboxTextField?.delegate = nil + poboxTextField?.removeTarget(self, action: nil, for: .allEvents) stateTextField?.delegate = nil stateTextField?.removeTarget(self, action: nil, for: .allEvents) postalCodeTextField?.delegate = nil @@ -97,8 +105,14 @@ open class _PostalAddressCell: Cell, CellType, PostalAd textField?.autocapitalizationType = .words } - streetTextField?.text = row.value?.street - streetTextField?.keyboardType = .asciiCapable + street1TextField?.text = row.value?.street1 + street1TextField?.keyboardType = .asciiCapable + + street2TextField?.text = row.value?.street2 + street2TextField?.keyboardType = .asciiCapable + + poboxTextField?.text = row.value?.pobox + poboxTextField?.keyboardType = .asciiCapable stateTextField?.text = row.value?.state stateTextField?.keyboardType = .asciiCapable @@ -113,7 +127,9 @@ open class _PostalAddressCell: Cell, CellType, PostalAd countryTextField?.keyboardType = .asciiCapable if let rowConformance = row as? PostalAddressRowConformance { - setPlaceholderToTextField(textField: streetTextField, placeholder: rowConformance.streetPlaceholder) + setPlaceholderToTextField(textField: street1TextField, placeholder: rowConformance.street1Placeholder) + setPlaceholderToTextField(textField: street2TextField, placeholder: rowConformance.street2Placeholder) + setPlaceholderToTextField(textField: poboxTextField, placeholder: rowConformance.poboxPlaceholder) setPlaceholderToTextField(textField: stateTextField, placeholder: rowConformance.statePlaceholder) setPlaceholderToTextField(textField: postalCodeTextField, placeholder: rowConformance.postalCodePlaceholder) setPlaceholderToTextField(textField: cityTextField, placeholder: rowConformance.cityPlaceholder) @@ -133,7 +149,9 @@ open class _PostalAddressCell: Cell, CellType, PostalAd open override func cellCanBecomeFirstResponder() -> Bool { return !row.isDisabled && ( - streetTextField?.canBecomeFirstResponder == true || + street1TextField?.canBecomeFirstResponder == true || + street2TextField?.canBecomeFirstResponder == true || + poboxTextField?.canBecomeFirstResponder == true || stateTextField?.canBecomeFirstResponder == true || postalCodeTextField?.canBecomeFirstResponder == true || cityTextField?.canBecomeFirstResponder == true || @@ -146,7 +164,9 @@ open class _PostalAddressCell: Cell, CellType, PostalAd } open override func cellResignFirstResponder() -> Bool { - return streetTextField?.resignFirstResponder() ?? true + return street1TextField?.resignFirstResponder() ?? true + && street2TextField?.resignFirstResponder() ?? true + && poboxTextField?.resignFirstResponder() ?? true && stateTextField?.resignFirstResponder() ?? true && postalCodeTextField?.resignFirstResponder() ?? true && stateTextField?.resignFirstResponder() ?? true @@ -210,8 +230,14 @@ open class _PostalAddressCell: Cell, CellType, PostalAd guard let textValue = textField.text else { switch(textField){ - case let field where field == streetTextField: - row.value?.street = nil + case let field where field == street1TextField: + row.value?.street1 = nil + + case let field where field == street2TextField: + row.value?.street2 = nil + + case let field where field == poboxTextField: + row.value?.pobox = nil case let field where field == stateTextField: row.value?.state = nil @@ -235,9 +261,17 @@ open class _PostalAddressCell: Cell, CellType, PostalAd var valueFormatter: Formatter? switch(textField){ - case let field where field == streetTextField: - useFormatterDuringInput = rowConformance.streetUseFormatterDuringInput - valueFormatter = rowConformance.streetFormatter + case let field where field == street1TextField: + useFormatterDuringInput = rowConformance.street1UseFormatterDuringInput + valueFormatter = rowConformance.street1Formatter + + case let field where field == street2TextField: + useFormatterDuringInput = rowConformance.street2UseFormatterDuringInput + valueFormatter = rowConformance.street2Formatter + + case let field where field == poboxTextField: + useFormatterDuringInput = rowConformance.poboxUseFormatterDuringInput + valueFormatter = rowConformance.poboxFormatter case let field where field == stateTextField: useFormatterDuringInput = rowConformance.stateUseFormatterDuringInput @@ -265,8 +299,12 @@ open class _PostalAddressCell: Cell, CellType, PostalAd if formatter.getObjectValue(value, for: textValue, errorDescription: errorDesc) { switch(textField){ - case let field where field == streetTextField: - row.value?.street = value.pointee as? String + case let field where field == street1TextField: + row.value?.street1 = value.pointee as? String + case let field where field == street2TextField: + row.value?.street2 = value.pointee as? String + case let field where field == poboxTextField: + row.value?.pobox = value.pointee as? String case let field where field == stateTextField: row.value?.state = value.pointee as? String case let field where field == postalCodeTextField: @@ -294,8 +332,12 @@ open class _PostalAddressCell: Cell, CellType, PostalAd guard !textValue.isEmpty else { switch(textField){ - case let field where field == streetTextField: - row.value?.street = nil + case let field where field == street1TextField: + row.value?.street1 = nil + case let field where field == street2TextField: + row.value?.street2 = nil + case let field where field == poboxTextField: + row.value?.pobox = nil case let field where field == stateTextField: row.value?.state = nil case let field where field == postalCodeTextField: @@ -311,8 +353,12 @@ open class _PostalAddressCell: Cell, CellType, PostalAd } switch(textField){ - case let field where field == streetTextField: - row.value?.street = textValue + case let field where field == street1TextField: + row.value?.street1 = textValue + case let field where field == street2TextField: + row.value?.street2 = textValue + case let field where field == poboxTextField: + row.value?.pobox = textValue case let field where field == stateTextField: row.value?.state = textValue case let field where field == postalCodeTextField: diff --git a/Sources/PostalAddressCell.xib b/Sources/PostalAddressCell.xib index 55fdc95..7384537 100644 --- a/Sources/PostalAddressCell.xib +++ b/Sources/PostalAddressCell.xib @@ -22,6 +22,16 @@ + + + + + + + + + + @@ -56,30 +66,58 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -93,7 +131,9 @@ - + + + diff --git a/Sources/PostalAddressRow.swift b/Sources/PostalAddressRow.swift index 8d92351..ac78c64 100644 --- a/Sources/PostalAddressRow.swift +++ b/Sources/PostalAddressRow.swift @@ -15,7 +15,9 @@ import Eureka * Protocol to be implemented by PostalAddress types. */ public protocol PostalAddressType: Equatable { - var street: String? { get set } + var street1: String? { get set } + var street2: String? { get set } + var pobox: String? { get set } var state: String? { get set } var postalCode: String? { get set } var city: String? { get set } @@ -23,12 +25,14 @@ public protocol PostalAddressType: Equatable { } public func == (lhs: T, rhs: T) -> Bool { - return lhs.street == rhs.street && lhs.state == rhs.state && lhs.postalCode == rhs.postalCode && lhs.city == rhs.city && lhs.country == rhs.country + return lhs.street1 == rhs.street1 && lhs.street2 == rhs.street2 && lhs.pobox == rhs.pobox && lhs.state == rhs.state && lhs.postalCode == rhs.postalCode && lhs.city == rhs.city && lhs.country == rhs.country } /// Row type for PostalAddressRow public struct PostalAddress: PostalAddressType { - public var street: String? + public var street1: String? + public var street2: String? + public var pobox: String? public var state: String? public var postalCode: String? public var city: String? @@ -36,8 +40,10 @@ public struct PostalAddress: PostalAddressType { public init(){} - public init(street: String?, state: String?, postalCode: String?, city: String?, country: String?) { - self.street = street + public init(street1: String?, street2: String?, pobox: String?, state: String?, postalCode: String?, city: String?, country: String?) { + self.street1 = street1 + self.street2 = street2 + self.pobox = pobox self.state = state self.postalCode = postalCode self.city = city @@ -46,8 +52,14 @@ public struct PostalAddress: PostalAddressType { } public protocol PostalAddressFormatterConformance: class { - var streetUseFormatterDuringInput: Bool { get set } - var streetFormatter: Formatter? { get set } + var street1UseFormatterDuringInput: Bool { get set } + var street1Formatter: Formatter? { get set } + + var street2UseFormatterDuringInput: Bool { get set } + var street2Formatter: Formatter? { get set } + + var poboxUseFormatterDuringInput: Bool { get set } + var poboxFormatter: Formatter? { get set } var stateUseFormatterDuringInput: Bool { get set } var stateFormatter: Formatter? { get set } @@ -65,7 +77,9 @@ public protocol PostalAddressFormatterConformance: class { public protocol PostalAddressRowConformance: PostalAddressFormatterConformance { var postalAddressPercentage : CGFloat? { get set } var placeholderColor : UIColor? { get set } - var streetPlaceholder : String? { get set } + var street1Placeholder : String? { get set } + var street2Placeholder : String? { get set } + var poboxPlaceholder : String? { get set } var statePlaceholder : String? { get set } var postalCodePlaceholder : String? { get set } var cityPlaceholder : String? { get set } @@ -85,8 +99,14 @@ open class _PostalAddressRow: Row, PostalAddressRowConform /// The textColor for the textField's placeholder open var placeholderColor : UIColor? - /// The placeholder for the street textField - open var streetPlaceholder : String? + /// The placeholder for the street1 textField + open var street1Placeholder : String? + + /// The placeholder for the street 2textField + open var street2Placeholder : String? + + /// The placeholder for the pobox textField + open var poboxPlaceholder : String? /// The placeholder for the state textField open var statePlaceholder : String? @@ -100,8 +120,14 @@ open class _PostalAddressRow: Row, PostalAddressRowConform /// The placeholder for the country textField open var countryPlaceholder : String? - /// A formatter to be used to format the user's input for street - open var streetFormatter: Formatter? + /// A formatter to be used to format the user's input for street1 + open var street1Formatter: Formatter? + + /// A formatter to be used to format the user's input for street2 + open var street2Formatter: Formatter? + + /// A formatter to be used to format the user's input for pobox + open var poboxFormatter: Formatter? /// A formatter to be used to format the user's input for state open var stateFormatter: Formatter? @@ -115,8 +141,14 @@ open class _PostalAddressRow: Row, PostalAddressRowConform /// A formatter to be used to format the user's input for country open var countryFormatter: Formatter? - /// If the formatter should be used while the user is editing the street. - open var streetUseFormatterDuringInput: Bool + /// If the formatter should be used while the user is editing the street1. + open var street1UseFormatterDuringInput: Bool + + /// If the formatter should be used while the user is editing the street2. + open var street2UseFormatterDuringInput: Bool + + /// If the formatter should be used while the user is editing the street1. + open var poboxUseFormatterDuringInput: Bool /// If the formatter should be used while the user is editing the state. open var stateUseFormatterDuringInput: Bool @@ -131,7 +163,9 @@ open class _PostalAddressRow: Row, PostalAddressRowConform open var countryUseFormatterDuringInput: Bool public required init(tag: String?) { - streetUseFormatterDuringInput = false + street1UseFormatterDuringInput = false + street2UseFormatterDuringInput = false + poboxUseFormatterDuringInput = false stateUseFormatterDuringInput = false postalCodeUseFormatterDuringInput = false cityUseFormatterDuringInput = false diff --git a/Sources/ba b/Sources/ba new file mode 100644 index 0000000..7384537 --- /dev/null +++ b/Sources/ba @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/backup.xib b/Sources/backup.xib new file mode 100644 index 0000000..d9bc5b7 --- /dev/null +++ b/Sources/backup.xib @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 048ca1a60d5147c1b3d27285ac01e098763bce8f Mon Sep 17 00:00:00 2001 From: Kennith Mann Date: Fri, 31 Jan 2020 17:44:02 -0600 Subject: [PATCH 2/2] Deleting backup files and fixing project file to what it was prior --- PostalAddressRow.xcodeproj/project.pbxproj | 32 +---- Sources/ba | 141 --------------------- Sources/backup.xib | 101 --------------- 3 files changed, 4 insertions(+), 270 deletions(-) delete mode 100644 Sources/ba delete mode 100644 Sources/backup.xib diff --git a/PostalAddressRow.xcodeproj/project.pbxproj b/PostalAddressRow.xcodeproj/project.pbxproj index 5e78d34..9740823 100644 --- a/PostalAddressRow.xcodeproj/project.pbxproj +++ b/PostalAddressRow.xcodeproj/project.pbxproj @@ -9,13 +9,10 @@ /* Begin PBXBuildFile section */ 28F828811C494B2C00330CF4 /* PostalAddressRow.h in Headers */ = {isa = PBXBuildFile; fileRef = 28F828801C494B2C00330CF4 /* PostalAddressRow.h */; settings = {ATTRIBUTES = (Public, ); }; }; 28F828881C494B2C00330CF4 /* PostalAddressRow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28F8287D1C494B2C00330CF4 /* PostalAddressRow.framework */; }; + 8F49F8AB1D871ED40058ACF9 /* Eureka.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F49F8AA1D871ED40058ACF9 /* Eureka.framework */; }; 8F58BC761D889B6400F14961 /* PostalAddressCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F58BC751D889B6400F14961 /* PostalAddressCell.swift */; }; 8FDB703D1D871BAD0008694A /* PostalAddressRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FDB703C1D871BAD0008694A /* PostalAddressRow.swift */; }; 8FDB703F1D871C3F0008694A /* PostalAddressCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8FDB703E1D871C3F0008694A /* PostalAddressCell.xib */; }; - AA94F92223E4901D0080C161 /* Eureka.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA94F92123E4901C0080C161 /* Eureka.framework */; }; - AA94F92323E4901D0080C161 /* Eureka.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = AA94F92123E4901C0080C161 /* Eureka.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - AA94F92823E496FF0080C161 /* backup.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA94F92723E496FF0080C161 /* backup.xib */; }; - AA94F92A23E4A5E30080C161 /* ba in Resources */ = {isa = PBXBuildFile; fileRef = AA94F92923E4A5E30080C161 /* ba */; }; CB3F7D691F8BEF7900C856E5 /* PostalAddressRowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5142631F8BEECC00E20AD5 /* PostalAddressRowTests.swift */; }; /* End PBXBuildFile section */ @@ -29,31 +26,15 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - AAFF528723E48EE800C08DF8 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - AA94F92323E4901D0080C161 /* Eureka.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 28F8287D1C494B2C00330CF4 /* PostalAddressRow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PostalAddressRow.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 28F828801C494B2C00330CF4 /* PostalAddressRow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PostalAddressRow.h; sourceTree = ""; }; 28F828821C494B2C00330CF4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 28F828871C494B2C00330CF4 /* PostalAddressRowTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PostalAddressRowTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 8F49F8AA1D871ED40058ACF9 /* Eureka.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Eureka.framework; path = Carthage/Build/iOS/Eureka.framework; sourceTree = ""; }; 8F58BC751D889B6400F14961 /* PostalAddressCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostalAddressCell.swift; sourceTree = ""; }; 8FDB703C1D871BAD0008694A /* PostalAddressRow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostalAddressRow.swift; sourceTree = ""; }; 8FDB703E1D871C3F0008694A /* PostalAddressCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PostalAddressCell.xib; sourceTree = ""; }; - AA94F92123E4901C0080C161 /* Eureka.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Eureka.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - AA94F92723E496FF0080C161 /* backup.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = backup.xib; sourceTree = ""; }; - AA94F92923E4A5E30080C161 /* ba */ = {isa = PBXFileReference; lastKnownFileType = text; path = ba; sourceTree = ""; }; CB5142631F8BEECC00E20AD5 /* PostalAddressRowTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PostalAddressRowTests.swift; sourceTree = SOURCE_ROOT; }; CB5142641F8BEECC00E20AD5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ @@ -63,7 +44,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - AA94F92223E4901D0080C161 /* Eureka.framework in Frameworks */, + 8F49F8AB1D871ED40058ACF9 /* Eureka.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -114,8 +95,6 @@ 8FDB703E1D871C3F0008694A /* PostalAddressCell.xib */, 8FDB703C1D871BAD0008694A /* PostalAddressRow.swift */, 8F58BC751D889B6400F14961 /* PostalAddressCell.swift */, - AA94F92723E496FF0080C161 /* backup.xib */, - AA94F92923E4A5E30080C161 /* ba */, ); path = Sources; sourceTree = ""; @@ -123,7 +102,7 @@ 8F49F8A91D871ED40058ACF9 /* Frameworks */ = { isa = PBXGroup; children = ( - AA94F92123E4901C0080C161 /* Eureka.framework */, + 8F49F8AA1D871ED40058ACF9 /* Eureka.framework */, ); name = Frameworks; sourceTree = ""; @@ -159,7 +138,6 @@ 28F828791C494B2C00330CF4 /* Frameworks */, 28F8287A1C494B2C00330CF4 /* Headers */, 28F8287B1C494B2C00330CF4 /* Resources */, - AAFF528723E48EE800C08DF8 /* Embed Frameworks */, ); buildRules = ( ); @@ -232,8 +210,6 @@ buildActionMask = 2147483647; files = ( 8FDB703F1D871C3F0008694A /* PostalAddressCell.xib in Resources */, - AA94F92823E496FF0080C161 /* backup.xib in Resources */, - AA94F92A23E4A5E30080C161 /* ba in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Sources/ba b/Sources/ba deleted file mode 100644 index 7384537..0000000 --- a/Sources/ba +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Sources/backup.xib b/Sources/backup.xib deleted file mode 100644 index d9bc5b7..0000000 --- a/Sources/backup.xib +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -