diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index be0ba41d..9dc7111e 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -117,8 +117,6 @@ 77C58CD92ABD448500327BD9 /* BannerResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77C58CD82ABD448500327BD9 /* BannerResponse.swift */; }; 77C6E350299B84E300E059F9 /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77C6E34F299B84E300E059F9 /* HomeViewModel.swift */; }; 77DFB871274F92F9000CD36F /* AddWithIdBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77DFB870274F92F9000CD36F /* AddWithIdBottomSheetViewController.swift */; }; - 77F2C0EB27632A91007641E3 /* CardHarmonyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F2C0EA27632A91007641E3 /* CardHarmonyViewController.swift */; }; - 77F2C0ED27632AA7007641E3 /* CardHarmony.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 77F2C0EC27632AA7007641E3 /* CardHarmony.storyboard */; }; 77F47D93276C79B600414659 /* Header.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F47D92276C79B600414659 /* Header.swift */; }; F800EA102ACDAEC100A664AD /* SendTagSheetVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F800EA0F2ACDAEC100A664AD /* SendTagSheetVC.swift */; }; F805588529C993E7002E8EA3 /* UpdateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F805588429C993E7002E8EA3 /* UpdateViewController.swift */; }; @@ -423,8 +421,6 @@ 77C58CD82ABD448500327BD9 /* BannerResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannerResponse.swift; sourceTree = ""; }; 77C6E34F299B84E300E059F9 /* HomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModel.swift; sourceTree = ""; }; 77DFB870274F92F9000CD36F /* AddWithIdBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWithIdBottomSheetViewController.swift; sourceTree = ""; }; - 77F2C0EA27632A91007641E3 /* CardHarmonyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardHarmonyViewController.swift; sourceTree = ""; }; - 77F2C0EC27632AA7007641E3 /* CardHarmony.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardHarmony.storyboard; sourceTree = ""; }; 77F47D92276C79B600414659 /* Header.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Header.swift; sourceTree = ""; }; F800EA0F2ACDAEC100A664AD /* SendTagSheetVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendTagSheetVC.swift; sourceTree = ""; }; F805588429C993E7002E8EA3 /* UpdateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateViewController.swift; sourceTree = ""; }; @@ -875,7 +871,6 @@ isa = PBXGroup; children = ( 77812946275F6EA3004B34F4 /* CardDetailViewController.swift */, - 77F2C0EA27632A91007641E3 /* CardHarmonyViewController.swift */, 7773124E2A083357002C094B /* NewCardHarmonyViewController.swift */, ); path = CardDetail; @@ -885,7 +880,6 @@ isa = PBXGroup; children = ( 77812949275F6ED7004B34F4 /* CardDetail.storyboard */, - 77F2C0EC27632AA7007641E3 /* CardHarmony.storyboard */, ); path = CardDetail; sourceTree = ""; @@ -1800,7 +1794,6 @@ 3979709826FA0BF0003FB4F5 /* Login.storyboard in Resources */, F82FEB4D27639F3100DA7847 /* MainCardCell.xib in Resources */, 39369945274A568900684420 /* GroupEditTableViewCell.xib in Resources */, - 77F2C0ED27632AA7007641E3 /* CardHarmony.storyboard in Resources */, 39C394D5277CD33500DBA566 /* EmptyCardListTableViewCell.xib in Resources */, F84BAFB226FDB552004CA335 /* BackCardCreationCollectionViewCell.xib in Resources */, F8458D6C29F54EDF000D53A7 /* FanFrontCardCell.xib in Resources */, @@ -1987,7 +1980,6 @@ 39C394D0277CCFD500DBA566 /* EmptyGroupEditTableViewCell.swift in Sources */, 777FF89F27364B7B00BF69D3 /* GroupEditRequest.swift in Sources */, 399C55DF2711949D00845A54 /* CGPoint+Distance.swift in Sources */, - 77F2C0EB27632A91007641E3 /* CardHarmonyViewController.swift in Sources */, F83206AA26F61E3700D61711 /* FrontCardCell.swift in Sources */, 3979709626FA0BE5003FB4F5 /* LoginViewController.swift in Sources */, F856EB6C2AD904FF0039D32E /* CustomDetent.swift in Sources */, diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/Contents.json deleted file mode 100644 index d122339b..00000000 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "addPhoto.png", - "scale" : "1x", - "idiom" : "universal" - }, - { - "filename" : "addPhoto@2x.png", - "scale" : "2x", - "idiom" : "universal" - }, - { - "idiom" : "universal", - "filename" : "addPhoto@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/addPhoto.imageset/addPhoto.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto.png deleted file mode 100644 index e99944f2..00000000 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto.png and /dev/null differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@2x.png deleted file mode 100644 index 46e185c4..00000000 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@2x.png and /dev/null differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@3x.png deleted file mode 100644 index 33748952..00000000 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/addPhoto.imageset/addPhoto@3x.png and /dev/null differ diff --git a/NADA-iOS-forRelease/Resouces/Constants/Const.swift b/NADA-iOS-forRelease/Resouces/Constants/Const.swift index 5bd677f3..b7b16ceb 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/Const.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/Const.swift @@ -8,6 +8,5 @@ import Foundation struct Const { - // TODO: - KeyChain 적용 // static var headerToken: String = KeyChain.read(key: Const.KeyChainKey.accessToken) ?? "" } diff --git a/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift b/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift index 80ce777a..40c4f8d1 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/ViewController.swift @@ -19,7 +19,6 @@ extension Const { static let groupEditViewController = "GroupEditViewController" static let qrScanViewController = "QRScanViewController" static let cardDetailViewController = "CardDetailViewController" - static let cardHarmonyViewController = "CardHarmonyViewController" static let tabBarViewController = "TabBarViewController" static let commonBottomSheetViewController = "CommonBottomSheetViewController" static let cardCreationPreviewViewController = "CardCreationPreviewViewController" diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/CardDetail/CardHarmony.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/CardDetail/CardHarmony.storyboard deleted file mode 100644 index c794db40..00000000 --- a/NADA-iOS-forRelease/Resouces/Storyboards/CardDetail/CardHarmony.storyboard +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - SpoqaHanSansNeo-Bold - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardHarmonyViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardHarmonyViewController.swift deleted file mode 100644 index 5372508a..00000000 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardHarmonyViewController.swift +++ /dev/null @@ -1,47 +0,0 @@ -// -// CardHarmonyViewController.swift -// NADA-iOS-forRelease -// -// Created by Yi Joon Choi on 2021/12/10. -// - -import UIKit - -class CardHarmonyViewController: UIViewController { - - // MARK: - Properties - @IBOutlet weak var dimmedBackView: UIView! - @IBOutlet weak var popUpView: UIView! - @IBOutlet weak var harmonyImageView: UIImageView! - @IBOutlet weak var harmonyPercentLabel: UILabel! - @IBOutlet weak var harmonyDescriptionLabel: UILabel! - - @IBAction func touchDismissButton(_ sender: Any) { - UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseOut, animations: { - self.dimmedBackView.alpha = 0.0 - self.view.layoutIfNeeded() - self.popUpView.isHidden = true - }, completion: { _ in - if self.presentingViewController != nil { - self.dismiss(animated: false, completion: nil) - } - }) - } - - var harmonyData: HarmonyData? - - override func viewDidLoad() { - super.viewDidLoad() - setUI() - } - -} - -extension CardHarmonyViewController { - private func setUI() { -// harmonyImageView.image = UIImage(named: harmonyData?.icon ?? "icnHarmonyRed") -// harmonyPercentLabel.text = harmonyData?.percentage ?? "" -// harmonyPercentLabel.textColor = harmonyData?.color ?? .harmonyRed -// harmonyDescriptionLabel.text = harmonyData?.description ?? "" - } -}