diff --git a/DailyRecord.xcodeproj/project.pbxproj b/DailyRecord.xcodeproj/project.pbxproj index 16b45bb..6ec7a29 100644 --- a/DailyRecord.xcodeproj/project.pbxproj +++ b/DailyRecord.xcodeproj/project.pbxproj @@ -108,7 +108,7 @@ 65CF61C22C1D6039003E6D75 /* RecordViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65CF61C12C1D6039003E6D75 /* RecordViewModel.swift */; }; 65CF61C42C243E78003E6D75 /* RecordFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65CF61C32C243E78003E6D75 /* RecordFooterView.swift */; }; 65CF61C62C243EDD003E6D75 /* BaseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65CF61C52C243EDD003E6D75 /* BaseView.swift */; }; - 65CF61C82C24425A003E6D75 /* EmotionalImagePopupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65CF61C72C24425A003E6D75 /* EmotionalImagePopupView.swift */; }; + 65CF61C82C24425A003E6D75 /* EmotionalBottomSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65CF61C72C24425A003E6D75 /* EmotionalBottomSheetView.swift */; }; 65CF61CA2C24454E003E6D75 /* AttachedImageCollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65CF61C92C24454E003E6D75 /* AttachedImageCollectionView.swift */; }; 65FA64502C9EAACD001F5002 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65FA644F2C9EAACD001F5002 /* WidgetKit.framework */; }; 65FA64522C9EAACD001F5002 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65FA64512C9EAACD001F5002 /* SwiftUI.framework */; }; @@ -211,7 +211,7 @@ 65CF61C12C1D6039003E6D75 /* RecordViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordViewModel.swift; sourceTree = ""; }; 65CF61C32C243E78003E6D75 /* RecordFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordFooterView.swift; sourceTree = ""; }; 65CF61C52C243EDD003E6D75 /* BaseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseView.swift; sourceTree = ""; }; - 65CF61C72C24425A003E6D75 /* EmotionalImagePopupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmotionalImagePopupView.swift; sourceTree = ""; }; + 65CF61C72C24425A003E6D75 /* EmotionalBottomSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmotionalBottomSheetView.swift; sourceTree = ""; }; 65CF61C92C24454E003E6D75 /* AttachedImageCollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachedImageCollectionView.swift; sourceTree = ""; }; 65CF61D42C27CEC6003E6D75 /* DailyRecord.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DailyRecord.entitlements; sourceTree = ""; }; 65FA644D2C9EAACD001F5002 /* WidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -640,7 +640,7 @@ isa = PBXGroup; children = ( 65CF61C32C243E78003E6D75 /* RecordFooterView.swift */, - 65CF61C72C24425A003E6D75 /* EmotionalImagePopupView.swift */, + 65CF61C72C24425A003E6D75 /* EmotionalBottomSheetView.swift */, 65CF61C92C24454E003E6D75 /* AttachedImageCollectionView.swift */, 659946B52C54E13B0030598B /* ImageCarouselView.swift */, 6508A2202C79C91D005AB6DC /* FullscreenImageView.swift */, @@ -898,7 +898,7 @@ 65CF617B2C0C5ED7003E6D75 /* Coordinator.swift in Sources */, 659946B62C54E13B0030598B /* ImageCarouselView.swift in Sources */, 659946882C4249690030598B /* CalendarRepository.swift in Sources */, - 65CF61C82C24425A003E6D75 /* EmotionalImagePopupView.swift in Sources */, + 65CF61C82C24425A003E6D75 /* EmotionalBottomSheetView.swift in Sources */, 65CF61992C117061003E6D75 /* RecordDIContainer.swift in Sources */, 65CF61C22C1D6039003E6D75 /* RecordViewModel.swift in Sources */, 65CF61772C0B03EA003E6D75 /* Log.swift in Sources */, @@ -1115,7 +1115,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.3.0; PRODUCT_BUNDLE_IDENTIFIER = ungchun.DailyRecord; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1157,7 +1157,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.3.0; PRODUCT_BUNDLE_IDENTIFIER = ungchun.DailyRecord; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/DailyRecord/Presentation/ChartScene/ViewController/ChartViewController.swift b/DailyRecord/Presentation/ChartScene/ViewController/ChartViewController.swift index aa35bcf..7c476cf 100644 --- a/DailyRecord/Presentation/ChartScene/ViewController/ChartViewController.swift +++ b/DailyRecord/Presentation/ChartScene/ViewController/ChartViewController.swift @@ -357,6 +357,18 @@ private extension ChartViewController { return .happy case "very_happy": return .veryHappy + case "embarrassed": + return .embarrassed + case "hurt": + return .hurt + case "lovely": + return .lovely + case "sleepy": + return .sleepy + case "surprised": + return .surprised + case "tired": + return .tired default: return .systemGray } diff --git a/DailyRecord/Presentation/RecordScene/View/EmotionalBottomSheetView.swift b/DailyRecord/Presentation/RecordScene/View/EmotionalBottomSheetView.swift new file mode 100644 index 0000000..aa721c0 --- /dev/null +++ b/DailyRecord/Presentation/RecordScene/View/EmotionalBottomSheetView.swift @@ -0,0 +1,384 @@ +// +// EmotionalBottomSheetView.swift +// DailyRecord +// +// Created by Kim SungHun on 6/20/24. +// + +import UIKit + +import SnapKit + +protocol EmotionalBottomSheetViewViewDelegate: AnyObject { + func emotionalImageTapTrigger(selectEmotionType: EmotionType) +} + +final class EmotionalBottomSheetViewController: BaseViewController { + + // MARK: - Properties + + weak var delegate: EmotionalBottomSheetViewViewDelegate? + + // MARK: - Views + + private let topSpacerView: UIView = { + let view = UIView() + view.backgroundColor = .azBlack + return view + }() + + private let scrollView: UIScrollView = { + let scrollView = UIScrollView() + scrollView.showsVerticalScrollIndicator = false + return scrollView + }() + + private let contentView: UIView = { + let view = UIView() + return view + }() + + private let veryHappyEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "very_happy") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let happyEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "happy") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let neutralEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "neutral") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let verySadEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "very_sad") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let sadEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "sad") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let angryEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "angry") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let embarrassedEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "embarrassed") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let hurtEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "hurt") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let lovelyEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "lovely") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let sleepyEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "sleepy") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let surprisedEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "surprised") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + private let tiredEmotion: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "tired") + view.sizeToFit() + view.isUserInteractionEnabled = true + return view + }() + + // MARK: - Life Cycle + + override func viewDidLoad() { + super.viewDidLoad() + } + + // MARK: - Functions + + override func addView() { + view.addSubview(topSpacerView) + view.addSubview(scrollView) + scrollView.addSubview(contentView) + + [veryHappyEmotion, happyEmotion, lovelyEmotion, + surprisedEmotion, neutralEmotion, embarrassedEmotion, + hurtEmotion, sleepyEmotion, tiredEmotion, + angryEmotion, verySadEmotion, sadEmotion].forEach { + contentView.addSubview($0) + } + } + + override func setLayout() { + topSpacerView.snp.makeConstraints { make in + make.top.leading.trailing.equalToSuperview() + make.height.equalTo(20) + } + + scrollView.snp.makeConstraints { make in + make.top.equalTo(topSpacerView.snp.bottom) + make.leading.trailing.bottom.equalToSuperview() + } + + contentView.snp.makeConstraints { make in + make.edges.equalTo(scrollView.contentLayoutGuide) + make.width.equalTo(scrollView.frameLayoutGuide) + } + + // 1 ROW + veryHappyEmotion.snp.makeConstraints { make in + make.top.equalToSuperview().offset(40) + make.width.height.equalTo(70) + make.centerX.equalTo(view.snp.leading).offset(view.bounds.width / 4.5) + } + + happyEmotion.snp.makeConstraints { make in + make.top.equalTo(veryHappyEmotion) + make.width.height.equalTo(70) + make.centerX.equalToSuperview() + } + + lovelyEmotion.snp.makeConstraints { make in + make.top.equalTo(veryHappyEmotion) + make.width.height.equalTo(70) + make.centerX.equalTo(view.snp.trailing).offset(-(view.bounds.width / 4.5)) + } + + // 2 ROW + surprisedEmotion.snp.makeConstraints { make in + make.top.equalTo(veryHappyEmotion.snp.bottom).offset(20) + make.width.height.equalTo(70) + make.centerX.equalTo(veryHappyEmotion) + } + + neutralEmotion.snp.makeConstraints { make in + make.top.equalTo(surprisedEmotion) + make.width.height.equalTo(70) + make.centerX.equalTo(happyEmotion) + } + + embarrassedEmotion.snp.makeConstraints { make in + make.top.equalTo(surprisedEmotion) + make.width.height.equalTo(70) + make.centerX.equalTo(lovelyEmotion) + } + + // 3 ROW + hurtEmotion.snp.makeConstraints { make in + make.top.equalTo(surprisedEmotion.snp.bottom).offset(20) + make.width.height.equalTo(70) + make.centerX.equalTo(veryHappyEmotion) + } + + sleepyEmotion.snp.makeConstraints { make in + make.top.equalTo(hurtEmotion) + make.width.height.equalTo(70) + make.centerX.equalTo(happyEmotion) + } + + tiredEmotion.snp.makeConstraints { make in + make.top.equalTo(hurtEmotion) + make.width.height.equalTo(70) + make.centerX.equalTo(lovelyEmotion) + } + + // 4 ROW + angryEmotion.snp.makeConstraints { make in + make.top.equalTo(hurtEmotion.snp.bottom).offset(20) + make.width.height.equalTo(70) + make.centerX.equalTo(veryHappyEmotion) + } + + verySadEmotion.snp.makeConstraints { make in + make.top.equalTo(angryEmotion) + make.width.height.equalTo(70) + make.centerX.equalTo(happyEmotion) + } + + sadEmotion.snp.makeConstraints { make in + make.top.equalTo(angryEmotion) + make.width.height.equalTo(70) + make.centerX.equalTo(lovelyEmotion) + make.bottom.equalToSuperview().offset(-20) + } + } + + override func setupView() { + view.backgroundColor = .azBlack + + if let sheet = sheetPresentationController { + sheet.detents = [.medium()] + sheet.preferredCornerRadius = 24 + } + + addTapGestures() + } +} + +private extension EmotionalBottomSheetViewController { + func addTapGestures() { + let veryHappyTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + veryHappyEmotion.addGestureRecognizer(veryHappyTapGesture) + veryHappyEmotion.tag = 1 + + let happyTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + happyEmotion.addGestureRecognizer(happyTapGesture) + happyEmotion.tag = 2 + + let neutralTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + neutralEmotion.addGestureRecognizer(neutralTapGesture) + neutralEmotion.tag = 3 + + let verySadTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + verySadEmotion.addGestureRecognizer(verySadTapGesture) + verySadEmotion.tag = 4 + + let sadTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + sadEmotion.addGestureRecognizer(sadTapGesture) + sadEmotion.tag = 5 + + let angryTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + angryEmotion.addGestureRecognizer(angryTapGesture) + angryEmotion.tag = 6 + + let embarrassedTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + embarrassedEmotion.addGestureRecognizer(embarrassedTapGesture) + embarrassedEmotion.tag = 7 + + let hurtTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + hurtEmotion.addGestureRecognizer(hurtTapGesture) + hurtEmotion.tag = 8 + + let lovelyTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + lovelyEmotion.addGestureRecognizer(lovelyTapGesture) + lovelyEmotion.tag = 9 + + let sleepyTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + sleepyEmotion.addGestureRecognizer(sleepyTapGesture) + sleepyEmotion.tag = 10 + + let surprisedTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + surprisedEmotion.addGestureRecognizer(surprisedTapGesture) + surprisedEmotion.tag = 11 + + let tiredTapGesture = UITapGestureRecognizer( + target: self, + action: #selector(imageTapped(_:)) + ) + tiredEmotion.addGestureRecognizer(tiredTapGesture) + tiredEmotion.tag = 12 + } + + @objc func imageTapped(_ sender: UITapGestureRecognizer) { + guard let tappedView = sender.view else { return } + + switch tappedView.tag { + case 1: + delegate?.emotionalImageTapTrigger(selectEmotionType: .very_happy) + case 2: + delegate?.emotionalImageTapTrigger(selectEmotionType: .happy) + case 3: + delegate?.emotionalImageTapTrigger(selectEmotionType: .neutral) + case 4: + delegate?.emotionalImageTapTrigger(selectEmotionType: .very_sad) + case 5: + delegate?.emotionalImageTapTrigger(selectEmotionType: .sad) + case 6: + delegate?.emotionalImageTapTrigger(selectEmotionType: .angry) + case 7: + delegate?.emotionalImageTapTrigger(selectEmotionType: .embarrassed) + case 8: + delegate?.emotionalImageTapTrigger(selectEmotionType: .hurt) + case 9: + delegate?.emotionalImageTapTrigger(selectEmotionType: .lovely) + case 10: + delegate?.emotionalImageTapTrigger(selectEmotionType: .sleepy) + case 11: + delegate?.emotionalImageTapTrigger(selectEmotionType: .surprised) + case 12: + delegate?.emotionalImageTapTrigger(selectEmotionType: .tired) + default: + break + } + dismiss(animated: true) + } +} diff --git a/DailyRecord/Presentation/RecordScene/View/EmotionalImagePopupView.swift b/DailyRecord/Presentation/RecordScene/View/EmotionalImagePopupView.swift deleted file mode 100644 index 0db2149..0000000 --- a/DailyRecord/Presentation/RecordScene/View/EmotionalImagePopupView.swift +++ /dev/null @@ -1,261 +0,0 @@ -// -// EmotionalImagePopupView.swift -// DailyRecord -// -// Created by Kim SungHun on 6/20/24. -// - -import UIKit - -import SnapKit - -protocol EmotionalImagePopupViewDelegate: AnyObject { - func emotionalImageTapTrigger(selectEmotionType: EmotionType) -} - -final class EmotionalImagePopupView: BaseView { - - // MARK: - Properties - - weak var delegate: EmotionalImagePopupViewDelegate? - - // MARK: - Views - - let dimmingView: UIView = { - let view = UIView() - return view - }() - - private let emotionalImagePopupView: UIView = { - let view = UIView() - view.backgroundColor = .azWhite - view.layer.cornerRadius = 16 - return view - }() - - private let veryHappyEmotion: UIImageView = { - let view = UIImageView() - view.image = UIImage(named: "very_happy") - view.sizeToFit() - view.isUserInteractionEnabled = true - return view - }() - - private let happyEmotion: UIImageView = { - let view = UIImageView() - view.image = UIImage(named: "happy") - view.sizeToFit() - view.isUserInteractionEnabled = true - return view - }() - - private let neutralEmotion: UIImageView = { - let view = UIImageView() - view.image = UIImage(named: "neutral") - view.sizeToFit() - view.isUserInteractionEnabled = true - return view - }() - - private let verySadEmotion: UIImageView = { - let view = UIImageView() - view.image = UIImage(named: "very_sad") - view.sizeToFit() - view.isUserInteractionEnabled = true - return view - }() - - private let sadEmotion: UIImageView = { - let view = UIImageView() - view.image = UIImage(named: "sad") - view.sizeToFit() - view.isUserInteractionEnabled = true - return view - }() - - private let angryEmotion: UIImageView = { - let view = UIImageView() - view.image = UIImage(named: "angry") - view.sizeToFit() - view.isUserInteractionEnabled = true - return view - }() - - // MARK: - Init - - override init(frame: CGRect) { - super.init(frame: frame) - } - - required init?(coder: NSCoder) { - super.init(coder: coder) - } - - // MARK: - Functions - - override func addView() { - [dimmingView, emotionalImagePopupView].forEach { - addSubview($0) - } - - [veryHappyEmotion, happyEmotion, neutralEmotion, - verySadEmotion, sadEmotion, angryEmotion].forEach { - emotionalImagePopupView.addSubview($0) - } - } - - override func setLayout() { - dimmingView.snp.makeConstraints { make in - make.edges.equalToSuperview() - } - - veryHappyEmotion.snp.makeConstraints { make in - make.top.equalToSuperview().offset(20) - make.leading.equalToSuperview().offset(20) - make.width.height.equalTo(60) - } - - happyEmotion.snp.makeConstraints { make in - make.top.equalToSuperview().offset(20) - make.centerX.equalToSuperview() - make.width.height.equalTo(60) - } - - neutralEmotion.snp.makeConstraints { make in - make.top.equalToSuperview().offset(20) - make.trailing.equalToSuperview().offset(-20) - make.width.height.equalTo(60) - } - - verySadEmotion.snp.makeConstraints { make in - make.top.equalTo(happyEmotion.snp.bottom).offset(20) - make.leading.equalToSuperview().offset(20) - make.width.height.equalTo(60) - } - - sadEmotion.snp.makeConstraints { make in - make.top.equalTo(happyEmotion.snp.bottom).offset(20) - make.centerX.equalToSuperview() - make.width.height.equalTo(60) - } - - angryEmotion.snp.makeConstraints { make in - make.top.equalTo(neutralEmotion.snp.bottom).offset(20) - make.trailing.equalToSuperview().offset(-20) - make.width.height.equalTo(60) - } - - emotionalImagePopupView.snp.makeConstraints { make in - make.center.equalToSuperview() - make.width.equalTo(250) - make.height.equalTo(180) - } - } - - override func setupView() { - DispatchQueue.main.async { [weak self] in - self?.dimmingView.alpha = 0 - self?.emotionalImagePopupView.alpha = 0 - } - addTapGestures() - } -} - -extension EmotionalImagePopupView { - func showPopup() { - DispatchQueue.main.async { [weak self] in - UIView.animate(withDuration: 0.6) { - self?.dimmingView.alpha = 1 - self?.emotionalImagePopupView.alpha = 1 - } - } - } - - func hidePopup(completion: @escaping () -> Void) { - DispatchQueue.main.async { [weak self] in - UIView.animate(withDuration: 0.3, animations: { - self?.dimmingView.alpha = 0 - self?.emotionalImagePopupView.alpha = 0 - }) { _ in - completion() - } - } - } - - private func addTapGestures() { - let veryHappyTapGesture = UITapGestureRecognizer( - target: self, - action: #selector(imageTapped(_:)) - ) - veryHappyEmotion.addGestureRecognizer(veryHappyTapGesture) - veryHappyEmotion.tag = 1 - - let happyTapGesture = UITapGestureRecognizer( - target: self, - action: #selector(imageTapped(_:)) - ) - happyEmotion.addGestureRecognizer(happyTapGesture) - happyEmotion.tag = 2 - - let neutralTapGesture = UITapGestureRecognizer( - target: self, - action: #selector(imageTapped(_:)) - ) - neutralEmotion.addGestureRecognizer(neutralTapGesture) - neutralEmotion.tag = 3 - - let verySadTapGesture = UITapGestureRecognizer( - target: self, - action: #selector(imageTapped(_:)) - ) - verySadEmotion.addGestureRecognizer(verySadTapGesture) - verySadEmotion.tag = 4 - - let sadTapGesture = UITapGestureRecognizer( - target: self, - action: #selector(imageTapped(_:)) - ) - sadEmotion.addGestureRecognizer(sadTapGesture) - sadEmotion.tag = 5 - - let angryTapGesture = UITapGestureRecognizer( - target: self, - action: #selector(imageTapped(_:)) - ) - angryEmotion.addGestureRecognizer(angryTapGesture) - angryEmotion.tag = 6 - } - - @objc private func imageTapped(_ sender: UITapGestureRecognizer) { - guard let tappedView = sender.view else { return } - - switch tappedView.tag { - case 1: - hidePopup { - self.delegate?.emotionalImageTapTrigger(selectEmotionType: .very_happy) - } - case 2: - hidePopup { - self.delegate?.emotionalImageTapTrigger(selectEmotionType: .happy) - } - case 3: - hidePopup { - self.delegate?.emotionalImageTapTrigger(selectEmotionType: .neutral) - } - case 4: - hidePopup { - self.delegate?.emotionalImageTapTrigger(selectEmotionType: .very_sad) - } - case 5: - hidePopup { - self.delegate?.emotionalImageTapTrigger(selectEmotionType: .sad) - } - case 6: - hidePopup { - self.delegate?.emotionalImageTapTrigger(selectEmotionType: .angry) - } - default: - break - } - } -} diff --git a/DailyRecord/Presentation/RecordScene/ViewController/RecordWriteViewController.swift b/DailyRecord/Presentation/RecordScene/ViewController/RecordWriteViewController.swift index 753d3a1..aa1f0d1 100644 --- a/DailyRecord/Presentation/RecordScene/ViewController/RecordWriteViewController.swift +++ b/DailyRecord/Presentation/RecordScene/ViewController/RecordWriteViewController.swift @@ -71,8 +71,6 @@ final class RecordWriteViewController: BaseViewController { private let footerView = RecordFooterView() - private let emotionalImagePopupView = EmotionalImagePopupView() - // MARK: - Life Cycle init( @@ -182,7 +180,7 @@ final class RecordWriteViewController: BaseViewController { } let showPopupTapGesture = UITapGestureRecognizer(target: self, - action: #selector(showPopupTrigger)) + action: #selector(showBottomSheetTrigger)) todayEmotionImageView.addGestureRecognizer(showPopupTapGesture) footerView.backgroundColor = .azBlack @@ -194,7 +192,6 @@ final class RecordWriteViewController: BaseViewController { footerView.saveIcon.addGestureRecognizer(saveTapGesture) attachedImageCollectionView.delegate = self - emotionalImagePopupView.delegate = self let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard)) view.addGestureRecognizer(tapGesture) @@ -330,24 +327,15 @@ private extension RecordWriteViewController { } private extension RecordWriteViewController { - @objc func showPopupTrigger() { - DispatchQueue.main.async { [weak self] in - guard let self = self else { return } - self.emotionalImagePopupView.frame = self.view.bounds - } - let tapGesture = UITapGestureRecognizer(target: self, action: #selector(closePopupTrigger)) - emotionalImagePopupView.dimmingView.addGestureRecognizer(tapGesture) + @objc func showBottomSheetTrigger() { + let bottomSheetVC = EmotionalBottomSheetViewController() + bottomSheetVC.delegate = self - view.addSubview(emotionalImagePopupView) - emotionalImagePopupView.showPopup() - } - - @objc func closePopupTrigger() { - DispatchQueue.main.async { [weak self] in - self?.emotionalImagePopupView.hidePopup { [weak self] in - self?.emotionalImagePopupView.removeFromSuperview() - } + if let sheet = bottomSheetVC.sheetPresentationController { + sheet.prefersGrabberVisible = true } + + present(bottomSheetVC, animated: true) viewModel.updateIsChangeContent(true) } @@ -419,11 +407,9 @@ extension RecordWriteViewController: AttachedImageCollectionViewDelegate { } } -extension RecordWriteViewController: EmotionalImagePopupViewDelegate { +extension RecordWriteViewController: EmotionalBottomSheetViewViewDelegate { func emotionalImageTapTrigger(selectEmotionType: EmotionType) { if let image = UIImage(named: selectEmotionType.rawValue) { - closePopupTrigger() - viewModel.updateEmotionType(selectEmotionType) DispatchQueue.main.async { [weak self] in diff --git a/DailyRecord/Resource/Assets.xcassets/color/emotion/embarrassedColor.colorset/Contents.json b/DailyRecord/Resource/Assets.xcassets/color/emotion/embarrassedColor.colorset/Contents.json new file mode 100644 index 0000000..fee42ef --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/color/emotion/embarrassedColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "92", + "green" : "169", + "red" : "255" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/color/emotion/hurtColor.colorset/Contents.json b/DailyRecord/Resource/Assets.xcassets/color/emotion/hurtColor.colorset/Contents.json new file mode 100644 index 0000000..1974f97 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/color/emotion/hurtColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "183", + "green" : "205", + "red" : "226" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/color/emotion/lovelyColor.colorset/Contents.json b/DailyRecord/Resource/Assets.xcassets/color/emotion/lovelyColor.colorset/Contents.json new file mode 100644 index 0000000..60b80f8 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/color/emotion/lovelyColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "198", + "green" : "143", + "red" : "239" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/color/emotion/sleepyColor.colorset/Contents.json b/DailyRecord/Resource/Assets.xcassets/color/emotion/sleepyColor.colorset/Contents.json new file mode 100644 index 0000000..198a32d --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/color/emotion/sleepyColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "163", + "green" : "184", + "red" : "232" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/color/emotion/surprisedColor.colorset/Contents.json b/DailyRecord/Resource/Assets.xcassets/color/emotion/surprisedColor.colorset/Contents.json new file mode 100644 index 0000000..90a6226 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/color/emotion/surprisedColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "209", + "green" : "117", + "red" : "161" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/color/emotion/tiredColor.colorset/Contents.json b/DailyRecord/Resource/Assets.xcassets/color/emotion/tiredColor.colorset/Contents.json new file mode 100644 index 0000000..02393e2 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/color/emotion/tiredColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "193", + "green" : "193", + "red" : "193" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/Contents.json index bc0a6eb..4dbc465 100644 --- a/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/Contents.json +++ b/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "angry.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "angry@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "angry@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "angry.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry.png b/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry.png deleted file mode 100644 index 299b8bd..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry.svg b/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry.svg new file mode 100644 index 0000000..bda13d5 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry@2x.png b/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry@2x.png deleted file mode 100644 index 59aec81..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry@2x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry@3x.png b/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry@3x.png deleted file mode 100644 index 989c72d..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/angry.imageset/angry@3x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/embarrassed.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/embarrassed.imageset/Contents.json new file mode 100644 index 0000000..52df395 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/embarrassed.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "embarrassed.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/embarrassed.imageset/embarrassed.svg b/DailyRecord/Resource/Assets.xcassets/emotion/embarrassed.imageset/embarrassed.svg new file mode 100644 index 0000000..b074e96 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/embarrassed.imageset/embarrassed.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/Contents.json index 68d3aef..b28392f 100644 --- a/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/Contents.json +++ b/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "happy.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "happy@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "happy@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "happy.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy.png b/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy.png deleted file mode 100644 index 77bfda9..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy.svg b/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy.svg new file mode 100644 index 0000000..81506b2 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy@2x.png b/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy@2x.png deleted file mode 100644 index 0422d9f..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy@2x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy@3x.png b/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy@3x.png deleted file mode 100644 index e8b8839..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/happy.imageset/happy@3x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/hurt.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/hurt.imageset/Contents.json new file mode 100644 index 0000000..2cb2e9f --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/hurt.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "hurt.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/hurt.imageset/hurt.svg b/DailyRecord/Resource/Assets.xcassets/emotion/hurt.imageset/hurt.svg new file mode 100644 index 0000000..046772d --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/hurt.imageset/hurt.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/lovely.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/lovely.imageset/Contents.json new file mode 100644 index 0000000..3df519c --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/lovely.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "lovely.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/lovely.imageset/lovely.svg b/DailyRecord/Resource/Assets.xcassets/emotion/lovely.imageset/lovely.svg new file mode 100644 index 0000000..aae72e7 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/lovely.imageset/lovely.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/Contents.json index b38fd28..82126e7 100644 --- a/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/Contents.json +++ b/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "neutral.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "neutral@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "neutral@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "neutral.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral.png b/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral.png deleted file mode 100644 index a35f3da..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral.svg b/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral.svg new file mode 100644 index 0000000..93c389b --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral@2x.png b/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral@2x.png deleted file mode 100644 index cc79bec..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral@2x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral@3x.png b/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral@3x.png deleted file mode 100644 index 65891e8..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/neutral.imageset/neutral@3x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/Contents.json index f9601dc..190bc0f 100644 --- a/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/Contents.json +++ b/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "sad.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "sad@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "sad@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "sad.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad.png b/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad.png deleted file mode 100644 index 0f44ad7..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad.svg b/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad.svg new file mode 100644 index 0000000..b69532c --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad@2x.png b/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad@2x.png deleted file mode 100644 index 87fd9d4..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad@2x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad@3x.png b/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad@3x.png deleted file mode 100644 index 487d438..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/sad.imageset/sad@3x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/sleepy.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/sleepy.imageset/Contents.json new file mode 100644 index 0000000..8220d4e --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/sleepy.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "sleepy.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/sleepy.imageset/sleepy.svg b/DailyRecord/Resource/Assets.xcassets/emotion/sleepy.imageset/sleepy.svg new file mode 100644 index 0000000..4297b70 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/sleepy.imageset/sleepy.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/surprised.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/surprised.imageset/Contents.json new file mode 100644 index 0000000..ff2137f --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/surprised.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "surprised.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/surprised.imageset/surprised.svg b/DailyRecord/Resource/Assets.xcassets/emotion/surprised.imageset/surprised.svg new file mode 100644 index 0000000..2d3ae1b --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/surprised.imageset/surprised.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/tired.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/tired.imageset/Contents.json new file mode 100644 index 0000000..f137a0e --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/tired.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "tired.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/tired.imageset/tired.svg b/DailyRecord/Resource/Assets.xcassets/emotion/tired.imageset/tired.svg new file mode 100644 index 0000000..29ad3a9 --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/tired.imageset/tired.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/Contents.json index 6b552dd..ba38732 100644 --- a/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/Contents.json +++ b/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "very_happy.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "very_happy@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "very_happy@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "very-happy.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very-happy.svg b/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very-happy.svg new file mode 100644 index 0000000..af8ef2c --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very-happy.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very_happy.png b/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very_happy.png deleted file mode 100644 index e6e1b38..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very_happy.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very_happy@2x.png b/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very_happy@2x.png deleted file mode 100644 index 3140cf3..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very_happy@2x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very_happy@3x.png b/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very_happy@3x.png deleted file mode 100644 index 9981eeb..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/very_happy.imageset/very_happy@3x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/Contents.json b/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/Contents.json index cb59e0d..249633e 100644 --- a/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/Contents.json +++ b/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "very_sad.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "very_sad@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "very_sad@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "very-sad.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very-sad.svg b/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very-sad.svg new file mode 100644 index 0000000..34143fa --- /dev/null +++ b/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very-sad.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very_sad.png b/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very_sad.png deleted file mode 100644 index 48e5200..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very_sad.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very_sad@2x.png b/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very_sad@2x.png deleted file mode 100644 index 51fdb28..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very_sad@2x.png and /dev/null differ diff --git a/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very_sad@3x.png b/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very_sad@3x.png deleted file mode 100644 index 4cd454e..0000000 Binary files a/DailyRecord/Resource/Assets.xcassets/emotion/very_sad.imageset/very_sad@3x.png and /dev/null differ diff --git a/DailyRecord/Util/Common/Type.swift b/DailyRecord/Util/Common/Type.swift index 4c41749..3d8dbcf 100644 --- a/DailyRecord/Util/Common/Type.swift +++ b/DailyRecord/Util/Common/Type.swift @@ -10,19 +10,25 @@ import Foundation // MARK: - 감정표현 타입 enum EmotionType: String { - case none - case very_happy - case happy - case very_sad - case sad - case neutral - case angry + case none + case very_happy + case happy + case very_sad + case sad + case neutral + case angry + case embarrassed + case hurt + case lovely + case sleepy + case surprised + case tired } // MARK: - 디스플레이 모드 enum DisplayMode: String { - case system = "system" - case light = "light" - case dark = "dark" + case system = "system" + case light = "light" + case dark = "dark" } diff --git a/Widget/Assets.xcassets/emotion/angry.imageset/Contents.json b/Widget/Assets.xcassets/emotion/angry.imageset/Contents.json index bc0a6eb..4dbc465 100644 --- a/Widget/Assets.xcassets/emotion/angry.imageset/Contents.json +++ b/Widget/Assets.xcassets/emotion/angry.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "angry.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "angry@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "angry@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "angry.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/Widget/Assets.xcassets/emotion/angry.imageset/angry.png b/Widget/Assets.xcassets/emotion/angry.imageset/angry.png deleted file mode 100644 index 299b8bd..0000000 Binary files a/Widget/Assets.xcassets/emotion/angry.imageset/angry.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/angry.imageset/angry.svg b/Widget/Assets.xcassets/emotion/angry.imageset/angry.svg new file mode 100644 index 0000000..bda13d5 --- /dev/null +++ b/Widget/Assets.xcassets/emotion/angry.imageset/angry.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/angry.imageset/angry@2x.png b/Widget/Assets.xcassets/emotion/angry.imageset/angry@2x.png deleted file mode 100644 index 59aec81..0000000 Binary files a/Widget/Assets.xcassets/emotion/angry.imageset/angry@2x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/angry.imageset/angry@3x.png b/Widget/Assets.xcassets/emotion/angry.imageset/angry@3x.png deleted file mode 100644 index 989c72d..0000000 Binary files a/Widget/Assets.xcassets/emotion/angry.imageset/angry@3x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/embarrassed.imageset/Contents.json b/Widget/Assets.xcassets/emotion/embarrassed.imageset/Contents.json new file mode 100644 index 0000000..52df395 --- /dev/null +++ b/Widget/Assets.xcassets/emotion/embarrassed.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "embarrassed.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/Widget/Assets.xcassets/emotion/embarrassed.imageset/embarrassed.svg b/Widget/Assets.xcassets/emotion/embarrassed.imageset/embarrassed.svg new file mode 100644 index 0000000..b074e96 --- /dev/null +++ b/Widget/Assets.xcassets/emotion/embarrassed.imageset/embarrassed.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/happy.imageset/Contents.json b/Widget/Assets.xcassets/emotion/happy.imageset/Contents.json index 68d3aef..b28392f 100644 --- a/Widget/Assets.xcassets/emotion/happy.imageset/Contents.json +++ b/Widget/Assets.xcassets/emotion/happy.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "happy.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "happy@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "happy@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "happy.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/Widget/Assets.xcassets/emotion/happy.imageset/happy.png b/Widget/Assets.xcassets/emotion/happy.imageset/happy.png deleted file mode 100644 index 77bfda9..0000000 Binary files a/Widget/Assets.xcassets/emotion/happy.imageset/happy.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/happy.imageset/happy.svg b/Widget/Assets.xcassets/emotion/happy.imageset/happy.svg new file mode 100644 index 0000000..81506b2 --- /dev/null +++ b/Widget/Assets.xcassets/emotion/happy.imageset/happy.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/happy.imageset/happy@2x.png b/Widget/Assets.xcassets/emotion/happy.imageset/happy@2x.png deleted file mode 100644 index 0422d9f..0000000 Binary files a/Widget/Assets.xcassets/emotion/happy.imageset/happy@2x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/happy.imageset/happy@3x.png b/Widget/Assets.xcassets/emotion/happy.imageset/happy@3x.png deleted file mode 100644 index e8b8839..0000000 Binary files a/Widget/Assets.xcassets/emotion/happy.imageset/happy@3x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/hurt.imageset/Contents.json b/Widget/Assets.xcassets/emotion/hurt.imageset/Contents.json new file mode 100644 index 0000000..2cb2e9f --- /dev/null +++ b/Widget/Assets.xcassets/emotion/hurt.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "hurt.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/Widget/Assets.xcassets/emotion/hurt.imageset/hurt.svg b/Widget/Assets.xcassets/emotion/hurt.imageset/hurt.svg new file mode 100644 index 0000000..046772d --- /dev/null +++ b/Widget/Assets.xcassets/emotion/hurt.imageset/hurt.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/lovely.imageset/Contents.json b/Widget/Assets.xcassets/emotion/lovely.imageset/Contents.json new file mode 100644 index 0000000..3df519c --- /dev/null +++ b/Widget/Assets.xcassets/emotion/lovely.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "lovely.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/Widget/Assets.xcassets/emotion/lovely.imageset/lovely.svg b/Widget/Assets.xcassets/emotion/lovely.imageset/lovely.svg new file mode 100644 index 0000000..aae72e7 --- /dev/null +++ b/Widget/Assets.xcassets/emotion/lovely.imageset/lovely.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/neutral.imageset/Contents.json b/Widget/Assets.xcassets/emotion/neutral.imageset/Contents.json index b38fd28..82126e7 100644 --- a/Widget/Assets.xcassets/emotion/neutral.imageset/Contents.json +++ b/Widget/Assets.xcassets/emotion/neutral.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "neutral.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "neutral@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "neutral@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "neutral.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/Widget/Assets.xcassets/emotion/neutral.imageset/neutral.png b/Widget/Assets.xcassets/emotion/neutral.imageset/neutral.png deleted file mode 100644 index a35f3da..0000000 Binary files a/Widget/Assets.xcassets/emotion/neutral.imageset/neutral.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/neutral.imageset/neutral.svg b/Widget/Assets.xcassets/emotion/neutral.imageset/neutral.svg new file mode 100644 index 0000000..93c389b --- /dev/null +++ b/Widget/Assets.xcassets/emotion/neutral.imageset/neutral.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/neutral.imageset/neutral@2x.png b/Widget/Assets.xcassets/emotion/neutral.imageset/neutral@2x.png deleted file mode 100644 index cc79bec..0000000 Binary files a/Widget/Assets.xcassets/emotion/neutral.imageset/neutral@2x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/neutral.imageset/neutral@3x.png b/Widget/Assets.xcassets/emotion/neutral.imageset/neutral@3x.png deleted file mode 100644 index 65891e8..0000000 Binary files a/Widget/Assets.xcassets/emotion/neutral.imageset/neutral@3x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/sad.imageset/Contents.json b/Widget/Assets.xcassets/emotion/sad.imageset/Contents.json index f9601dc..190bc0f 100644 --- a/Widget/Assets.xcassets/emotion/sad.imageset/Contents.json +++ b/Widget/Assets.xcassets/emotion/sad.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "sad.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "sad@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "sad@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "sad.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/Widget/Assets.xcassets/emotion/sad.imageset/sad.png b/Widget/Assets.xcassets/emotion/sad.imageset/sad.png deleted file mode 100644 index 0f44ad7..0000000 Binary files a/Widget/Assets.xcassets/emotion/sad.imageset/sad.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/sad.imageset/sad.svg b/Widget/Assets.xcassets/emotion/sad.imageset/sad.svg new file mode 100644 index 0000000..b69532c --- /dev/null +++ b/Widget/Assets.xcassets/emotion/sad.imageset/sad.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/sad.imageset/sad@2x.png b/Widget/Assets.xcassets/emotion/sad.imageset/sad@2x.png deleted file mode 100644 index 87fd9d4..0000000 Binary files a/Widget/Assets.xcassets/emotion/sad.imageset/sad@2x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/sad.imageset/sad@3x.png b/Widget/Assets.xcassets/emotion/sad.imageset/sad@3x.png deleted file mode 100644 index 487d438..0000000 Binary files a/Widget/Assets.xcassets/emotion/sad.imageset/sad@3x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/sleepy.imageset/Contents.json b/Widget/Assets.xcassets/emotion/sleepy.imageset/Contents.json new file mode 100644 index 0000000..8220d4e --- /dev/null +++ b/Widget/Assets.xcassets/emotion/sleepy.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "sleepy.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/Widget/Assets.xcassets/emotion/sleepy.imageset/sleepy.svg b/Widget/Assets.xcassets/emotion/sleepy.imageset/sleepy.svg new file mode 100644 index 0000000..4297b70 --- /dev/null +++ b/Widget/Assets.xcassets/emotion/sleepy.imageset/sleepy.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/surprised.imageset/Contents.json b/Widget/Assets.xcassets/emotion/surprised.imageset/Contents.json new file mode 100644 index 0000000..ff2137f --- /dev/null +++ b/Widget/Assets.xcassets/emotion/surprised.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "surprised.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/Widget/Assets.xcassets/emotion/surprised.imageset/surprised.svg b/Widget/Assets.xcassets/emotion/surprised.imageset/surprised.svg new file mode 100644 index 0000000..2d3ae1b --- /dev/null +++ b/Widget/Assets.xcassets/emotion/surprised.imageset/surprised.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/tired.imageset/Contents.json b/Widget/Assets.xcassets/emotion/tired.imageset/Contents.json new file mode 100644 index 0000000..f137a0e --- /dev/null +++ b/Widget/Assets.xcassets/emotion/tired.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "tired.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" + } +} diff --git a/Widget/Assets.xcassets/emotion/tired.imageset/tired.svg b/Widget/Assets.xcassets/emotion/tired.imageset/tired.svg new file mode 100644 index 0000000..29ad3a9 --- /dev/null +++ b/Widget/Assets.xcassets/emotion/tired.imageset/tired.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/very_happy.imageset/Contents.json b/Widget/Assets.xcassets/emotion/very_happy.imageset/Contents.json index 6b552dd..ba38732 100644 --- a/Widget/Assets.xcassets/emotion/very_happy.imageset/Contents.json +++ b/Widget/Assets.xcassets/emotion/very_happy.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "very_happy.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "very_happy@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "very_happy@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "very-happy.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/Widget/Assets.xcassets/emotion/very_happy.imageset/very-happy.svg b/Widget/Assets.xcassets/emotion/very_happy.imageset/very-happy.svg new file mode 100644 index 0000000..af8ef2c --- /dev/null +++ b/Widget/Assets.xcassets/emotion/very_happy.imageset/very-happy.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/very_happy.imageset/very_happy.png b/Widget/Assets.xcassets/emotion/very_happy.imageset/very_happy.png deleted file mode 100644 index e6e1b38..0000000 Binary files a/Widget/Assets.xcassets/emotion/very_happy.imageset/very_happy.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/very_happy.imageset/very_happy@2x.png b/Widget/Assets.xcassets/emotion/very_happy.imageset/very_happy@2x.png deleted file mode 100644 index 3140cf3..0000000 Binary files a/Widget/Assets.xcassets/emotion/very_happy.imageset/very_happy@2x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/very_happy.imageset/very_happy@3x.png b/Widget/Assets.xcassets/emotion/very_happy.imageset/very_happy@3x.png deleted file mode 100644 index 9981eeb..0000000 Binary files a/Widget/Assets.xcassets/emotion/very_happy.imageset/very_happy@3x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/very_sad.imageset/Contents.json b/Widget/Assets.xcassets/emotion/very_sad.imageset/Contents.json index cb59e0d..249633e 100644 --- a/Widget/Assets.xcassets/emotion/very_sad.imageset/Contents.json +++ b/Widget/Assets.xcassets/emotion/very_sad.imageset/Contents.json @@ -1,23 +1,16 @@ { "images" : [ { - "filename" : "very_sad.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "very_sad@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "very_sad@3x.png", - "idiom" : "universal", - "scale" : "3x" + "filename" : "very-sad.svg", + "idiom" : "universal" } ], "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "original" } } diff --git a/Widget/Assets.xcassets/emotion/very_sad.imageset/very-sad.svg b/Widget/Assets.xcassets/emotion/very_sad.imageset/very-sad.svg new file mode 100644 index 0000000..34143fa --- /dev/null +++ b/Widget/Assets.xcassets/emotion/very_sad.imageset/very-sad.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Widget/Assets.xcassets/emotion/very_sad.imageset/very_sad.png b/Widget/Assets.xcassets/emotion/very_sad.imageset/very_sad.png deleted file mode 100644 index 48e5200..0000000 Binary files a/Widget/Assets.xcassets/emotion/very_sad.imageset/very_sad.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/very_sad.imageset/very_sad@2x.png b/Widget/Assets.xcassets/emotion/very_sad.imageset/very_sad@2x.png deleted file mode 100644 index 51fdb28..0000000 Binary files a/Widget/Assets.xcassets/emotion/very_sad.imageset/very_sad@2x.png and /dev/null differ diff --git a/Widget/Assets.xcassets/emotion/very_sad.imageset/very_sad@3x.png b/Widget/Assets.xcassets/emotion/very_sad.imageset/very_sad@3x.png deleted file mode 100644 index 4cd454e..0000000 Binary files a/Widget/Assets.xcassets/emotion/very_sad.imageset/very_sad@3x.png and /dev/null differ diff --git a/fastlane/screenshots/ko/0_APP_IPHONE_67_0.jpg b/fastlane/screenshots/ko/0_APP_IPHONE_67_0.jpg index 4ba7da7..9e11f33 100644 Binary files a/fastlane/screenshots/ko/0_APP_IPHONE_67_0.jpg and b/fastlane/screenshots/ko/0_APP_IPHONE_67_0.jpg differ diff --git a/fastlane/screenshots/ko/1_APP_IPHONE_67_1.jpg b/fastlane/screenshots/ko/1_APP_IPHONE_67_1.jpg index ecf6d59..3dd5007 100644 Binary files a/fastlane/screenshots/ko/1_APP_IPHONE_67_1.jpg and b/fastlane/screenshots/ko/1_APP_IPHONE_67_1.jpg differ diff --git a/fastlane/screenshots/ko/2_APP_IPHONE_67_2.jpg b/fastlane/screenshots/ko/2_APP_IPHONE_67_2.jpg index ba60459..09431f3 100644 Binary files a/fastlane/screenshots/ko/2_APP_IPHONE_67_2.jpg and b/fastlane/screenshots/ko/2_APP_IPHONE_67_2.jpg differ diff --git a/fastlane/screenshots/ko/3_APP_IPHONE_67_3.jpg b/fastlane/screenshots/ko/3_APP_IPHONE_67_3.jpg index ddfb8c9..645c36b 100644 Binary files a/fastlane/screenshots/ko/3_APP_IPHONE_67_3.jpg and b/fastlane/screenshots/ko/3_APP_IPHONE_67_3.jpg differ diff --git a/fastlane/screenshots/ko/4_APP_IPHONE_67_4.jpg b/fastlane/screenshots/ko/4_APP_IPHONE_67_4.jpg index 8eec1b5..dfb616d 100644 Binary files a/fastlane/screenshots/ko/4_APP_IPHONE_67_4.jpg and b/fastlane/screenshots/ko/4_APP_IPHONE_67_4.jpg differ