From fffddbdd00c3271ea1bfac5524552e2b619adca6 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 15 Mar 2023 21:46:18 +0900 Subject: [PATCH 01/13] =?UTF-8?q?chore:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=97=90=EC=85=8B=20=EC=B6=94=EA=B0=80=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 체크 박스 비체크 이미지 - 체크 박스 체크 이미지 - 업데이트 카드 이미지 --- .../icnCheckboxFilled.imageset/Contents.json | 23 ++++++++++++++++++ .../icnCheckboxFilled.png | Bin 0 -> 213 bytes .../icnCheckboxFilled@2x.png | Bin 0 -> 274 bytes .../icnCheckboxFilled@3x.png | Bin 0 -> 305 bytes .../Contents.json | 23 ++++++++++++++++++ .../icnCheckboxUnfilled.png | Bin 0 -> 168 bytes .../icnCheckboxUnfilled@2x.png | Bin 0 -> 195 bytes .../icnCheckboxUnfilled@3x.png | Bin 0 -> 228 bytes .../imgUpdate.imageset/Contents.json | 23 ++++++++++++++++++ .../imgUpdate.imageset/imgUpdate.png | Bin 0 -> 3049 bytes .../imgUpdate.imageset/imgUpdate@2x.png | Bin 0 -> 5829 bytes .../imgUpdate.imageset/imgUpdate@3x.png | Bin 0 -> 8985 bytes 12 files changed, 69 insertions(+) create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/icnCheckboxFilled.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/icnCheckboxFilled@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/icnCheckboxFilled@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/icnCheckboxUnfilled.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/icnCheckboxUnfilled@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/icnCheckboxUnfilled@3x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/imgUpdate.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/imgUpdate@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/imgUpdate@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/Contents.json new file mode 100644 index 00000000..f5663a8a --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "scale" : "1x", + "filename" : "icnCheckboxFilled.png", + "idiom" : "universal" + }, + { + "scale" : "2x", + "filename" : "icnCheckboxFilled@2x.png", + "idiom" : "universal" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "icnCheckboxFilled@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/icnCheckboxFilled.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/icnCheckboxFilled.png new file mode 100644 index 0000000000000000000000000000000000000000..80a5d9f953ecaee03ba70b1be26b87cf2e5780ec GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFS;1lBNUf`3KQwB!~1r4d$r9f_KRw)nx8P>kFvw(`ZN`m}?8R{D@PY~Gf zKEXibNcUo(sEwzKV+hCfiNvvgKhoH*Vi0r9NA~OUT rMHsZr<|?oz>hQT_xThXi>%h*?A*HE#_pp@?&>RL&S3j3^P6NS%G}U;vjb? zhIQv;UIICa0X`wF?gc(+Ib|S}U6xi*mI`L4W|gMqfDlmJ=8O6bpkl6)AirRS`WFin z4y`wcn2;0vz5ys&>FMGaqH#VsVF6b`EGxTaLZeR0fuIcsv{W2cIkOV literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/icnCheckboxFilled@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxFilled.imageset/icnCheckboxFilled@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..16aae69bbda555fa89fc6fc0c84e3af6bd584d3d GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)ISkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?sl*2Ka=yx)=Cl6jY?;l%?mC0m)P_xpe)KZ$JfXB|(0{45AGe-f!2M8kzzW zS>fs87-Dhy>=j48W(9%PhX=nf%=pHz=FaZIyLzuUefS$r{p}C%P@l_wPUrTCQ$L=v zD=S@$Y>y5yEjwS}eYV12Pt*;`TfZ|mEBuwXR(BzBNjKMO^8}Tk<)<8%>;2>GJ8)3Y zLZIVsOXGpL>m(F*a5By4^7_P^@Nt4LCxe#~qg|e#ibKcKqzm7aC$NaRaJ&i^vP#b0 u{xg3*|Dl}5N}e;#k7qr3>Hj;tf|)Vl;p=~D&z=C?%;4$j=d#Wzp$Py)hj(TG literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/Contents.json new file mode 100644 index 00000000..b81f6d5b --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "icnCheckboxUnfilled.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x", + "filename" : "icnCheckboxUnfilled@2x.png" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "icnCheckboxUnfilled@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/icnCheckboxUnfilled.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/icnCheckboxUnfilled.png new file mode 100644 index 0000000000000000000000000000000000000000..d1435e0ba947f7b76c01785cbd1be6ddf686c1ac GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF3QC5yQ4Ls^>3IU8pa~y?qrWik9JG9neyDUTKOYV~~2OI5xS{OWC{an^L HB{Ts57i=%8 literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/icnCheckboxUnfilled@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/icnCheckboxUnfilled@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d2a51e8786df7c4c2726a384e8ccda3d2bb60561 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIBn0X`wF?gc*SIc2FiWhn(EX*p#;l)m#FP?CYQB*-tAVg6Bt^~nbIc jI3HkA<6umE<)XvzK16>1xjD;rfz0-F^>bP0l+XkKxkfgn literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/icnCheckboxUnfilled@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnCheckboxUnfilled.imageset/icnCheckboxUnfilled@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..178b54a037c9dc671503baa0bd0dfbd256c4d4ef GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)ISkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?sl*2Ka=yx)=DQWtXKCl%(YV$%@pRG9aVGF8&8l0b5CsUogW4h4%v2^=2di z1sI||T^vI!PA4ZwtZDGH;AK_Oa!{Re`9gzWh!an&lAuMd;0 zIoPDq`07+(XCUV*4~qpVbt;^SDV***S|r_8sZHT6NRv@B(QV^u-WI~Zpr@Mj`Ofo; QlR)-(y85}Sb4q9e0NT+-J^%m! literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/Contents.json new file mode 100644 index 00000000..159a7541 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "imgUpdate.png", + "scale" : "1x", + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "imgUpdate@2x.png", + "scale" : "2x" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "imgUpdate@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/imgUpdate.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/imgUpdate.png new file mode 100644 index 0000000000000000000000000000000000000000..3d4ad25870c4a78eeace2ee8c8b1735d823e3305 GIT binary patch literal 3049 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 literal 0 HcmV?d00001 diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/imgUpdate@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgUpdate.imageset/imgUpdate@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3f54eb7bdad4667e1edfede7a0b7d34696fbcf3d GIT binary patch literal 5829 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%0DkE zUyJrhakjrv(_!CG`@N#;r9V0CaiZult&>TDFFvr({h4JAVNb5Nq?#}Q-MxbE&U>;) z20s)eK~R_!s5iCA2tdBMr(Ru^NxzJyca6Bu#P1-Avm0OkiHp_pS9d(wEGcqlaD)^- zYtgfsa)9q4q;81@w@gyh$|6NyD!t@epEQP_rBvInZQ;s%Cw#B|J*09x+7!^6tMRjO zL}cepVJIIM^bvPn!b-YwSbiPthwFCCStzV73WQ1OHyTSD|0%tD8&q*X6t4U<-M7|n zVe4A5S-r&gxpwjQqM&vC?{7|;TTOMwhnV|@b5EW;jFXlrnzs2lX~$c}WY(KHx98FF zI!8nH9lY07PrgV8&YLrs#i(xWEX*18;k$--@zbM^ME77YiUNBT%AMZu$ z;>e4cf8I_I8L?uYxp}CRgeYoTTh#wNIO;D;T|+*FpQZ84ufaJy@=C!y+uTVnshucU z6WDM}F^d@mS(X#*%F4fDOHLK)52KalihZe`MHbJ`I*(f^og$!*vF;0b6&|(Q^QSYf zWV|;xwv@-aaoJs^HvFEff{Xfct{gF*baPBx-~JwKcF(q&SD5OrSQLX;JHlo~MR>D* zJgUuh`)nQo`MWiRAdagkw0cKx8|w1!)>@p+Yd+s73>o0s-y9PBo6C~}chVQHsf}e} zGIV@*iv3n^@}UOaEx`RlG1F#{kM@u&`fk>AA3W!S!Mmcoa=4Bwmq3-^Oc}hoz(v!i zxNE>^)tYx+Zd*IyIlUmhN#7nWJ11m0LoZH4lj=&`3A2GvAnCSkDImXVc zOEf9Z&$g#bY)fXsGwS{J Date: Tue, 21 Mar 2023 00:30:12 +0900 Subject: [PATCH 02/13] chore: pod update (#381) --- Podfile | 35 ++++++++++++++++++----------------- Podfile.lock | 8 ++++++-- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Podfile b/Podfile index e0f1e6e3..8f4d53d9 100644 --- a/Podfile +++ b/Podfile @@ -6,21 +6,22 @@ target 'NADA-iOS-forRelease' do use_frameworks! # Pods for NADA-iOS-forRelease -pod 'Moya' -pod 'SkeletonView' -pod 'SwiftLint' -pod 'VerticalCardSwiper' -pod 'KakaoSDKCommon' -pod 'KakaoSDKUser' -pod 'KakaoSDKAuth' -pod 'IQKeyboardManagerSwift' -pod 'Kingfisher' -pod 'NVActivityIndicatorView' -pod 'Firebase/DynamicLinks' -pod 'lottie-ios' -pod 'Then' -pod 'SnapKit' -pod 'RxSwift' -pod 'RxCocoa' -pod 'Moya/RxSwift' + pod 'Moya' + pod 'SkeletonView' + pod 'SwiftLint' + pod 'VerticalCardSwiper' + pod 'KakaoSDKCommon' + pod 'KakaoSDKUser' + pod 'KakaoSDKAuth' + pod 'IQKeyboardManagerSwift' + pod 'Kingfisher' + pod 'NVActivityIndicatorView' + pod 'Firebase/DynamicLinks' + pod 'lottie-ios' + pod 'Then' + pod 'SnapKit' + pod 'RxSwift' + pod 'RxCocoa' + pod 'Moya/RxSwift' + pod 'FlexLayout' end diff --git a/Podfile.lock b/Podfile.lock index b4db65f2..8732bb7f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -13,6 +13,7 @@ PODS: - "GoogleUtilities/NSData+zlib (~> 7.8)" - FirebaseDynamicLinks (10.6.0): - FirebaseCore (~> 10.0) + - FlexLayout (1.3.30) - GoogleUtilities/Environment (7.11.0): - PromisesObjC (< 3.0, >= 1.2) - GoogleUtilities/Logger (7.11.0): @@ -57,6 +58,7 @@ PODS: DEPENDENCIES: - Firebase/DynamicLinks + - FlexLayout - IQKeyboardManagerSwift - KakaoSDKAuth - KakaoSDKCommon @@ -81,6 +83,7 @@ SPEC REPOS: - FirebaseCore - FirebaseCoreInternal - FirebaseDynamicLinks + - FlexLayout - GoogleUtilities - IQKeyboardManagerSwift - KakaoSDKAuth @@ -106,6 +109,7 @@ SPEC CHECKSUMS: FirebaseCore: fa80ad16a62d52f67274b5b88304c3a318bbf9a4 FirebaseCoreInternal: c7cd505e2136811096b225ac388d6254a2622362 FirebaseDynamicLinks: 99c501143953e925681a37aade96bb2db34b30ca + FlexLayout: 6651ad721f521c29d50bc724788488c84e0bc32a GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f IQKeyboardManagerSwift: c7955c0bdbf7b2eb29bb7daaa44e3d90f55a9a85 KakaoSDKAuth: 8fca87815de22062a23297983f327613b087b8bb @@ -125,6 +129,6 @@ SPEC CHECKSUMS: Then: 844265ae87834bbe1147d91d5d41a404da2ec27d VerticalCardSwiper: 68df635b354500f86934ea044ade37a264c044c6 -PODFILE CHECKSUM: 5ebc024c28ae32feda47b0ba7819929a4d97ca6c +PODFILE CHECKSUM: 21a7f8b252714d69ca9015c958692d0cc0e5e2cb -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.0 From 5f8e44a71aee6c92aeeea0b005ee4ee5cb14ddce Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Tue, 21 Mar 2023 16:46:47 +0900 Subject: [PATCH 03/13] =?UTF-8?q?chore:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=97=90=EC=85=8B=20=EC=B6=94=EA=B0=80=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 업데이트 버튼 이미지 --- .../btnMainGoUpdate.imageset/Contents.json | 23 ++++++++++++++++++ .../btnMainGoUpdate.png | Bin 0 -> 918 bytes .../btnMainGoUpdate@2x.png | Bin 0 -> 1551 bytes .../btnMainGoUpdate@3x.png | Bin 0 -> 2121 bytes 4 files changed, 23 insertions(+) create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainGoUpdate.imageset/Contents.json create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainGoUpdate.imageset/btnMainGoUpdate.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainGoUpdate.imageset/btnMainGoUpdate@2x.png create mode 100644 NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainGoUpdate.imageset/btnMainGoUpdate@3x.png diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainGoUpdate.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainGoUpdate.imageset/Contents.json new file mode 100644 index 00000000..e46f76a6 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainGoUpdate.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "btnMainGoUpdate.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "btnMainGoUpdate@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "btnMainGoUpdate@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainGoUpdate.imageset/btnMainGoUpdate.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/btnMainGoUpdate.imageset/btnMainGoUpdate.png new file mode 100644 index 0000000000000000000000000000000000000000..a028f62bc0043dcf4c9b7f4bd2c9baa0bb0afeae GIT binary patch literal 918 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 Date: Tue, 21 Mar 2023 16:47:37 +0900 Subject: [PATCH 04/13] =?UTF-8?q?add:=20UpdateViewController=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NADA-iOS-forRelease.xcodeproj/project.pbxproj | 20 +++++++++++++++++++ .../Update/VC/UpdateViewController.swift | 16 +++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index a7a7da83..fef5c2ee 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -97,6 +97,7 @@ 77F2C0ED27632AA7007641E3 /* CardHarmony.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 77F2C0EC27632AA7007641E3 /* CardHarmony.storyboard */; }; 77F47D93276C79B600414659 /* Header.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F47D92276C79B600414659 /* Header.swift */; }; DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; }; + 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 */; }; F811720027383097002742CF /* ChangeGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81171FF27383097002742CF /* ChangeGroupRequest.swift */; }; @@ -320,6 +321,7 @@ 77F2C0EC27632AA7007641E3 /* CardHarmony.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardHarmony.storyboard; sourceTree = ""; }; 77F47D92276C79B600414659 /* Header.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Header.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 = ""; }; + F805588429C993E7002E8EA3 /* UpdateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateViewController.swift; 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 = ""; }; @@ -761,6 +763,22 @@ path = VC; sourceTree = ""; }; + F805588329C993D0002E8EA3 /* Update */ = { + isa = PBXGroup; + children = ( + F805588629C993EF002E8EA3 /* VC */, + ); + path = Update; + sourceTree = ""; + }; + F805588629C993EF002E8EA3 /* VC */ = { + isa = PBXGroup; + children = ( + F805588429C993E7002E8EA3 /* UpdateViewController.swift */, + ); + path = VC; + sourceTree = ""; + }; F82FF8222701FFE300E57F8B /* RequiredFlavor */ = { isa = PBXGroup; children = ( @@ -1139,6 +1157,7 @@ F8FC43A026C01F040033E151 /* ViewControllers */ = { isa = PBXGroup; children = ( + F805588329C993D0002E8EA3 /* Update */, 77B4E7492990E4FC006098DC /* Home */, 397B750E2763A5DD004AEB03 /* OpenSource */, 397B75182763B5DA004AEB03 /* TeamNADA */, @@ -1608,6 +1627,7 @@ 77703157275005AA002CBD19 /* CardResultBottomSheetViewController.swift in Sources */, F8D74DD8276C7FB60071E5FC /* UIImageView+Extension.swift in Sources */, 39D13565273FDB9C00B1A148 /* User.swift in Sources */, + F805588529C993E7002E8EA3 /* UpdateViewController.swift in Sources */, 77812947275F6EA3004B34F4 /* CardDetailViewController.swift in Sources */, F822E7A92709CEB60020452C /* Notification.swift in Sources */, F8C83FC5272FA2940009DF0D /* CardAPI.swift in Sources */, diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift new file mode 100644 index 00000000..ee215abc --- /dev/null +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift @@ -0,0 +1,16 @@ +// +// UpdateViewController.swift +// NADA-iOS-forRelease +// +// Created by kimhyungyu on 2023/03/21. +// + +import UIKit + +import FlexLayout + +class UpdateViewController: UIViewController { + override func viewDidLoad() { + super.viewDidLoad() + } +} From 2177b3d4dda451383d9dddba0a4c2f30ae1704be Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Tue, 21 Mar 2023 16:50:36 +0900 Subject: [PATCH 05/13] =?UTF-8?q?feat:=20Components=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EB=B0=8F=20=EC=B4=88=EA=B8=B0=20UI=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Update/VC/UpdateViewController.swift | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift index ee215abc..1eb3f4b9 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift @@ -10,7 +10,72 @@ import UIKit import FlexLayout class UpdateViewController: UIViewController { + + // MARK: - Components + + private let updateCardImageView = UIImageView() + private let cancelButton = UIButton() + private let updateContentLabel = UILabel() + private let checkBoxButton = UIButton() + private let checkLabel = UILabel() + private let updateButton = UIButton() + + // MARK: - View Life Cycle + override func viewDidLoad() { super.viewDidLoad() + + setUI() + addTargets() + setLayout() + } +} + +// MARK: - Extension + +extension UpdateViewController { + private func setUI() { + updateCardImageView.image = UIImage(named: "imgUpdate") + + cancelButton.setImage(UIImage(named: "iconClear"), for: .normal) + + updateContentLabel.numberOfLines = 10 + updateContentLabel.font = .textRegular04 + updateContentLabel.textColor = .secondary + updateContentLabel.text = "" + + checkBoxButton.setImage(UIImage(named: "icnCheckboxUnfilled"), for: .normal) + checkBoxButton.setImage(UIImage(named: "icnCheckboxFilled"), for: .selected) + + checkLabel.font = .textRegular05 + checkLabel.textColor = .tertiary + checkLabel.text = "확인했어요!" + + updateButton.setImage(UIImage(named: "btnMainGoUpdate"), for: .normal) + } + + private func addTargets() { + cancelButton.addTarget(self, action: #selector(touchCancelButton), for: .touchUpInside) + updateButton.addTarget(self, action: #selector(touchUpdateButton), for: .touchUpInside) + } + + // MARK: - Objc Methods + + @objc + private func touchCancelButton() { + // TODO: - 비강제 업데이트는 창 닫기. 강제 업데이트는 앱 종료. + } + + @objc + private func touchUpdateButton() { + // TODO: - 앱스토어로 연결 혹은 홈으로 연결하는 액션 구현. + } +} + +// MARK: - Layout + +extension UpdateViewController { + private func setLayout() { + } } From 8d0a8ad37a8a8466bac08146a2596c487773f20d Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 22 Mar 2023 11:28:00 +0900 Subject: [PATCH 06/13] chore: pod update (#381) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PinLayout 설치 --- Podfile | 1 + Podfile.lock | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Podfile b/Podfile index 8f4d53d9..4dd18281 100644 --- a/Podfile +++ b/Podfile @@ -24,4 +24,5 @@ target 'NADA-iOS-forRelease' do pod 'RxCocoa' pod 'Moya/RxSwift' pod 'FlexLayout' + pod 'PinLayout' end diff --git a/Podfile.lock b/Podfile.lock index 8732bb7f..dd865ff6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -43,6 +43,7 @@ PODS: - NVActivityIndicatorView (5.1.1): - NVActivityIndicatorView/Base (= 5.1.1) - NVActivityIndicatorView/Base (5.1.1) + - PinLayout (1.10.4) - PromisesObjC (2.2.0) - RxCocoa (6.5.0): - RxRelay (= 6.5.0) @@ -68,6 +69,7 @@ DEPENDENCIES: - Moya - Moya/RxSwift - NVActivityIndicatorView + - PinLayout - RxCocoa - RxSwift - SkeletonView @@ -93,6 +95,7 @@ SPEC REPOS: - lottie-ios - Moya - NVActivityIndicatorView + - PinLayout - PromisesObjC - RxCocoa - RxRelay @@ -119,6 +122,7 @@ SPEC CHECKSUMS: lottie-ios: d0954d3150061f662ed0adf96ef98d7421864c47 Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667 + PinLayout: f8a677ce0cd1cfe96b58435d029b4ceb4ce9c04c PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef RxCocoa: 94f817b71c07517321eb4f9ad299112ca8af743b RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd @@ -129,6 +133,6 @@ SPEC CHECKSUMS: Then: 844265ae87834bbe1147d91d5d41a404da2ec27d VerticalCardSwiper: 68df635b354500f86934ea044ade37a264c044c6 -PODFILE CHECKSUM: 21a7f8b252714d69ca9015c958692d0cc0e5e2cb +PODFILE CHECKSUM: bc179a77a6e2b3bd5e2b878e4f4b9eca55d127ce COCOAPODS: 1.12.0 From 381da3ec81f0572f36879f47ffffe0eb230883be Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 22 Mar 2023 19:29:48 +0900 Subject: [PATCH 07/13] =?UTF-8?q?feat:=20UI=20=EA=B5=AC=ED=98=84=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - view background - rootFlexContainer background, corner radius --- .../ViewControllers/Update/VC/UpdateViewController.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift index 1eb3f4b9..6ae33cfb 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift @@ -35,6 +35,11 @@ class UpdateViewController: UIViewController { extension UpdateViewController { private func setUI() { + view.backgroundColor = .black.withAlphaComponent(0.4) + + rootFlexContainer.backgroundColor = .background + rootFlexContainer.layer.cornerRadius = 20 + updateCardImageView.image = UIImage(named: "imgUpdate") cancelButton.setImage(UIImage(named: "iconClear"), for: .normal) From 34e0c21ae3078f37ce62ee949970478f4231dd8f Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Wed, 22 Mar 2023 19:36:29 +0900 Subject: [PATCH 08/13] =?UTF-8?q?feat:=20flex=20container=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Update/VC/UpdateViewController.swift | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift index 6ae33cfb..9a5b3c8a 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift @@ -8,11 +8,13 @@ import UIKit import FlexLayout +import PinLayout class UpdateViewController: UIViewController { // MARK: - Components + private let rootFlexContainer = UIView() private let updateCardImageView = UIImageView() private let cancelButton = UIButton() private let updateContentLabel = UILabel() @@ -29,6 +31,13 @@ class UpdateViewController: UIViewController { addTargets() setLayout() } + + override func viewDidLayoutSubviews() { + super.viewDidLayoutSubviews() + + rootFlexContainer.pin.horizontally(24).vCenter().height(rootFlexContainer.frame.width / 327 * 487 ) + rootFlexContainer.flex.layout() + } } // MARK: - Extension @@ -81,6 +90,7 @@ extension UpdateViewController { extension UpdateViewController { private func setLayout() { + view.addSubview(rootFlexContainer) } } From db8037799c84439098007a0083e29ab2624aa073 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Fri, 24 Mar 2023 23:54:03 +0900 Subject: [PATCH 09/13] =?UTF-8?q?fix:=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EB=B7=B0=20=ED=81=AC=EA=B8=B0=20=EA=B3=A0=EC=A0=95?= =?UTF-8?q?=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 업데이트 내용 폰트가 고정이다보니까 14 pro max 에서 보았을 때 너무 뷰가 크다고 판단하여 뷰의 크기를 고정함. --- .../ViewControllers/Update/VC/UpdateViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift index 9a5b3c8a..6506fcf4 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift @@ -35,7 +35,7 @@ class UpdateViewController: UIViewController { override func viewDidLayoutSubviews() { super.viewDidLayoutSubviews() - rootFlexContainer.pin.horizontally(24).vCenter().height(rootFlexContainer.frame.width / 327 * 487 ) + rootFlexContainer.pin.vCenter().hCenter().height(487).width(327) rootFlexContainer.flex.layout() } } From b94f40f9ce3c8d99451140282502a7fe4961d419 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Fri, 24 Mar 2023 23:54:52 +0900 Subject: [PATCH 10/13] =?UTF-8?q?feat:=20checkBoxButton=20=EC=95=A1?= =?UTF-8?q?=EC=85=98=20=EC=B6=94=EA=B0=80=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/Update/VC/UpdateViewController.swift | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift index 6506fcf4..b5838549 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift @@ -71,6 +71,7 @@ extension UpdateViewController { private func addTargets() { cancelButton.addTarget(self, action: #selector(touchCancelButton), for: .touchUpInside) updateButton.addTarget(self, action: #selector(touchUpdateButton), for: .touchUpInside) + checkBoxButton.addTarget(self, action: #selector(touchCheckBox), for: .touchUpInside) } // MARK: - Objc Methods @@ -84,6 +85,12 @@ extension UpdateViewController { private func touchUpdateButton() { // TODO: - 앱스토어로 연결 혹은 홈으로 연결하는 액션 구현. } + + @objc + private func touchCheckBox(_ sender: UIButton) { + // TODO: - 체크하게 되면 다시 띄어주지 않음 + checkBoxButton.isSelected.toggle() + } } // MARK: - Layout From abf8b926b70d43988f4c75f226d6ac8802447ca6 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Fri, 24 Mar 2023 23:55:22 +0900 Subject: [PATCH 11/13] =?UTF-8?q?add:=20updateContentLabel=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80=20(#381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - text, lineBreakMode 설정 --- .../Update/VC/UpdateViewController.swift | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift index b5838549..8de68791 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift @@ -56,7 +56,18 @@ extension UpdateViewController { updateContentLabel.numberOfLines = 10 updateContentLabel.font = .textRegular04 updateContentLabel.textColor = .secondary - updateContentLabel.text = "" + updateContentLabel.lineBreakMode = .byCharWrapping + updateContentLabel.text = """ + 안녕하세요, 나다입니다. + 이번 업데이트에서는 아래와 같은 내용이 개선되었습니다. + 안녕하세융 + 나다에요 + -명함을 위젯으로 추가할 수 있어요 + -내 주변의 명함을 검색할 수 있어요 + ㅇㅇㅇ + 앱스토어에서 최신 버전을 확인해 보세요! + 이정도면 10줄! + """ checkBoxButton.setImage(UIImage(named: "icnCheckboxUnfilled"), for: .normal) checkBoxButton.setImage(UIImage(named: "icnCheckboxFilled"), for: .selected) From 5dddd370c407eb001799f5608f20677712116cb7 Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Sat, 25 Mar 2023 15:06:50 +0900 Subject: [PATCH 12/13] =?UTF-8?q?feat:=20rootFlexContainer=20item=20?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=A7=80=EC=A0=95=20(#3?= =?UTF-8?q?81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Update/VC/UpdateViewController.swift | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift index 8de68791..01c84f2f 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Update/VC/UpdateViewController.swift @@ -110,5 +110,21 @@ extension UpdateViewController { private func setLayout() { view.addSubview(rootFlexContainer) + rootFlexContainer.flex.direction(.column).justifyContent(.spaceBetween).define { flex in + flex.addItem().direction(.column).define { flex in + flex.addItem().direction(.column).alignItems(.center).define { flex in + flex.addItem(updateCardImageView).marginTop(20) + flex.addItem(cancelButton).position(.absolute).top(20).right(20) + } + flex.addItem(updateContentLabel).marginTop(16).marginBottom(18).marginHorizontal(16) + } + flex.addItem().direction(.column).define { flex in + flex.addItem().direction(.row).alignItems(.center).marginBottom(20).define { flex in + flex.addItem(checkBoxButton).marginLeft(16).size(16) + flex.addItem(checkLabel).marginLeft(2) + } + flex.addItem(updateButton).marginBottom(16).marginHorizontal(17) + } + } } } From 7ff23f0d80701f6fcbe58e2730e4f36012fe1c5a Mon Sep 17 00:00:00 2001 From: hyun99999 Date: Tue, 28 Mar 2023 19:42:07 +0900 Subject: [PATCH 13/13] =?UTF-8?q?design:=20=EB=AA=85=ED=95=A8=20=EB=A7=8C?= =?UTF-8?q?=EB=93=A4=EA=B8=B0=20=EB=B7=B0=20=EC=88=9C=EC=84=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20(#383)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VC/CardCreationCategoryViewController.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift index 31145b6d..a7995895 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationCategoryViewController.swift @@ -268,35 +268,35 @@ extension CardCreationCategoryViewController { make.bottom.equalToSuperview().inset(9) } - jobBackgroundView.snp.makeConstraints { make in + diggingBackgroundView.snp.makeConstraints { make in make.top.equalTo(basicBackgroundView.snp.bottom).offset(12) make.leading.trailing.equalToSuperview().inset(24) make.height.equalTo(basicBackgroundView.snp.width).multipliedBy(117.0 / 327.0) } - jobTextlabel.snp.makeConstraints { make in + diggingTextlabel.snp.makeConstraints { make in make.leading.equalToSuperview().inset(18) make.bottom.equalToSuperview().inset(14) } - jobImageView.snp.makeConstraints { make in + diggingImageView.snp.makeConstraints { make in make.trailing.equalToSuperview().inset(24) make.top.equalToSuperview().inset(11) make.bottom.equalToSuperview().inset(9) } - diggingBackgroundView.snp.makeConstraints { make in + jobBackgroundView.snp.makeConstraints { make in make.top.equalTo(jobBackgroundView.snp.bottom).offset(12) make.leading.trailing.equalToSuperview().inset(24) make.height.equalTo(basicBackgroundView.snp.width).multipliedBy(117.0 / 327.0) } - diggingTextlabel.snp.makeConstraints { make in + jobTextlabel.snp.makeConstraints { make in make.leading.equalToSuperview().inset(18) make.bottom.equalToSuperview().inset(14) } - diggingImageView.snp.makeConstraints { make in + jobImageView.snp.makeConstraints { make in make.trailing.equalToSuperview().inset(24) make.top.equalToSuperview().inset(11) make.bottom.equalToSuperview().inset(9)