diff --git a/Keychy/Keychy/Core/Components/View/Items/ItemDetailInfoSection.swift b/Keychy/Keychy/Core/Components/View/Items/ItemDetailInfoSection.swift index d9c78fc8e..4b57e34d1 100644 --- a/Keychy/Keychy/Core/Components/View/Items/ItemDetailInfoSection.swift +++ b/Keychy/Keychy/Core/Components/View/Items/ItemDetailInfoSection.swift @@ -17,7 +17,7 @@ struct ItemDetailInfoSection: View { HStack(spacing: 8) { /// 유료 태그 표시 if !item.isFree { - Image(.paidIcon) + Image(.myCoinMini) .resizable() .scaledToFit() .frame(width: 21) diff --git a/Keychy/Keychy/Core/Components/View/Popup/InvenExpandPopup.swift b/Keychy/Keychy/Core/Components/View/Popup/InvenExpandPopup.swift index b694591e8..126ea5465 100644 --- a/Keychy/Keychy/Core/Components/View/Popup/InvenExpandPopup.swift +++ b/Keychy/Keychy/Core/Components/View/Popup/InvenExpandPopup.swift @@ -63,7 +63,7 @@ struct InvenExpandPopup: View { Button(action: onConfirm) { HStack(spacing: 4) { - Image(.buyKey) + Image(.myCoinMini) .resizable() .frame(width: 34, height: 34) .padding(.bottom, 4) diff --git a/Keychy/Keychy/Core/Components/View/Popup/PurchasePopup.swift b/Keychy/Keychy/Core/Components/View/Popup/PurchasePopup.swift index c21efb2f4..4552e8086 100644 --- a/Keychy/Keychy/Core/Components/View/Popup/PurchasePopup.swift +++ b/Keychy/Keychy/Core/Components/View/Popup/PurchasePopup.swift @@ -41,7 +41,7 @@ struct PurchasePopup: View { // 버튼 Button(action: onConfirm) { HStack(spacing: 4) { - Image(.buyKey) + Image(.myCoinMini) .resizable() .frame(width: 34, height: 34) .padding(.bottom, 4) diff --git a/Keychy/Keychy/Presentation/Bundle/Views/BundleCreateView.swift b/Keychy/Keychy/Presentation/Bundle/Views/BundleCreateView.swift index 9cde84b5a..7a44589e6 100644 --- a/Keychy/Keychy/Presentation/Bundle/Views/BundleCreateView.swift +++ b/Keychy/Keychy/Presentation/Bundle/Views/BundleCreateView.swift @@ -447,7 +447,7 @@ extension BundleCreateView { if isPurchasing { LoadingAlert(type: .short40, message: nil) } else { - Image(.purchaseSheet) + Image(.myCoinMini) } Text("\(totalCartPrice)") diff --git a/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+Purchase.swift b/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+Purchase.swift index b57b1d10e..9b193117d 100644 --- a/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+Purchase.swift +++ b/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+Purchase.swift @@ -96,7 +96,7 @@ extension BundleEditView { if isPurchasing { LoadingAlert(type: .short40, message: nil) } else { - Image(.purchaseSheet) + Image(.myCoinMini) } Text("\(totalCartPrice)") diff --git a/Keychy/Keychy/Presentation/KeyringMaker/Shared/Views/KeyringCustomizingView+PurchaseSheet.swift b/Keychy/Keychy/Presentation/KeyringMaker/Shared/Views/KeyringCustomizingView+PurchaseSheet.swift index e963d12a3..e7172cc5b 100644 --- a/Keychy/Keychy/Presentation/KeyringMaker/Shared/Views/KeyringCustomizingView+PurchaseSheet.swift +++ b/Keychy/Keychy/Presentation/KeyringMaker/Shared/Views/KeyringCustomizingView+PurchaseSheet.swift @@ -116,7 +116,7 @@ extension KeyringCustomizingView { } } label: { HStack(spacing: 5) { - Image(.purchaseSheet) + Image(.myCoinMini) Text("\(totalCartPrice)") .typography(.nanum18EB12) @@ -126,7 +126,7 @@ extension KeyringCustomizingView { } .foregroundStyle(.white100) .frame(maxWidth: .infinity) - .padding(.vertical, 6) + .padding(.vertical, 13.5) .background(.black80) .clipShape(RoundedRectangle(cornerRadius: 100)) } diff --git a/Keychy/Keychy/Presentation/Workshop/Coin/CoinChargeView.swift b/Keychy/Keychy/Presentation/Workshop/Coin/CoinChargeView.swift index 89b376035..3ceb0dab7 100644 --- a/Keychy/Keychy/Presentation/Workshop/Coin/CoinChargeView.swift +++ b/Keychy/Keychy/Presentation/Workshop/Coin/CoinChargeView.swift @@ -38,12 +38,14 @@ struct CoinChargeView: View { if hasNetworkError { networkErrorView } else { - VStack(spacing: 37) { + VStack { // 내 아이템들 현황판 CurrentItemsCard() + .padding(.bottom, 25) // 코인 구매 섹션 coinSection + .padding(.bottom, 45) // 기타 아이템 섹션 otherItemsSection @@ -115,10 +117,11 @@ struct CoinChargeView: View { // MARK: - Coin Section 코인 구매 섹션 extension CoinChargeView { private var coinSection: some View { - VStack(alignment: .leading, spacing: 20) { + VStack(alignment: .leading, spacing: 0) { sectionTitle("코인") + .padding(.bottom, 15) - VStack(spacing: 30) { + VStack(spacing: 35) { ForEach(manager.products, id: \.id) { product in coinRow(for: product) } @@ -127,11 +130,8 @@ extension CoinChargeView { } private func coinRow(for product: Product) -> some View { - HStack(spacing: 8) { - Image(.buyKey) - .resizable() - .scaledToFit() - .frame(width: 24, height: 24) + HStack(spacing: 5) { + Image(.myCoinMini) if let storeProduct = StoreProduct(rawValue: product.id) { Text("\(storeProduct.coinAmount)개") @@ -157,7 +157,7 @@ extension CoinChargeView { .typography(.suit14M) .foregroundStyle(.white100) .frame(width: 74, height: 30) - .background(.black100) + .background(.black80) .cornerRadius(4) } .disabled(isCoinPurchasing) @@ -168,10 +168,11 @@ extension CoinChargeView { // MARK: - Other Items Section 하단 기타 아이템 섹션 extension CoinChargeView { private var otherItemsSection: some View { - VStack(alignment: .leading, spacing: 20) { + VStack(alignment: .leading, spacing: 0) { sectionTitle("기타 아이템") + .padding(.bottom, 15) - VStack(spacing: 30) { + VStack(spacing: 28) { otherItemRow(item: .inventoryExpansion) otherItemRow(item: .copyVoucher10) } @@ -179,19 +180,16 @@ extension CoinChargeView { } private func otherItemRow(item: OtherItem) -> some View { - HStack(spacing: 10) { + HStack(alignment: .top ,spacing: 11) { Image(item.icon) - .resizable() - .scaledToFit() - .frame(width: 24, height: 24) VStack(alignment: .leading, spacing: 4) { Text(item.title) .typography(.suit16M) - .foregroundStyle(.black100) + .foregroundStyle(.black80) Text(item.itemDescription) - .typography(.suit13M) + .typography(.suit12M) .foregroundStyle(.gray500) } @@ -201,18 +199,15 @@ extension CoinChargeView { selectedItem = item showPurchaseSheet = true } label: { - HStack(spacing: 2) { - Image(.buyKey) - .resizable() - .scaledToFit() - .frame(width: 24, height: 24) + HStack(spacing: 5) { + Image(.myCoinMini) Text("\(item.price)") .typography(.suit14SB18) .foregroundStyle(.white) } - .frame(width: 80, height: 30) - .background(.black100) + .frame(width: 74, height: 30) + .background(.black80) .cornerRadius(4) } } @@ -262,7 +257,6 @@ extension CoinChargeView { // 구매 버튼 purchaseButton .padding(.horizontal, 20) - .padding(.bottom, 30) } .background( GeometryReader { geometry in @@ -295,13 +289,10 @@ extension CoinChargeView { private func purchaseItemRow(item: OtherItem) -> some View { HStack(spacing: 0) { Image(item.icon) - .resizable() - .scaledToFit() - .frame(width: 24, height: 24) .padding(.trailing, 12) Text(item.title) - .typography(.suit17B) + .typography(.suit16M) .foregroundStyle(.black100) Spacer() @@ -337,14 +328,14 @@ extension CoinChargeView { } } label: { HStack(spacing: 5) { - Image(.purchaseSheet) + Image(.myCoinMini) Text("\(selectedItem?.price ?? 0)") .typography(.nanum18EB12) } .foregroundStyle(.white100) .frame(maxWidth: .infinity) - .padding(.vertical, 6) + .padding(.vertical, 13.5) .background(.black80) .clipShape(RoundedRectangle(cornerRadius: 100)) } @@ -359,8 +350,8 @@ extension CoinChargeView { var icon: String { switch self { - case .inventoryExpansion: return "invenIcon" - case .copyVoucher10: return "copyBlack" + case .inventoryExpansion: return "myKeyringCountMini" + case .copyVoucher10: return "myCopyPassMini" } } @@ -376,7 +367,7 @@ extension CoinChargeView { case .inventoryExpansion: return "키링을 더 많이 만들 수 있어요!" case .copyVoucher10: - return "키링을 더 자유롭게 추가할 수 있어요!" + return "내 키링을 하나 더 만들 수 있어요!\n페스티벌에서 키링을 가져올 수 있어요!" } } diff --git a/Keychy/Keychy/Presentation/Workshop/Components/WorkshopComponents.swift b/Keychy/Keychy/Presentation/Workshop/Components/WorkshopComponents.swift index fe9a5f308..e32a97d60 100644 --- a/Keychy/Keychy/Presentation/Workshop/Components/WorkshopComponents.swift +++ b/Keychy/Keychy/Presentation/Workshop/Components/WorkshopComponents.swift @@ -421,7 +421,7 @@ struct KeyringTemplateActionButton: View { onPurchase() } label: { HStack(spacing: 5) { - Image(.buyKey) + Image(.myCoinMini) .resizable() .scaledToFit() .frame(width: 32) @@ -481,7 +481,7 @@ struct WorkshopItemActionButton: View { onPurchase() } label: { HStack(spacing: 5) { - Image(.buyKey) + Image(.myCoinMini) .resizable() .scaledToFit() .frame(width: 32) diff --git a/Keychy/Keychy/Presentation/Workshop/Views/MyItemsView.swift b/Keychy/Keychy/Presentation/Workshop/Views/MyItemsView.swift index c1ddbeb6d..db4945fd7 100644 --- a/Keychy/Keychy/Presentation/Workshop/Views/MyItemsView.swift +++ b/Keychy/Keychy/Presentation/Workshop/Views/MyItemsView.swift @@ -187,7 +187,7 @@ struct MyItemsView: View { router.push(.coinCharge) } label: { HStack(spacing: 0) { - Image(.buyKey) + Image(.myCoinMini) .resizable() .scaledToFill() .frame(width: 36) diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/copyBlack.imageset/copyBlack.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/copyBlack.imageset/copyBlack.pdf deleted file mode 100644 index d7397bcb6..000000000 Binary files a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/copyBlack.imageset/copyBlack.pdf and /dev/null differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/myCopyPass.imageset/myCopyPass.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/myCopyPass.imageset/myCopyPass.pdf deleted file mode 100644 index 24728a128..000000000 Binary files a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/myCopyPass.imageset/myCopyPass.pdf and /dev/null differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Contents.json b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/buyKey.imageset/buyKey.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/buyKey.imageset/buyKey.pdf deleted file mode 100644 index 5c8edf9a5..000000000 Binary files a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/buyKey.imageset/buyKey.pdf and /dev/null differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myCoin.imageset/myCoin.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myCoin.imageset/myCoin.pdf deleted file mode 100644 index bf1c9f959..000000000 Binary files a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myCoin.imageset/myCoin.pdf and /dev/null differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myKeyringCount.imageset/invenIcon.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myKeyringCount.imageset/invenIcon.pdf deleted file mode 100644 index b18435933..000000000 Binary files a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myKeyringCount.imageset/invenIcon.pdf and /dev/null differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/purchaseSheet.imageset/purchaseSheet.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/purchaseSheet.imageset/purchaseSheet.pdf deleted file mode 100644 index d4eed2e06..000000000 Binary files a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/purchaseSheet.imageset/purchaseSheet.pdf and /dev/null differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/Contents.json b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myCoin.imageset/Contents.json b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoin.imageset/Contents.json similarity index 100% rename from Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myCoin.imageset/Contents.json rename to Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoin.imageset/Contents.json diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoin.imageset/myCoin.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoin.imageset/myCoin.pdf new file mode 100644 index 000000000..f77d96d2e Binary files /dev/null and b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoin.imageset/myCoin.pdf differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/copyBlack.imageset/Contents.json b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoinMini.imageset/Contents.json similarity index 76% rename from Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/copyBlack.imageset/Contents.json rename to Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoinMini.imageset/Contents.json index ab5c36db7..21823061c 100644 --- a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/copyBlack.imageset/Contents.json +++ b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoinMini.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "copyBlack.pdf", + "filename" : "myCoinMini.pdf", "idiom" : "universal" } ], diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoinMini.imageset/myCoinMini.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoinMini.imageset/myCoinMini.pdf new file mode 100644 index 000000000..b0ae1dde2 Binary files /dev/null and b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCoinMini.imageset/myCoinMini.pdf differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/myCopyPass.imageset/Contents.json b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPass.imageset/Contents.json similarity index 100% rename from Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Actions/myCopyPass.imageset/Contents.json rename to Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPass.imageset/Contents.json diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPass.imageset/myCopyPass.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPass.imageset/myCopyPass.pdf new file mode 100644 index 000000000..396790d4e Binary files /dev/null and b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPass.imageset/myCopyPass.pdf differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myKeyringCount.imageset/Contents.json b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPassMini.imageset/Contents.json similarity index 75% rename from Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myKeyringCount.imageset/Contents.json rename to Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPassMini.imageset/Contents.json index 41a99e67c..0b77f3217 100644 --- a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/myKeyringCount.imageset/Contents.json +++ b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPassMini.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "invenIcon.pdf", + "filename" : "myCopyPassMini.pdf", "idiom" : "universal" } ], diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPassMini.imageset/myCopyPassMini.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPassMini.imageset/myCopyPassMini.pdf new file mode 100644 index 000000000..dba7a2f9d Binary files /dev/null and b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myCopyPassMini.imageset/myCopyPassMini.pdf differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/purchaseSheet.imageset/Contents.json b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCount.imageset/Contents.json similarity index 75% rename from Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/purchaseSheet.imageset/Contents.json rename to Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCount.imageset/Contents.json index 07b277243..a283e3b16 100644 --- a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/purchaseSheet.imageset/Contents.json +++ b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCount.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "purchaseSheet.pdf", + "filename" : "myKeyringCount.pdf", "idiom" : "universal" } ], diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCount.imageset/myKeyringCount.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCount.imageset/myKeyringCount.pdf new file mode 100644 index 000000000..fc7202e1d Binary files /dev/null and b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCount.imageset/myKeyringCount.pdf differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/buyKey.imageset/Contents.json b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCountMini.imageset/Contents.json similarity index 73% rename from Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/buyKey.imageset/Contents.json rename to Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCountMini.imageset/Contents.json index 6bf2c10f6..49d8a1dd4 100644 --- a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Features/buyKey.imageset/Contents.json +++ b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCountMini.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "buyKey.pdf", + "filename" : "myKeyringCountMini.pdf", "idiom" : "universal" } ], diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCountMini.imageset/myKeyringCountMini.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCountMini.imageset/myKeyringCountMini.pdf new file mode 100644 index 000000000..f92998c63 Binary files /dev/null and b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/Items/myKeyringCountMini.imageset/myKeyringCountMini.pdf differ diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/TabBar/invenIcon.imageset/Contents.json b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/TabBar/invenIcon.imageset/Contents.json deleted file mode 100644 index 41a99e67c..000000000 --- a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/TabBar/invenIcon.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "invenIcon.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/TabBar/invenIcon.imageset/invenIcon.pdf b/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/TabBar/invenIcon.imageset/invenIcon.pdf deleted file mode 100644 index 06ab75f8e..000000000 Binary files a/Keychy/Keychy/Resources/Assets.xcassets/18. Icons/TabBar/invenIcon.imageset/invenIcon.pdf and /dev/null differ