diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index b130f520..b00d4ac8 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -201,6 +201,14 @@ F8C83FC7272FA2A20009DF0D /* CardService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C83FC6272FA2A20009DF0D /* CardService.swift */; }; F8C83FC9272FA3190009DF0D /* GroupAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C83FC8272FA3190009DF0D /* GroupAPI.swift */; }; F8C83FCB272FA32C0009DF0D /* GroupService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C83FCA272FA32C0009DF0D /* GroupService.swift */; }; + F8D62F982A049CB800F9DF11 /* NotoSansCJKkr-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39369930274A4FCB00684420 /* NotoSansCJKkr-Bold.otf */; }; + F8D62F992A049CB800F9DF11 /* NotoSansCJKkr-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39369931274A4FCB00684420 /* NotoSansCJKkr-Regular.otf */; }; + F8D62F9A2A049CB800F9DF11 /* Spoqa Han Sans Neo Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39369933274A4FCB00684420 /* Spoqa Han Sans Neo Bold.otf */; }; + F8D62F9B2A049CB800F9DF11 /* Spoqa Han Sans Neo Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39369934274A4FCB00684420 /* Spoqa Han Sans Neo Regular.otf */; }; + F8D62F9C2A049CB800F9DF11 /* NotoSansCJKkr-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39369932274A4FCB00684420 /* NotoSansCJKkr-Medium.otf */; }; + F8D62F9E2A049D5C00F9DF11 /* Font+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8D62F9D2A049D5C00F9DF11 /* Font+Extension.swift */; }; + F8D62FA62A06742000F9DF11 /* Spoqa Han Sans Neo Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = F8D62FA52A06742000F9DF11 /* Spoqa Han Sans Neo Medium.otf */; }; + F8D62FA82A06742600F9DF11 /* Spoqa Han Sans Neo Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = F8D62FA52A06742000F9DF11 /* Spoqa Han Sans Neo Medium.otf */; }; F8D74DD8276C7FB60071E5FC /* UIImageView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8D74DD7276C7FB60071E5FC /* UIImageView+Extension.swift */; }; F8D92E0A29D5324E002ACC73 /* Taste.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8D92E0929D5324E002ACC73 /* Taste.swift */; }; F8F00C3929DD474700A15377 /* UpdateNote.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8F00C3829DD474700A15377 /* UpdateNote.swift */; }; @@ -459,6 +467,8 @@ F8C83FC6272FA2A20009DF0D /* CardService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardService.swift; sourceTree = ""; }; F8C83FC8272FA3190009DF0D /* GroupAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupAPI.swift; sourceTree = ""; }; F8C83FCA272FA32C0009DF0D /* GroupService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupService.swift; sourceTree = ""; }; + F8D62F9D2A049D5C00F9DF11 /* Font+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font+Extension.swift"; sourceTree = ""; }; + F8D62FA52A06742000F9DF11 /* Spoqa Han Sans Neo Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Spoqa Han Sans Neo Medium.otf"; sourceTree = ""; }; F8D74DD7276C7FB60071E5FC /* UIImageView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImageView+Extension.swift"; sourceTree = ""; }; F8D92E0929D5324E002ACC73 /* Taste.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Taste.swift; sourceTree = ""; }; F8F00C3829DD474700A15377 /* UpdateNote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateNote.swift; sourceTree = ""; }; @@ -736,6 +746,7 @@ 39369931274A4FCB00684420 /* NotoSansCJKkr-Regular.otf */, 39369933274A4FCB00684420 /* Spoqa Han Sans Neo Bold.otf */, 39369934274A4FCB00684420 /* Spoqa Han Sans Neo Regular.otf */, + F8D62FA52A06742000F9DF11 /* Spoqa Han Sans Neo Medium.otf */, ); path = Font; sourceTree = ""; @@ -1110,6 +1121,7 @@ isa = PBXGroup; children = ( F87D2222298EA616001A882B /* Color+Extension.swift */, + F8D62F9D2A049D5C00F9DF11 /* Font+Extension.swift */, ); path = Extension; sourceTree = ""; @@ -1587,6 +1599,12 @@ buildActionMask = 2147483647; files = ( F838B66C298E5C5400D84340 /* Assets.xcassets in Resources */, + F8D62F9B2A049CB800F9DF11 /* Spoqa Han Sans Neo Regular.otf in Resources */, + F8D62F9A2A049CB800F9DF11 /* Spoqa Han Sans Neo Bold.otf in Resources */, + F8D62F992A049CB800F9DF11 /* NotoSansCJKkr-Regular.otf in Resources */, + F8D62F982A049CB800F9DF11 /* NotoSansCJKkr-Bold.otf in Resources */, + F8D62F9C2A049CB800F9DF11 /* NotoSansCJKkr-Medium.otf in Resources */, + F8D62FA82A06742600F9DF11 /* Spoqa Han Sans Neo Medium.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1652,6 +1670,7 @@ F8518055275D040C006BD5ED /* OnboardingCollectionViewCell.xib in Resources */, 39F5A3D1271461EA00191F94 /* BackCardCell.xib in Resources */, 39369939274A4FCB00684420 /* Spoqa Han Sans Neo Regular.otf in Resources */, + F8D62FA62A06742000F9DF11 /* Spoqa Han Sans Neo Medium.otf in Resources */, 39369938274A4FCB00684420 /* Spoqa Han Sans Neo Bold.otf in Resources */, F8458D6229F5183B000D53A7 /* FanCardCreation.storyboard in Resources */, 7781294A275F6ED7004B34F4 /* CardDetail.storyboard in Resources */, @@ -1737,6 +1756,7 @@ F838B66E298E5C5400D84340 /* Widgets.intentdefinition in Sources */, F838B667298E5C5300D84340 /* WidgetsLiveActivity.swift in Sources */, F8BCDD25298FFAF90044D0B4 /* WidgetsBundle.swift in Sources */, + F8D62F9E2A049D5C00F9DF11 /* Font+Extension.swift in Sources */, F8BCDD22298FFA830044D0B4 /* QRCodeWidget.swift in Sources */, F8BCDD26298FFB0B0044D0B4 /* MyCardWidget.swift in Sources */, F8257750299546920067E145 /* Card.swift in Sources */, diff --git a/NADA-iOS-forRelease/Info.plist b/NADA-iOS-forRelease/Info.plist index 4e89be9f..a60068e5 100644 --- a/NADA-iOS-forRelease/Info.plist +++ b/NADA-iOS-forRelease/Info.plist @@ -67,6 +67,7 @@ NotoSansCJKkr-Regular.otf Spoqa Han Sans Neo Bold.otf Spoqa Han Sans Neo Regular.otf + Spoqa Han Sans Neo Medium.otf UIApplicationSceneManifest diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/Contents.json deleted file mode 100644 index 2d49b401..00000000 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "backCardBg.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "backCardBg@2x.png", - "scale" : "2x", - "idiom" : "universal" - }, - { - "scale" : "3x", - "idiom" : "universal", - "filename" : "backCardBg@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/backCardBg.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/backCardBg.png deleted file mode 100644 index d51ccf21..00000000 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/backCardBg.png and /dev/null differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/backCardBg@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/backCardBg@2x.png deleted file mode 100644 index 60d4df02..00000000 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/backCardBg@2x.png and /dev/null differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/backCardBg@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/backCardBg@3x.png deleted file mode 100644 index 41de665b..00000000 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/backCardBg.imageset/backCardBg@3x.png and /dev/null differ diff --git a/NADA-iOS-forRelease/Resouces/Font/Spoqa Han Sans Neo Medium.otf b/NADA-iOS-forRelease/Resouces/Font/Spoqa Han Sans Neo Medium.otf new file mode 100644 index 00000000..ba3da28e Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Font/Spoqa Han Sans Neo Medium.otf differ diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift index 75854328..6518a461 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift @@ -22,7 +22,6 @@ class BackCardCell: CardCell { @IBOutlet var tasteImageViews: [UIImageView]! @IBOutlet var tasteLabels: [UILabel]! @IBOutlet weak var tmiTitleLabel: UILabel! - @IBOutlet weak var shareButton: UIButton! @IBOutlet weak var tmiLabel: UILabel! // MARK: - View Life Cycle @@ -30,9 +29,6 @@ class BackCardCell: CardCell { super.awakeFromNib() setUI() } - @IBAction func touchShareButton(_ sender: Any) { - NotificationCenter.default.post(name: Notification.Name.presentCardShare, object: cardData, userInfo: nil) - } // MARK: - Functions static func nib() -> UINib { @@ -42,9 +38,7 @@ class BackCardCell: CardCell { // MARK: - Extensions extension BackCardCell { - private func setUI() { - backgroundImageView.image = UIImage(named: "backCardBg") - + private func setUI() { tasteTitleLabel.font = .title02 tasteTitleLabel.textColor = .white @@ -61,7 +55,12 @@ extension BackCardCell { tmiLabel.numberOfLines = 0 } - func initCell(cardTasteInfo: [CardTasteInfo], tmi: String?, isShareable: Bool = false) { + /// 명함 미리보기 시 사용. + func initCell(_ backgroundImage: UIImage?, + _ cardTasteInfo: [CardTasteInfo], + _ tmi: String?) { + backgroundImageView.image = backgroundImage + let cardTasteInfo: [CardTasteInfo] = cardTasteInfo.sorted { $0.sortOrder > $1.sortOrder } for index in stride(from: 0, to: cardTasteInfo.count, by: 2) { @@ -77,13 +76,37 @@ extension BackCardCell { tasteLabels[index].textColor = cardTasteInfo[index].isChoose ? .tasteLabel : .tasteLabel.withAlphaComponent(0.5) } - if let tmi { - tmiLabel.text = tmi + tmiLabel.text = tmi + } + + /// 명함 조회 시 사용. + func initCell(_ backgroundImage: String, + _ cardTasteInfo: [CardTasteInfo], + _ tmi: String?) { + if backgroundImage.hasPrefix("https://") { + self.backgroundImageView.updateServerImage(backgroundImage) } else { - tmiLabel.text = "" + if let bgImage = UIImage(named: backgroundImage) { + self.backgroundImageView.image = bgImage + } + } + + let cardTasteInfo: [CardTasteInfo] = cardTasteInfo.sorted { $0.sortOrder > $1.sortOrder } + + for index in stride(from: 0, to: cardTasteInfo.count, by: 2) { + if cardTasteInfo[index].isChoose { + tasteImageViews[index / 2].image = UIImage(named: "imgBalanceLeft") + } else { + tasteImageViews[index / 2].image = UIImage(named: "imgBalanceRight") + } + } + + for index in 0.. - + @@ -71,14 +71,6 @@ - - @@ -227,7 +216,4 @@ - - - diff --git a/NADA-iOS-forRelease/Sources/Cells/CardCell/MainCardCell.swift b/NADA-iOS-forRelease/Sources/Cells/CardCell/MainCardCell.swift index 3a826b63..70cc8827 100644 --- a/NADA-iOS-forRelease/Sources/Cells/CardCell/MainCardCell.swift +++ b/NADA-iOS-forRelease/Sources/Cells/CardCell/MainCardCell.swift @@ -98,8 +98,7 @@ extension MainCardCell { guard let backCard = BackCardCell.nib().instantiate(withOwner: self, options: nil).first as? BackCardCell else { return } backCard.frame = CGRect(x: 0, y: 0, width: contentView.frame.width, height: contentView.frame.height) guard let cardDataModel = cardDataModel else { return } - backCard.initCell(cardTasteInfo: cardDataModel.cardTastes, tmi: cardDataModel.tmi) - + backCard.initCell(cardDataModel.cardImage, cardDataModel.cardTastes, cardDataModel.tmi) contentView.addSubview(backCard) isFront = false } else { diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift index dc461672..0777f3c4 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardShareBottomSheetViewController.swift @@ -450,7 +450,7 @@ class CardShareBottomSheetViewController: CommonBottomSheetViewController { guard let backCard = BackCardCell.nib().instantiate(withOwner: self, options: nil).first as? BackCardCell else { return UIImage() } backCard.frame = CGRect(x: 0, y: 0, width: 327, height: 540) guard let cardDataModel = cardDataModel else { return UIImage() } - backCard.initCell(cardTasteInfo: cardDataModel.cardTastes, tmi: cardDataModel.tmi, isShareable: isShareable) + backCard.initCell(cardDataModel.cardImage, cardDataModel.cardTastes, cardDataModel.tmi) let backCardView = UIView(frame: CGRect(x: 0, y: 0, width: 327, height: 540)) backCardView.addSubview(backCard) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationPreviewViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationPreviewViewController.swift index 5fe7c8be..76708f0b 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationPreviewViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/VC/CardCreationPreviewViewController.swift @@ -198,8 +198,7 @@ extension CardCreationPreviewViewController { isChoose: backCardDataModel.tastes.contains(tasteInfo[index].tasteName), sortOrder: tasteInfo[index].sortOrder)) } - - backCard.initCell(cardTasteInfo: cardTasteInfo, tmi: backCardDataModel.tmi) + backCard.initCell(cardBackgroundImage, cardTasteInfo, backCardDataModel.tmi) cardView.addSubview(backCard) isFront = false diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift index 6955d212..e0bab289 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift @@ -222,7 +222,7 @@ extension CardDetailViewController { guard let backCard = BackCardCell.nib().instantiate(withOwner: self, options: nil).first as? BackCardCell else { return } backCard.frame = CGRect(x: 0, y: 0, width: cardView.frame.width, height: cardView.frame.height) guard let cardDataModel = cardDataModel else { return } - backCard.initCell(cardTasteInfo: cardDataModel.cardTastes, tmi: cardDataModel.tmi) + backCard.initCell(cardDataModel.cardImage, cardDataModel.cardTastes, cardDataModel.tmi) cardView.addSubview(backCard) isFront = false diff --git a/Widgets/Resource/Extension/Color+Extension.swift b/Widgets/Resource/Extension/Color+Extension.swift index f7b45a6e..bf31c0fd 100644 --- a/Widgets/Resource/Extension/Color+Extension.swift +++ b/Widgets/Resource/Extension/Color+Extension.swift @@ -11,11 +11,11 @@ extension Color { static func backgroundColor(for colorScheme: ColorScheme) -> Color { switch colorScheme { case .light: - return Color(red: 255.0 / 255.0, green: 255.0 / 255.0, blue: 255.0 / 255.0) + return Color(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0) case .dark: - return Color(red: 19.0 / 255.0, green: 20.0 / 255.0, blue: 22.0 / 255.0, opacity: 0.5) + return Color(red: 43.0 / 255.0, green: 45.0 / 255.0, blue: 49.0 / 255.0) @unknown default: - return Color(red: 255.0 / 255.0, green: 255.0 / 255.0, blue: 255.0 / 255.0) + return Color(red: 241.0 / 255.0, green: 243.0 / 255.0, blue: 245.0 / 255.0) } } diff --git a/Widgets/Resource/Extension/Font+Extension.swift b/Widgets/Resource/Extension/Font+Extension.swift new file mode 100644 index 00000000..d3d253ce --- /dev/null +++ b/Widgets/Resource/Extension/Font+Extension.swift @@ -0,0 +1,13 @@ +// +// Font+Extension.swift +// WidgetsExtension +// +// Created by kimhyungyu on 2023/05/05. +// + +import SwiftUI + +extension Font { + static let cardName = Font.custom("SpoqaHanSansNeo-Medium", size: 15) + static let userName = Font.custom("SpoqaHanSansNeo-Bold", size: 15) +} diff --git a/Widgets/Resource/Info.plist b/Widgets/Resource/Info.plist index 0f118fb7..a79cfdc8 100644 --- a/Widgets/Resource/Info.plist +++ b/Widgets/Resource/Info.plist @@ -7,5 +7,14 @@ NSExtensionPointIdentifier com.apple.widgetkit-extension + UIAppFonts + + NotoSansCJKkr-Bold.otf + NotoSansCJKkr-Medium.otf + NotoSansCJKkr-Regular.otf + Spoqa Han Sans Neo Bold.otf + Spoqa Han Sans Neo Regular.otf + Spoqa Han Sans Neo Medium.otf + diff --git a/Widgets/WidgetsBundle/MyCardWidget.swift b/Widgets/WidgetsBundle/MyCardWidget.swift index 4550c4f3..83b9acb8 100644 --- a/Widgets/WidgetsBundle/MyCardWidget.swift +++ b/Widgets/WidgetsBundle/MyCardWidget.swift @@ -101,19 +101,19 @@ struct MyCardEntryView: View { VStack { HStack { Text(widgetCard.title) - .font(.system(size: 15)) - .foregroundColor(.init(white: 1.0, opacity: 0.8)) + .font(.cardName) + .foregroundColor(.init(white: 1.0)) .padding(EdgeInsets(top: 12, leading: 10, bottom: 0, trailing: 0)) .lineLimit(1) Spacer() Image("logoNada") - .padding(EdgeInsets(top: 10, leading: 0, bottom: 0, trailing: 10)) + .padding(EdgeInsets(top: 10, leading: 0, bottom: 10, trailing: 10)) } Spacer() HStack { Spacer() Text(widgetCard.userName) - .font(.system(size: 15)) + .font(.userName) .foregroundColor(.userNameColor(for: colorScheme)) .padding(EdgeInsets(top: 0, leading: 10, bottom: 11, trailing: 10)) .lineLimit(1)