From 138ea586d021906aab58dccb1528024ce6eba94e Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Sun, 16 Apr 2023 03:56:08 +0900 Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20=EC=A4=84=20=EB=B0=94=EA=BF=88?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20(#417)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FrontCardCreationCollectionViewCell.swift | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift index ea979254..86b2e720 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift @@ -123,18 +123,22 @@ extension FrontCardCreationCollectionViewCell { mbtiLabel.textColor = .quaternary mbtiLabel.text = "MBTI" - instagramIDTextField.attributedPlaceholder = NSAttributedString(string: "Instagram (@ 제외)", attributes: [ - NSAttributedString.Key.foregroundColor: UIColor.quaternary - ]) - linkURLTextField.attributedPlaceholder = NSAttributedString(string: "URL (Github, Blog 등)", attributes: [ - NSAttributedString.Key.foregroundColor: UIColor.quaternary - ]) - descriptionTextField.attributedPlaceholder = NSAttributedString(string: "학교 전공/동아리 기수 등 (15자)", attributes: [ - NSAttributedString.Key.foregroundColor: UIColor.quaternary - ]) - phoneNumberTextField.attributedPlaceholder = NSAttributedString(string: "전화번호", attributes: [ - NSAttributedString.Key.foregroundColor: UIColor.quaternary - ]) + instagramIDTextField.attributedPlaceholder = NSAttributedString(string: "Instagram (@ 제외)", + attributes: [ + NSAttributedString.Key.foregroundColor: UIColor.quaternary + ]) + linkURLTextField.attributedPlaceholder = NSAttributedString(string: "URL (Github, Blog 등)", + attributes: [ + NSAttributedString.Key.foregroundColor: UIColor.quaternary + ]) + descriptionTextField.attributedPlaceholder = NSAttributedString(string: "학교 전공/동아리 기수 등 (15자)", + attributes: [ + NSAttributedString.Key.foregroundColor: UIColor.quaternary + ]) + phoneNumberTextField.attributedPlaceholder = NSAttributedString(string: "전화번호", + attributes: [ + NSAttributedString.Key.foregroundColor: UIColor.quaternary + ]) _ = requiredTextFieldList.map { $0.font = .textRegular04 From 30c13aa50f8e324d60193148f08c06388ebe8d63 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Sun, 16 Apr 2023 04:10:02 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=EC=A0=84=ED=99=94=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=ED=85=8D=EC=8A=A4=ED=8A=B8=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EC=88=AB=EC=9E=90=20=ED=82=A4=EB=B3=B4=EB=93=9C=EB=A1=9C=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20(#417)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreationCard/FrontCardCreationCollectionViewCell.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift index 86b2e720..108e6262 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift @@ -140,6 +140,8 @@ extension FrontCardCreationCollectionViewCell { NSAttributedString.Key.foregroundColor: UIColor.quaternary ]) + phoneNumberTextField.keyboardType = .numberPad + _ = requiredTextFieldList.map { $0.font = .textRegular04 $0.backgroundColor = .textBox From 05762a72326fd9456b0ef43eada9407e2cf4d157 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Sun, 16 Apr 2023 04:14:03 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=EC=9D=98=20=EA=B8=80=EC=9E=90=EC=88=98=20?= =?UTF-8?q?=EB=B3=80=ED=99=94=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=A0=84?= =?UTF-8?q?=ED=99=94=EB=B2=88=ED=98=B8=20=EA=B5=AC=ED=98=84=20(#417)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FrontCardCreationCollectionViewCell.swift | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift index 108e6262..fbad1419 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CreationCard/FrontCardCreationCollectionViewCell.swift @@ -62,6 +62,7 @@ class FrontCardCreationCollectionViewCell: UICollectionViewCell { registerCell() textFieldDelegate() setNotification() + setAddTargets() } } @@ -223,6 +224,9 @@ extension FrontCardCreationCollectionViewCell { defaultImageIndex: defaultImageIndex)) } } + private func setAddTargets() { + phoneNumberTextField.addTarget(self, action: #selector(phoneNumberTextFieldDidChange), for: .editingChanged) + } static func nib() -> UINib { return UINib(nibName: Const.Xib.frontCardCreationCollectionViewCell, bundle: Bundle(for: FrontCardCreationCollectionViewCell.self)) } @@ -327,6 +331,22 @@ extension FrontCardCreationCollectionViewCell { backgroundSettingCollectionView.deselectItem(at: IndexPath.init(item: 0, section: 0), animated: true) } } + @objc + private func phoneNumberTextFieldDidChange() { + if let text = phoneNumberTextField.text?.replacingOccurrences(of: "-", with: "") { + let textArray = text.map { String($0) } + + if text.count < 10 { + phoneNumberTextField.text = text + } else if text.count == 10 { + phoneNumberTextField.text = textArray[0...2].joined() + "-" + textArray[3...5].joined() + "-" + textArray[6...9].joined() + } else if text.count == 11 { + phoneNumberTextField.text = textArray[0...2].joined() + "-" + textArray[3...6].joined() + "-" + textArray[7...10].joined() + } else { + phoneNumberTextField.text = text + } + } + } } // MARK: - UICollectionViewDelegate From 2cc8d0958a708611d7ebbc9f20293837384b8c42 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Fri, 21 Apr 2023 10:23:32 +0900 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20lottie=20json=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EC=9D=B4=20=EC=9D=B8=EC=8B=9D=EB=90=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EC=95=84=EC=84=9C=20=EA=B5=90=EC=B2=B4=20(#417)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index e57ea831..ed0782d3 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -110,6 +110,8 @@ F805588529C993E7002E8EA3 /* UpdateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F805588429C993E7002E8EA3 /* UpdateViewController.swift */; }; F80975E92990A27400075B93 /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F838B66A298E5C5300D84340 /* Widgets.intentdefinition */; }; F80975EA2990A27900075B93 /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F838B66A298E5C5300D84340 /* Widgets.intentdefinition */; }; + F80C679329F21BB7002C5ECC /* onboarding01.json in Resources */ = {isa = PBXBuildFile; fileRef = F80C679129F21BB7002C5ECC /* onboarding01.json */; }; + F80C679429F21BB7002C5ECC /* onboarding02.json in Resources */ = {isa = PBXBuildFile; fileRef = F80C679229F21BB7002C5ECC /* onboarding02.json */; }; F811720027383097002742CF /* ChangeGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81171FF27383097002742CF /* ChangeGroupRequest.swift */; }; F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; }; F8257750299546920067E145 /* Card.swift in Sources */ = {isa = PBXBuildFile; fileRef = F87122752733046300A24E74 /* Card.swift */; }; @@ -161,8 +163,6 @@ F88C8DE929B8919700196A33 /* ViewModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F88C8DE829B8919700196A33 /* ViewModelType.swift */; }; F8915A22275728F20013D609 /* SelectBirthBottomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8915A20275728F20013D609 /* SelectBirthBottomViewController.swift */; }; F8915A23275728F20013D609 /* SelectMBTIBottomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8915A21275728F20013D609 /* SelectMBTIBottomViewController.swift */; }; - F8A2777929EB1037006CC2AC /* onboarding01.json in Resources */ = {isa = PBXBuildFile; fileRef = F8A2777729EB1037006CC2AC /* onboarding01.json */; }; - F8A2777A29EB1037006CC2AC /* onboarding02.json in Resources */ = {isa = PBXBuildFile; fileRef = F8A2777829EB1037006CC2AC /* onboarding02.json */; }; F8A9FE1A2743DC6B00BC60CE /* CardListInGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A9FE192743DC6B00BC60CE /* CardListInGroupRequest.swift */; }; F8BCDD22298FFA830044D0B4 /* QRCodeWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8BCDD21298FFA830044D0B4 /* QRCodeWidget.swift */; }; F8BCDD24298FFA940044D0B4 /* OpenAppLockScreenWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8BCDD23298FFA940044D0B4 /* OpenAppLockScreenWidget.swift */; }; @@ -348,6 +348,8 @@ 78FC1ADEA3CAB995C08D47DB /* Pods-NADA-iOS-forRelease.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.release.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.release.xcconfig"; sourceTree = ""; }; D86FBA2B7966CFE6EEF0E7E8 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F805588429C993E7002E8EA3 /* UpdateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateViewController.swift; sourceTree = ""; }; + F80C679129F21BB7002C5ECC /* onboarding01.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = onboarding01.json; sourceTree = ""; }; + F80C679229F21BB7002C5ECC /* onboarding02.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = onboarding02.json; sourceTree = ""; }; F81171FF27383097002742CF /* ChangeGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeGroupRequest.swift; sourceTree = ""; }; F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; F8268DB827730B0100BF114B /* FirstCardAlertBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstCardAlertBottomSheetViewController.swift; sourceTree = ""; }; @@ -402,8 +404,6 @@ F88C8DE829B8919700196A33 /* ViewModelType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModelType.swift; sourceTree = ""; }; F8915A20275728F20013D609 /* SelectBirthBottomViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectBirthBottomViewController.swift; sourceTree = ""; }; F8915A21275728F20013D609 /* SelectMBTIBottomViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectMBTIBottomViewController.swift; sourceTree = ""; }; - F8A2777729EB1037006CC2AC /* onboarding01.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = onboarding01.json; path = ../../../../onboarding01.json; sourceTree = ""; }; - F8A2777829EB1037006CC2AC /* onboarding02.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = onboarding02.json; path = ../../../../onboarding02.json; sourceTree = ""; }; F8A9FE192743DC6B00BC60CE /* CardListInGroupRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardListInGroupRequest.swift; sourceTree = ""; }; F8BCDD21298FFA830044D0B4 /* QRCodeWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeWidget.swift; sourceTree = ""; }; F8BCDD23298FFA940044D0B4 /* OpenAppLockScreenWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenAppLockScreenWidget.swift; sourceTree = ""; }; @@ -982,8 +982,8 @@ isa = PBXGroup; children = ( F8562C95296ADD1000DA1109 /* nearby.json */, - F8A2777729EB1037006CC2AC /* onboarding01.json */, - F8A2777829EB1037006CC2AC /* onboarding02.json */, + F80C679129F21BB7002C5ECC /* onboarding01.json */, + F80C679229F21BB7002C5ECC /* onboarding02.json */, ); path = Lottie; sourceTree = ""; @@ -1528,7 +1528,6 @@ files = ( F8518058275D042B006BD5ED /* Onboarding.storyboard in Resources */, F8FC43BF26C025180033E151 /* .swiftlint.yml in Resources */, - F8A2777929EB1037006CC2AC /* onboarding01.json in Resources */, F88101F92987CBAF007266B5 /* GoogleService-Info.plist in Resources */, 397B75142763A916004AEB03 /* OpenSourceTableViewCell.xib in Resources */, F85711A7274A6B3400F59F0B /* CardCreationPreview.storyboard in Resources */, @@ -1540,6 +1539,7 @@ F858079F2700354E00872484 /* BackgroundCollectionViewCell.xib in Resources */, F84BAFAE26FDB543004CA335 /* FrontCardCreationCollectionViewCell.xib in Resources */, 3958F23C270FFBD500B100B2 /* Group.storyboard in Resources */, + F80C679429F21BB7002C5ECC /* onboarding02.json in Resources */, F83206AB26F61E3700D61711 /* FrontCardCell.xib in Resources */, 394F314F27081B4C00C83291 /* Front.storyboard in Resources */, 3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */, @@ -1552,6 +1552,7 @@ 397B75172763B5B7004AEB03 /* TeamNADA.storyboard in Resources */, 3936993B274A53C600684420 /* GroupEdit.storyboard in Resources */, 3903CC212769F4F40094C458 /* EmptyCardCell.xib in Resources */, + F80C679329F21BB7002C5ECC /* onboarding01.json in Resources */, 39D88B642745FDD400A72164 /* TabBar.storyboard in Resources */, F8562C96296ADD1000DA1109 /* nearby.json in Resources */, 7766A410274FEBE200714912 /* CardInGroupCollectionViewCell.xib in Resources */, @@ -1572,7 +1573,6 @@ 39369937274A4FCB00684420 /* NotoSansCJKkr-Medium.otf in Resources */, 392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */, 7770315927500C49002CBD19 /* QRScan.storyboard in Resources */, - F8A2777A29EB1037006CC2AC /* onboarding02.json in Resources */, 390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; From f74adf7cdf02ec06ecc6da5c0b720cc5e222dfeb Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Fri, 21 Apr 2023 10:23:44 +0900 Subject: [PATCH 5/5] chore: pod update (#417) --- Podfile.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 47ea603a..b24ed21e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -20,17 +20,17 @@ PODS: - GoogleUtilities/Environment - "GoogleUtilities/NSData+zlib (7.11.1)" - IQKeyboardManagerSwift (6.5.11) - - KakaoSDKAuth (2.14.0): - - KakaoSDKCommon (= 2.14.0) - - KakaoSDKCommon (2.14.0): - - KakaoSDKCommon/Common (= 2.14.0) - - KakaoSDKCommon/Network (= 2.14.0) - - KakaoSDKCommon/Common (2.14.0) - - KakaoSDKCommon/Network (2.14.0): + - KakaoSDKAuth (2.15.0): + - KakaoSDKCommon (= 2.15.0) + - KakaoSDKCommon (2.15.0): + - KakaoSDKCommon/Common (= 2.15.0) + - KakaoSDKCommon/Network (= 2.15.0) + - KakaoSDKCommon/Common (2.15.0) + - KakaoSDKCommon/Network (2.15.0): - Alamofire (~> 5.1) - - KakaoSDKCommon/Common (= 2.14.0) - - KakaoSDKUser (2.14.0): - - KakaoSDKAuth (= 2.14.0) + - KakaoSDKCommon/Common (= 2.15.0) + - KakaoSDKUser (2.15.0): + - KakaoSDKAuth (= 2.15.0) - Kingfisher (7.6.2) - lottie-ios (4.1.3) - Moya (15.0.0): @@ -120,9 +120,9 @@ SPEC CHECKSUMS: FlexLayout: 8010187077ecf09710cdf0e9c8ffe2c9b92ec5db GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749 IQKeyboardManagerSwift: c7955c0bdbf7b2eb29bb7daaa44e3d90f55a9a85 - KakaoSDKAuth: 8fca87815de22062a23297983f327613b087b8bb - KakaoSDKCommon: 0ce638f7a2e49704943c0b74a087a9f8067bba1c - KakaoSDKUser: 2ca18314ce72e6690f76cb1f6f9fbc771d31a803 + KakaoSDKAuth: 0fe5cf1756e8a9f66f8fc77826061aafa93034f3 + KakaoSDKCommon: 89d863b7f34398e6fb93a0acb28a204908551a39 + KakaoSDKUser: a997ca5c4c18ece2ab30646ff74841bc29d4399d Kingfisher: 6c5449c6450c5239166510ba04afe374a98afc4f lottie-ios: d0954d3150061f662ed0adf96ef98d7421864c47 Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee