From 74d153dc4ef113e1c7153c90b4df1bd7624250fe Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Fri, 26 Nov 2021 16:40:37 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[ADD]=20#78=20-=20=EB=AA=85=ED=95=A8?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B7=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Descriptions - iconArrow 다크모드 에셋 추가 - alert 창 extension - FrontCardCell, RequiredFlavorCollectionViewCell 다크모드 적용 - BackgroundCollectionViewCell 수정 뷰 적용 - Front & BackCardCreationCollectionViewCell 수정 뷰 적용 ### fixme - @IBDesignable 에러 수정해야함 ### todo - 버튼 iOS 13,15 대응 --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 11 +- .../iconArrow.imageset/Contents.json | 45 +++++- .../iconArrow.imageset/iconArrow-1.png | Bin 0 -> 231 bytes .../iconArrow.imageset/iconArrow@2x-1.png | Bin 0 -> 464 bytes .../iconArrow.imageset/iconArrow@3x-1.png | Bin 0 -> 623 bytes .../UIViewController+Extension.swift | 50 ++++++- .../CardCreation/CardCreation.storyboard | 18 +-- .../CardCreationPreview.storyboard | 4 +- .../Cells/CardCell/FrontCardCell.swift | 16 +-- .../BackCardCreationCollectionViewCell.swift | 30 ++-- .../BackgroundCollectionViewCell.swift | 33 +++-- .../BackgroundCollectionViewCell.xib | 8 +- .../FrontCardCreationCollectionViewCell.swift | 26 ++-- .../FrontCardCreationCollectionViewCell.xib | 28 ++-- .../RequiredFlavorCollectionViewCell.swift | 8 +- .../CardCreationViewController.swift | 130 ++++++++++-------- .../CardList/CardListViewController.swift | 4 +- .../GroupEdit/GroupEditViewController.swift | 4 +- 18 files changed, 255 insertions(+), 160 deletions(-) create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow-1.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@2x-1.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow@3x-1.png diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 3a490c82..e717dc27 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -39,7 +39,6 @@ 39811490273BEBCE00E28630 /* CardListRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3981148F273BEBCE00E28630 /* CardListRequest.swift */; }; 398413B7274A7A1E005550BC /* AddGroupBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398413B6274A7A1E005550BC /* AddGroupBottomSheetViewController.swift */; }; 399C55DF2711949D00845A54 /* CGPoint+Distance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 399C55DE2711949D00845A54 /* CGPoint+Distance.swift */; }; - 39A8DEA3274E6436005DE7C8 /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39A8DEA2274E6436005DE7C8 /* UITextField+Extension.swift */; }; 39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C1E88E270EC762006D2089 /* UIColor+Extension.swift */; }; 39D13565273FDB9C00B1A148 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D13564273FDB9C00B1A148 /* User.swift */; }; 39D13568273FDCB800B1A148 /* UserWithTokenRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39D13567273FDCB800B1A148 /* UserWithTokenRequest.swift */; }; @@ -58,7 +57,6 @@ 77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */; }; DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; }; F811720027383097002742CF /* ChangeGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81171FF27383097002742CF /* ChangeGroupRequest.swift */; }; - F81A6833274F49A700B80A4F /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81A6832274F49A700B80A4F /* UITextField+Extension.swift */; }; F822E7A92709CEB60020452C /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = F822E7A82709CEB60020452C /* Notification.swift */; }; F82FF81D2701EBCE00E57F8B /* CardCreation.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */; }; F82FF8252702000000E57F8B /* RequiredFlavorCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F82FF8232702000000E57F8B /* RequiredFlavorCollectionViewCell.swift */; }; @@ -76,6 +74,7 @@ F858079F2700354E00872484 /* BackgroundCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F858079D2700354E00872484 /* BackgroundCollectionViewCell.xib */; }; F87122762733046300A24E74 /* Card.swift in Sources */ = {isa = PBXBuildFile; fileRef = F87122752733046300A24E74 /* Card.swift */; }; F871227827330A3800A24E74 /* CardCreationRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F871227727330A3800A24E74 /* CardCreationRequest.swift */; }; + F8719DDB274F92E90081AD51 /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8719DDA274F92E90081AD51 /* UITextField+Extension.swift */; }; F8A9FE1A2743DC6B00BC60CE /* CardListInGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A9FE192743DC6B00BC60CE /* CardListInGroupRequest.swift */; }; F8C310C0273A7360008EC5BA /* FrontCardCreationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C310BF273A7360008EC5BA /* FrontCardCreationDelegate.swift */; }; F8C83FAE272F99940009DF0D /* MoyaLoggerPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C83FAD272F99940009DF0D /* MoyaLoggerPlugin.swift */; }; @@ -138,7 +137,6 @@ 3981148F273BEBCE00E28630 /* CardListRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListRequest.swift; sourceTree = ""; }; 398413B6274A7A1E005550BC /* AddGroupBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddGroupBottomSheetViewController.swift; sourceTree = ""; }; 399C55DE2711949D00845A54 /* CGPoint+Distance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGPoint+Distance.swift"; sourceTree = ""; }; - 39A8DEA2274E6436005DE7C8 /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = ""; }; 39C1E88E270EC762006D2089 /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = ""; }; 39D13564273FDB9C00B1A148 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = ""; }; 39D13567273FDCB800B1A148 /* UserWithTokenRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserWithTokenRequest.swift; sourceTree = ""; }; @@ -158,7 +156,6 @@ 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardAddInGroupRequest.swift; sourceTree = ""; }; 7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = ""; }; F81171FF27383097002742CF /* ChangeGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeGroupRequest.swift; sourceTree = ""; }; - F81A6832274F49A700B80A4F /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = ""; }; F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; F82FF81C2701EBCE00E57F8B /* CardCreation.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreation.storyboard; sourceTree = ""; }; F82FF8232702000000E57F8B /* RequiredFlavorCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RequiredFlavorCollectionViewCell.swift; sourceTree = ""; }; @@ -176,6 +173,7 @@ F858079D2700354E00872484 /* BackgroundCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackgroundCollectionViewCell.xib; sourceTree = ""; }; F87122752733046300A24E74 /* Card.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Card.swift; sourceTree = ""; }; F871227727330A3800A24E74 /* CardCreationRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationRequest.swift; sourceTree = ""; }; + F8719DDA274F92E90081AD51 /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = ""; }; F8A9FE192743DC6B00BC60CE /* CardListInGroupRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardListInGroupRequest.swift; sourceTree = ""; }; F8C310BF273A7360008EC5BA /* FrontCardCreationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrontCardCreationDelegate.swift; sourceTree = ""; }; F8C83FAD272F99940009DF0D /* MoyaLoggerPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoyaLoggerPlugin.swift; sourceTree = ""; }; @@ -705,12 +703,11 @@ children = ( 3909242E26FA15E800236C51 /* UIView+Extension.swift */, 39488E342706E17200BDC917 /* UIAlertController+Extension.swift */, - 39A8DEA2274E6436005DE7C8 /* UITextField+Extension.swift */, 39007F2B27080D8200E7143E /* UIViewController+Extension.swift */, 39D2E12F270B43DA00AD0889 /* UIFont+Extension.swift */, 39C1E88E270EC762006D2089 /* UIColor+Extension.swift */, 399C55DE2711949D00845A54 /* CGPoint+Distance.swift */, - F81A6832274F49A700B80A4F /* UITextField+Extension.swift */, + F8719DDA274F92E90081AD51 /* UITextField+Extension.swift */, ); path = Extensions; sourceTree = ""; @@ -881,7 +878,6 @@ F8C83FB6272F9E380009DF0D /* UtilService.swift in Sources */, 3958F239270FFBBF00B100B2 /* GroupViewController.swift in Sources */, 3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */, - 39A8DEA3274E6436005DE7C8 /* UITextField+Extension.swift in Sources */, 39523E09270184A700536900 /* CardListViewController.swift in Sources */, F85711A5274A6B2200F59F0B /* CardCreationPreviewViewController.swift in Sources */, 777FF89B27359B7800BF69D3 /* Groups.swift in Sources */, @@ -911,6 +907,7 @@ F8C83FBB272F9F370009DF0D /* NetworkResult.swift in Sources */, 39D2E130270B43DA00AD0889 /* UIFont+Extension.swift in Sources */, 39523E5B2701A48900536900 /* CardListTableViewCell.swift in Sources */, + F8719DDB274F92E90081AD51 /* UITextField+Extension.swift in Sources */, F8A9FE1A2743DC6B00BC60CE /* CardListInGroupRequest.swift in Sources */, 3981148E273BEBB300E28630 /* CardListEditRequest.swift in Sources */, 39D88B6B274600B100A72164 /* CommonBottomSheetViewController.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json index 7085ad59..69394fb8 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/Contents.json @@ -1,23 +1,56 @@ { "images" : [ { - "idiom" : "universal", "filename" : "iconArrow.png", + "idiom" : "universal", "scale" : "1x" }, { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "iconArrow-1.png", "idiom" : "universal", - "scale" : "2x", - "filename" : "iconArrow@2x.png" + "scale" : "1x" }, { + "filename" : "iconArrow@2x.png", "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "iconArrow@2x-1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { "filename" : "iconArrow@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "iconArrow@3x-1.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconArrow.imageset/iconArrow-1.png new file mode 100644 index 0000000000000000000000000000000000000000..b6363df364bf9a5e354818f6f208d488b90082b5 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-1!HlL zyA#8@b22Z19F}xPUq=Rpjs4tz5?O)#8c!F;kP61P=Xdiq81S%M5EeG%lHR~1%^P0sk`;R zd|lTe^P)?NfgitaNP7GJIn!ExZ{FM^caD0mQCZotC*;C6jgLkO?W0WbcEP){3TV@+?S?tUtijE83LtX{%!gFbB^#H*-o4!Sm5+!31XuQ zSnFbiLhaX^F!+52Ps$>okzIIIOck8so4|0%?uII{8@D8i$DoDvH+&t#O!mAn(Faqji9B znEWFaXm{Zn=O$Eshz#BTOFU5hc-<{r6vA%OTfNQmd`Mu#169G_G+erm7)d-(w!L-j z$)7h|4i~ArABsgWPAEBRxcs3$=Q@;{Gq=(0r-s5v-G8hqixg+vp(s+kftiv>aYwES zBE=utgGa(R_5qHBb8rY63G3(?FcRM71+YkvSMZP`LEaC_`u%a658Sl3c11# Void)? = nil, - deleteAction: ((UIAlertAction) -> Void)?, - completion: (() -> Void)? = nil) { + /// 취소+삭제 UIAlertController + func makeCancelDeleteAlert(title: String, + message: String, + cancelAction: ((UIAlertAction) -> Void)? = nil, + deleteAction: ((UIAlertAction) -> Void)?, + completion: (() -> Void)? = nil) { - let alertViewController = UIAlertController(title: title, message: message, preferredStyle: .alert) + let alertViewController = UIAlertController(title: title, + message: message, + preferredStyle: .alert) + // FIXME: - 민재선배 아래주석 삭제해도 되나요?? // alertViewController.setTitle(font: UIFont.boldSystemFont(ofSize: 17), color: UIColor.white) // alertViewController.setMessage(font: UIFont.systemFont(ofSize: 13), color: UIColor.white) // alertViewController.setTint(color: .mainBlue) @@ -34,4 +37,37 @@ extension UIViewController { self.present(alertViewController, animated: true, completion: completion) } + /// 확인+취소 UIAlertController + func makeOKCancelAlert(title: String, + message: String, + okAction: ((UIAlertAction) -> Void)?, + cancelAction: ((UIAlertAction) -> Void)? = nil, + completion: (() -> Void)? = nil) { + let alertViewController = UIAlertController(title: title, + message: message, + preferredStyle: .alert) + + let okAction = UIAlertAction(title: "확인", style: .default, handler: okAction) + alertViewController.addAction(okAction) + + let cancelAction = UIAlertAction(title: "취소", style: .cancel, handler: cancelAction) + alertViewController.addAction(cancelAction) + + self.present(alertViewController, animated: true, completion: completion) + } + + /// 확인 UIAlertController + func makeOKAlert(title: String, + message: String, + okAction: ((UIAlertAction) -> Void)? = nil, + completion: (() -> Void)? = nil) { + let alertViewController = UIAlertController(title: title, + message: message, + preferredStyle: .alert) + + let okAction = UIAlertAction(title: "확인", style: .default, handler: okAction) + alertViewController.addAction(okAction) + + self.present(alertViewController, animated: true, completion: completion) + } } diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreation.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreation.storyboard index 786a6e32..75b9e826 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreation.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreation.storyboard @@ -1,6 +1,6 @@ - + @@ -15,11 +15,11 @@ - + - + - + @@ -110,9 +110,9 @@ - - - + + + diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreationPreview.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreationPreview.storyboard index 04a7df80..519a328e 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreationPreview.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/CardCreation/CardCreationPreview.storyboard @@ -69,7 +69,7 @@