diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index 1f2e5411..97626571 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -114,6 +114,8 @@ F8518055275D040C006BD5ED /* OnboardingCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F8518053275D040C006BD5ED /* OnboardingCollectionViewCell.xib */; }; F8518058275D042B006BD5ED /* Onboarding.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8518057275D042B006BD5ED /* Onboarding.storyboard */; }; F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F851805A275D047C006BD5ED /* OnboardingViewController.swift */; }; + F8562C96296ADD1000DA1109 /* nearby.json in Resources */ = {isa = PBXBuildFile; fileRef = F8562C95296ADD1000DA1109 /* nearby.json */; }; + F8562C98296ADD6700DA1109 /* Lottie.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8562C97296ADD6700DA1109 /* Lottie.swift */; }; F85711A5274A6B2200F59F0B /* CardCreationPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */; }; F85711A7274A6B3400F59F0B /* CardCreationPreview.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F85711A6274A6B3400F59F0B /* CardCreationPreview.storyboard */; }; F858079E2700354E00872484 /* BackgroundCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F858079C2700354E00872484 /* BackgroundCollectionViewCell.swift */; }; @@ -261,6 +263,8 @@ F8518053275D040C006BD5ED /* OnboardingCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OnboardingCollectionViewCell.xib; sourceTree = ""; }; F8518057275D042B006BD5ED /* Onboarding.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Onboarding.storyboard; sourceTree = ""; }; F851805A275D047C006BD5ED /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = ""; }; + F8562C95296ADD1000DA1109 /* nearby.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = nearby.json; sourceTree = ""; }; + F8562C97296ADD6700DA1109 /* Lottie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Lottie.swift; sourceTree = ""; }; F85711A4274A6B2200F59F0B /* CardCreationPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardCreationPreviewViewController.swift; sourceTree = ""; }; F85711A6274A6B3400F59F0B /* CardCreationPreview.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardCreationPreview.storyboard; sourceTree = ""; }; F858079C2700354E00872484 /* BackgroundCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundCollectionViewCell.swift; sourceTree = ""; }; @@ -672,6 +676,14 @@ path = Onboarding; sourceTree = ""; }; + F8562C94296ADC0A00DA1109 /* Lottie */ = { + isa = PBXGroup; + children = ( + F8562C95296ADD1000DA1109 /* nearby.json */, + ); + path = Lottie; + sourceTree = ""; + }; F857FC8A26C03A5C00A48D01 /* Assets */ = { isa = PBXGroup; children = ( @@ -805,6 +817,7 @@ F837AB7C2965582C00A8804A /* GoogleService-Info.plist */, F857FC8A26C03A5C00A48D01 /* Assets */, 39DA4D7B2747D7060082D572 /* Font */, + F8562C94296ADC0A00DA1109 /* Lottie */, F8FC43A326C01F420033E151 /* Constants */, F8FC43A426C01F5B0033E151 /* Extensions */, F8FC43A226C01F2B0033E151 /* Storyboards */, @@ -931,6 +944,7 @@ 77F47D92276C79B600414659 /* Header.swift */, 770E58852778A78900498C2E /* Status.swift */, 392BAF7A2793E90D0013DCB3 /* KeyChainKey.swift */, + F8562C97296ADD6700DA1109 /* Lottie.swift */, ); path = Constants; sourceTree = ""; @@ -1035,6 +1049,7 @@ 3936993B274A53C600684420 /* GroupEdit.storyboard in Resources */, 3903CC212769F4F40094C458 /* EmptyCardCell.xib in Resources */, 39D88B642745FDD400A72164 /* TabBar.storyboard in Resources */, + F8562C96296ADD1000DA1109 /* nearby.json in Resources */, 7766A410274FEBE200714912 /* CardInGroupCollectionViewCell.xib in Resources */, 7705CF402752C844005195DF /* CardView.xib in Resources */, 397B750D2763A5AF004AEB03 /* OpenSource.storyboard in Resources */, @@ -1155,6 +1170,7 @@ F8C83FBF272FA0670009DF0D /* UserSevice.swift in Sources */, 39F5A3D0271461EA00191F94 /* BackCardCell.swift in Sources */, F8268DB927730B0100BF114B /* FirstCardAlertBottomSheetViewController.swift in Sources */, + F8562C98296ADD6700DA1109 /* Lottie.swift in Sources */, 770E58862778A78900498C2E /* Status.swift in Sources */, F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */, 392BAF7B2793E90D0013DCB3 /* KeyChainKey.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Constants/Lottie.swift b/NADA-iOS-forRelease/Resouces/Constants/Lottie.swift new file mode 100644 index 00000000..b50f003f --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Constants/Lottie.swift @@ -0,0 +1,16 @@ +// +// Lottie.swift +// NADA-iOS-forRelease +// +// Created by kimhyungyu on 2023/01/08. +// + +import Foundation + +extension Const { + struct Lottie { + private init() { } + + static let nearby = "nearby.json" + } +} diff --git a/NADA-iOS-forRelease/Resouces/Lottie/nearby.json b/NADA-iOS-forRelease/Resouces/Lottie/nearby.json new file mode 100644 index 00000000..8e509149 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Lottie/nearby.json @@ -0,0 +1 @@ +{"v":"5.9.6","fr":25,"ip":0,"op":40,"w":54,"h":54,"nm":"icn_nearby_off","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"icn_nearby_off 윤곽선","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[27,27,0],"ix":2,"l":2},"a":{"a":0,"k":[27,27,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.357,1.883],[0,-1.597],[-6.627,0],[0,2.486],[3.347,0.798],[2.434,-2.132],[0.427,0.368]],"o":[[-3.346,0.798],[0,2.486],[6.628,0],[0,-1.598],[-1.358,1.883],[-0.428,0.368],[-2.429,-2.132]],"v":[[-6.433,-4.15],[-12,-0.35],[0,4.15],[12,-0.35],[6.432,-4.15],[0.743,1.874],[-0.753,1.874]],"c":true},"ix":2},"nm":"패스 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964705882353,0.439215686275,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"칠 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[27,34.851],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"변형"}],"nm":"그룹 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.2,0],[0,-4.98],[4.89,-4.31],[0.38,0.33],[0,3.18]],"o":[[4.2,0],[0,3.18],[-0.38,0.33],[-4.88,-4.31],[0,-4.98]],"v":[[0,-9.88],[8,-1.68],[0.66,9.55],[-0.67,9.55],[-8,-1.68]],"c":true},"ix":2},"nm":"패스 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.1,0],[0,1.1],[1.1,0],[0,-1.1]],"o":[[1.1,0],[0,-1.1],[-1.1,0],[0,1.1]],"v":[[0,0.12],[2,-1.88],[0,-3.88],[-2,-1.88]],"c":true},"ix":2},"nm":"패스 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"패스 병합 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964705882353,0.439215686275,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"칠 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[27,25.88],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"변형"}],"nm":"그룹 2","np":4,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"모양 레이어 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"t":24,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[27,27.919,0],"ix":2,"l":2},"a":{"a":0,"k":[5.907,3.002,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[0,0,100]},{"t":15,"s":[90,90,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[56.814,56.814],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"타원 패스 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.611764705882,0.58431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"칠 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[5.907,1.907],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"변형"}],"nm":"타원 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"모양 레이어 1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"t":33,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[27,27.681,0],"ix":2,"l":2},"a":{"a":0,"k":[5.907,3.002,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":9,"s":[0,0,100]},{"t":24,"s":[90,90,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[56.814,56.814],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"타원 패스 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.976470588235,0.611764705882,0.58431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"칠 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[5.907,1.907],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"변형"}],"nm":"타원 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":40,"st":5,"ct":1,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/Podfile b/Podfile index 3de939c4..b1962aa6 100644 --- a/Podfile +++ b/Podfile @@ -17,4 +17,5 @@ pod 'IQKeyboardManagerSwift' pod 'Kingfisher', '~> 7.0' pod 'NVActivityIndicatorView' pod 'Firebase/DynamicLinks' +pod 'lottie-ios' end diff --git a/Podfile.lock b/Podfile.lock index c18d180c..791010a0 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -30,7 +30,8 @@ PODS: - KakaoSDKCommon/Common (= 2.13.1) - KakaoSDKUser (2.13.1): - KakaoSDKAuth (= 2.13.1) - - Kingfisher (7.4.1) + - Kingfisher (7.5.0) + - lottie-ios (4.0.1) - Moya (14.0.0): - Moya/Core (= 14.0.0) - Moya/Core (14.0.0): @@ -50,6 +51,7 @@ DEPENDENCIES: - KakaoSDKCommon - KakaoSDKUser - Kingfisher (~> 7.0) + - lottie-ios - Moya (~> 14.0) - NVActivityIndicatorView - SkeletonView @@ -69,6 +71,7 @@ SPEC REPOS: - KakaoSDKCommon - KakaoSDKUser - Kingfisher + - lottie-ios - Moya - NVActivityIndicatorView - PromisesObjC @@ -87,7 +90,8 @@ SPEC CHECKSUMS: KakaoSDKAuth: d9de0cb0c723441ced3616d481952bde34438dcb KakaoSDKCommon: a16807e19984a0a208c3117c7ef117f101a9a128 KakaoSDKUser: 92d34cf6af7b123c22a7ee44424332123e356901 - Kingfisher: cd762a593a61b2fbecf7645c00f9a801a3ebfc9c + Kingfisher: b9c2a4a4af2990a768445c277359b27bde287d71 + lottie-ios: 54d22edf55b839f0929cabbfe609c9aa548b1145 Moya: 5b45dacb75adb009f97fde91c204c1e565d31916 NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667 PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb @@ -95,6 +99,6 @@ SPEC CHECKSUMS: SwiftLint: 77f7cb2b9bb81ab4a12fcc86448ba3f11afa50c6 VerticalCardSwiper: 68df635b354500f86934ea044ade37a264c044c6 -PODFILE CHECKSUM: c2806e5fc7a2f444149e3dd0951fc9023f05df90 +PODFILE CHECKSUM: 77369aa0dd29c6f58c0bba7ac4391df0cdca3f56 COCOAPODS: 1.11.3