diff --git a/Keychy/Keychy/Core/Components/Alerts/LoadingAlert.swift b/Keychy/Keychy/Core/Components/Alerts/LoadingAlert.swift index 942be0215..a3c9a23c7 100644 --- a/Keychy/Keychy/Core/Components/Alerts/LoadingAlert.swift +++ b/Keychy/Keychy/Core/Components/Alerts/LoadingAlert.swift @@ -15,13 +15,14 @@ import SwiftUI import Lottie enum LoadingType { - case short + case short30 + case short40 case longWithKeychy case longWithPresent var lottieFileName: String { switch self { - case .short: return "shotLoading" + case .short30, .short40: return "shotLoading" case .longWithKeychy: return "longLoadingKeychy" case .longWithPresent: return "longLoadingPresent" } @@ -29,7 +30,8 @@ enum LoadingType { var frameSize: CGFloat { switch self { - case .short: return 48 + case .short30: return 30 + case .short40: return 40 case .longWithKeychy: return 122 case .longWithPresent: return 122 } @@ -51,7 +53,7 @@ struct LoadingAlert: View { ) .frame(width: type.frameSize, height: type.frameSize) - if type != .short, let message = message { + if type != .short30 && type != .short40, let message = message { Text(message) .typography(.suit17SB) .textOutline(color: .white100, width: 3) diff --git a/Keychy/Keychy/Core/Components/View/Items/ItemDetailImage.swift b/Keychy/Keychy/Core/Components/View/Items/ItemDetailImage.swift index 5cd50d016..a11c09455 100644 --- a/Keychy/Keychy/Core/Components/View/Items/ItemDetailImage.swift +++ b/Keychy/Keychy/Core/Components/View/Items/ItemDetailImage.swift @@ -24,7 +24,7 @@ struct ItemDetailImage: View { // 로딩 중앙 배치 if isLoading { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .onAppear { DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { isLoading = false @@ -173,8 +173,7 @@ struct SimpleAnimatedImage: View { if isLoading { Color.gray50 .overlay { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.5) + LoadingAlert(type: .short40, message: nil) } } } diff --git a/Keychy/Keychy/Presentation/Bundle/Views/BundleCreateView.swift b/Keychy/Keychy/Presentation/Bundle/Views/BundleCreateView.swift index 4e5e0dc3e..9cde84b5a 100644 --- a/Keychy/Keychy/Presentation/Bundle/Views/BundleCreateView.swift +++ b/Keychy/Keychy/Presentation/Bundle/Views/BundleCreateView.swift @@ -445,8 +445,7 @@ extension BundleCreateView { } label: { HStack(spacing: 5) { if isPurchasing { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.8) + LoadingAlert(type: .short40, message: nil) } else { Image(.purchaseSheet) } diff --git a/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+Purchase.swift b/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+Purchase.swift index 2af208cc3..b57b1d10e 100644 --- a/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+Purchase.swift +++ b/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+Purchase.swift @@ -94,8 +94,7 @@ extension BundleEditView { } label: { HStack(spacing: 5) { if isPurchasing { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.8) + LoadingAlert(type: .short40, message: nil) } else { Image(.purchaseSheet) } diff --git a/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+SelectSheet.swift b/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+SelectSheet.swift index 89163efd0..fe0938439 100644 --- a/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+SelectSheet.swift +++ b/Keychy/Keychy/Presentation/Bundle/Views/BundleEditView+SelectSheet.swift @@ -80,7 +80,7 @@ extension BundleEditView { if isKeyringSheetLoading { VStack { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .padding(.vertical, 24) Text("키링을 불러오고 있어요") .typography(.suit15R) diff --git a/Keychy/Keychy/Presentation/Bundle/Views/Component/BackgroundSelectableCell.swift b/Keychy/Keychy/Presentation/Bundle/Views/Component/BackgroundSelectableCell.swift index fb3302e41..94ebe1b2e 100644 --- a/Keychy/Keychy/Presentation/Bundle/Views/Component/BackgroundSelectableCell.swift +++ b/Keychy/Keychy/Presentation/Bundle/Views/Component/BackgroundSelectableCell.swift @@ -23,8 +23,7 @@ struct BackgroundSelectableCell: View { .scaledToFill() .clipped() } else if state.isLoading { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.5) + LoadingAlert(type: .short30, message: nil) } } .frame(width: threeSquareGridCellSize, height: threeSquareGridCellSize) diff --git a/Keychy/Keychy/Presentation/Bundle/Views/Component/CarabinerSelectableCell.swift b/Keychy/Keychy/Presentation/Bundle/Views/Component/CarabinerSelectableCell.swift index aaf8fedac..4f88e2816 100644 --- a/Keychy/Keychy/Presentation/Bundle/Views/Component/CarabinerSelectableCell.swift +++ b/Keychy/Keychy/Presentation/Bundle/Views/Component/CarabinerSelectableCell.swift @@ -23,8 +23,7 @@ struct CarabinerSelectableCell: View { .scaledToFit() .clipped() } else if state.isLoading { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.5) + LoadingAlert(type: .short30, message: nil) } else { Color.clear .aspectRatio(1, contentMode: .fit) diff --git a/Keychy/Keychy/Presentation/Bundle/Views/Component/KeyringBundleItem.swift b/Keychy/Keychy/Presentation/Bundle/Views/Component/KeyringBundleItem.swift index 4745599b3..55eeb3cbb 100644 --- a/Keychy/Keychy/Presentation/Bundle/Views/Component/KeyringBundleItem.swift +++ b/Keychy/Keychy/Presentation/Bundle/Views/Component/KeyringBundleItem.swift @@ -65,7 +65,7 @@ extension KeyringBundleItem { return Group { if isCapturing { // 캡처 중 ProgressView - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } else if let cachedImage = cachedImage { cachedImage .resizable() diff --git a/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringDetailView+Alerts.swift b/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringDetailView+Alerts.swift index 3d9bfbd10..6090f81d2 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringDetailView+Alerts.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringDetailView+Alerts.swift @@ -126,7 +126,7 @@ extension CollectionKeyringDetailView { } if showCopyingAlert { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .zIndex(101) } diff --git a/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringDetailView.swift b/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringDetailView.swift index 30dd5babf..6c7844638 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringDetailView.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringDetailView.swift @@ -104,7 +104,7 @@ struct CollectionKeyringDetailView: View { Color.black20 .ignoresSafeArea() - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .zIndex(200) } diff --git a/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringPackageView.swift b/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringPackageView.swift index e75623864..8ef227dbb 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringPackageView.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Detail/CollectionKeyringPackageView.swift @@ -44,7 +44,7 @@ struct CollectionKeyringPackageView: View { Color.black20 .ignoresSafeArea() - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .zIndex(101) } diff --git a/Keychy/Keychy/Presentation/Collection/Views/Detail/KeyringEditView.swift b/Keychy/Keychy/Presentation/Collection/Views/Detail/KeyringEditView.swift index c0e0f88b5..528cabf36 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Detail/KeyringEditView.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Detail/KeyringEditView.swift @@ -202,8 +202,7 @@ extension KeyringEditView { Color.black20 .overlay { VStack(spacing: 8) { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.4) + LoadingAlert(type: .short40, message: nil) } } } diff --git a/Keychy/Keychy/Presentation/Collection/Views/Detail/PackagedKeyringView.swift b/Keychy/Keychy/Presentation/Collection/Views/Detail/PackagedKeyringView.swift index f8ee906c8..a5b29449e 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Detail/PackagedKeyringView.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Detail/PackagedKeyringView.swift @@ -204,9 +204,8 @@ extension PackagedKeyringView { ) } else { // 이미지 로딩 중 - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .frame(width: 195, height: 300) - .scaleEffect(0.6) } } } @@ -299,9 +298,8 @@ extension PackagedKeyringView { .scaledToFit() .frame(width: 205, height: 205) } else { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .frame(width: 205, height: 205) - .scaleEffect(0.6) } } .offset(x: -3, y: -24) diff --git a/Keychy/Keychy/Presentation/Collection/Views/Main/CollectionCellView.swift b/Keychy/Keychy/Presentation/Collection/Views/Main/CollectionCellView.swift index e185e401a..e3d32ac01 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Main/CollectionCellView.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Main/CollectionCellView.swift @@ -23,8 +23,7 @@ struct CollectionCellView: View { if isLoading && cachedImage == nil { Color.gray50 .overlay { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.7) + LoadingAlert(type: .short40, message: nil) } } diff --git a/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringCollectView+Alerts.swift b/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringCollectView+Alerts.swift index 9a5129ed1..d417c30f4 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringCollectView+Alerts.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringCollectView+Alerts.swift @@ -31,7 +31,7 @@ extension KeyringCollectView { } private func loadingOverlay(geometry: GeometryProxy) -> some View { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .position( x: geometry.size.width / 2, y: geometry.size.height / 2 diff --git a/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringCollectView.swift b/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringCollectView.swift index f76b80268..b78bcc8f1 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringCollectView.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringCollectView.swift @@ -58,7 +58,7 @@ struct KeyringCollectView: View { private func contentView(heightRatio: CGFloat, isSmallScreen: Bool) -> some View { VStack(spacing: 0) { if viewModel.isLoading { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .frame(maxWidth: .infinity, maxHeight: .infinity) } else if let keyring = viewModel.keyring { diff --git a/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringReceiveView+Alerts.swift b/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringReceiveView+Alerts.swift index eda846f87..4c2ce11ee 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringReceiveView+Alerts.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringReceiveView+Alerts.swift @@ -35,7 +35,7 @@ extension KeyringReceiveView { } private func loadingOverlay(geometry: GeometryProxy) -> some View { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .position( x: geometry.size.width / 2, y: geometry.size.height / 2 diff --git a/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringReceiveView.swift b/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringReceiveView.swift index b2bc90f2d..014a09d4a 100644 --- a/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringReceiveView.swift +++ b/Keychy/Keychy/Presentation/Collection/Views/Package/KeyringReceiveView.swift @@ -58,7 +58,7 @@ struct KeyringReceiveView: View { private func contentView(heightRatio: CGFloat, isSmallScreen: Bool) -> some View { VStack(spacing: 0) { if viewModel.isLoading { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .frame(maxWidth: .infinity, maxHeight: .infinity) } else if viewModel.isAlreadyReceived { diff --git a/Keychy/Keychy/Presentation/Festival/Views/FestivalKeyringDetailView+Alerts.swift b/Keychy/Keychy/Presentation/Festival/Views/FestivalKeyringDetailView+Alerts.swift index 8889c3574..d65939017 100644 --- a/Keychy/Keychy/Presentation/Festival/Views/FestivalKeyringDetailView+Alerts.swift +++ b/Keychy/Keychy/Presentation/Festival/Views/FestivalKeyringDetailView+Alerts.swift @@ -46,7 +46,7 @@ extension FestivalKeyringDetailView { } if showCopyingAlert { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .zIndex(101) } diff --git a/Keychy/Keychy/Presentation/Festival/Views/FestivalKeyringDetailView.swift b/Keychy/Keychy/Presentation/Festival/Views/FestivalKeyringDetailView.swift index 34e8f5fd9..5ef716c6b 100644 --- a/Keychy/Keychy/Presentation/Festival/Views/FestivalKeyringDetailView.swift +++ b/Keychy/Keychy/Presentation/Festival/Views/FestivalKeyringDetailView.swift @@ -66,7 +66,7 @@ struct FestivalKeyringDetailView: View { Color.black20 .ignoresSafeArea() - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .zIndex(200) } diff --git a/Keychy/Keychy/Presentation/Festival/Views/Showcase25Board/Showcase25BoardView+Grid.swift b/Keychy/Keychy/Presentation/Festival/Views/Showcase25Board/Showcase25BoardView+Grid.swift index 6132c7dc4..f069a2163 100644 --- a/Keychy/Keychy/Presentation/Festival/Views/Showcase25Board/Showcase25BoardView+Grid.swift +++ b/Keychy/Keychy/Presentation/Festival/Views/Showcase25Board/Showcase25BoardView+Grid.swift @@ -27,8 +27,7 @@ extension Showcase25BoardView { // 다른 사람이 수정 중인 경우 let maskedName = viewModel.maskedNickname(editingKeyring.editingUserNickname) ZStack { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.5) + LoadingAlert(type: .short30, message: nil) VStack { Spacer() Text("\(maskedName)님\n수정중") @@ -103,8 +102,7 @@ extension Showcase25BoardView { Image(systemName: "photo") .foregroundStyle(.gray300) } else { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.5) + LoadingAlert(type: .short30, message: nil) } } diff --git a/Keychy/Keychy/Presentation/Home/Views/Alarm/NotificationGiftView.swift b/Keychy/Keychy/Presentation/Home/Views/Alarm/NotificationGiftView.swift index 0c1807bdd..13da0a722 100644 --- a/Keychy/Keychy/Presentation/Home/Views/Alarm/NotificationGiftView.swift +++ b/Keychy/Keychy/Presentation/Home/Views/Alarm/NotificationGiftView.swift @@ -24,7 +24,7 @@ struct NotificationGiftView: View { if viewModel.hasNetworkError { networkErrorView } else if viewModel.isLoading || viewModel.isCapturing { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } else if let error = viewModel.loadError { VStack { Text("선물 정보를 불러올 수 없습니다") diff --git a/Keychy/Keychy/Presentation/Home/Views/MyPage/ChangeNameView.swift b/Keychy/Keychy/Presentation/Home/Views/MyPage/ChangeNameView.swift index 29bfdb907..4593d9f51 100644 --- a/Keychy/Keychy/Presentation/Home/Views/MyPage/ChangeNameView.swift +++ b/Keychy/Keychy/Presentation/Home/Views/MyPage/ChangeNameView.swift @@ -147,7 +147,7 @@ extension ChangeNameView { Group { // 업데이트 중 로딩 if viewModel.isUpdating { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } // 성공 Alert diff --git a/Keychy/Keychy/Presentation/Home/Views/MyPage/MyPageView.swift b/Keychy/Keychy/Presentation/Home/Views/MyPage/MyPageView.swift index b5d9d89da..0390aab74 100644 --- a/Keychy/Keychy/Presentation/Home/Views/MyPage/MyPageView.swift +++ b/Keychy/Keychy/Presentation/Home/Views/MyPage/MyPageView.swift @@ -304,7 +304,7 @@ extension MyPageView { private var alerts: some View { Group { if viewModel.showLoadingAlert { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } } } diff --git a/Keychy/Keychy/Presentation/Intro/Views/ProfileSetupCompleteView.swift b/Keychy/Keychy/Presentation/Intro/Views/ProfileSetupCompleteView.swift index f4fa856fc..2e7a21663 100644 --- a/Keychy/Keychy/Presentation/Intro/Views/ProfileSetupCompleteView.swift +++ b/Keychy/Keychy/Presentation/Intro/Views/ProfileSetupCompleteView.swift @@ -37,7 +37,7 @@ struct ProfileSetupCompleteView: View { .blur(radius: isSaving ? 15 : 0) if isSaving { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } } .background(.white100) diff --git a/Keychy/Keychy/Presentation/Workshop/Coin/CoinChargeView.swift b/Keychy/Keychy/Presentation/Workshop/Coin/CoinChargeView.swift index dc7f599e4..89b376035 100644 --- a/Keychy/Keychy/Presentation/Workshop/Coin/CoinChargeView.swift +++ b/Keychy/Keychy/Presentation/Workshop/Coin/CoinChargeView.swift @@ -98,7 +98,7 @@ struct CoinChargeView: View { // 코인 구매 로딩 if isCoinPurchasing { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } } .task { diff --git a/Keychy/Keychy/Presentation/Workshop/Making/Shared/Components/PreviewGuiding.swift b/Keychy/Keychy/Presentation/Workshop/Making/Shared/Components/PreviewGuiding.swift index e0ed781d2..9ab1723ca 100644 --- a/Keychy/Keychy/Presentation/Workshop/Making/Shared/Components/PreviewGuiding.swift +++ b/Keychy/Keychy/Presentation/Workshop/Making/Shared/Components/PreviewGuiding.swift @@ -106,7 +106,7 @@ extension PreviewGuiding { // 로딩 중앙 배치 LazyImage(url: URL(string: guidingImageURL)) { state in if state.isLoading { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } } } diff --git a/Keychy/Keychy/Presentation/Workshop/Making/Shared/Components/TemplatePreviewComponents.swift b/Keychy/Keychy/Presentation/Workshop/Making/Shared/Components/TemplatePreviewComponents.swift index 051d3d51f..dbe84bcee 100644 --- a/Keychy/Keychy/Presentation/Workshop/Making/Shared/Components/TemplatePreviewComponents.swift +++ b/Keychy/Keychy/Presentation/Workshop/Making/Shared/Components/TemplatePreviewComponents.swift @@ -120,7 +120,7 @@ struct TemplatePreviewBody: View { // 구매 중 로딩 if showPurchasingLoading { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } // 구매 성공 알림 @@ -187,7 +187,7 @@ extension TemplatePreviewBody { .scaledToFit() .frame(width: 386, height: 386) } else { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } } .frame(maxHeight: 500) @@ -226,7 +226,7 @@ extension TemplatePreviewBody { } ) } else { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } } } diff --git a/Keychy/Keychy/Presentation/Workshop/Making/Shared/Views/KeyringCustomizingView.swift b/Keychy/Keychy/Presentation/Workshop/Making/Shared/Views/KeyringCustomizingView.swift index ee38bf56e..84939ad79 100644 --- a/Keychy/Keychy/Presentation/Workshop/Making/Shared/Views/KeyringCustomizingView.swift +++ b/Keychy/Keychy/Presentation/Workshop/Making/Shared/Views/KeyringCustomizingView.swift @@ -88,13 +88,13 @@ struct KeyringCustomizingView: View { // MARK: - 구매 중 로딩 if showPurchaseProgress { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .zIndex(101) } // MARK: - 합성 중 로딩 if viewModel.isComposing { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .zIndex(101) } diff --git a/Keychy/Keychy/Presentation/Workshop/Making/Templates/AcrylicPhoto/Views/AcrylicPhotoCropView.swift b/Keychy/Keychy/Presentation/Workshop/Making/Templates/AcrylicPhoto/Views/AcrylicPhotoCropView.swift index 2d9e763b7..98c2ec39b 100644 --- a/Keychy/Keychy/Presentation/Workshop/Making/Templates/AcrylicPhoto/Views/AcrylicPhotoCropView.swift +++ b/Keychy/Keychy/Presentation/Workshop/Making/Templates/AcrylicPhoto/Views/AcrylicPhotoCropView.swift @@ -61,7 +61,7 @@ struct AcrylicPhotoCropView: View { // 로딩 인디케이터 if isImageLoading { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } customNavigationBar diff --git a/Keychy/Keychy/Presentation/Workshop/Making/Templates/ClearSketch/Views/ClearSketchCropView.swift b/Keychy/Keychy/Presentation/Workshop/Making/Templates/ClearSketch/Views/ClearSketchCropView.swift index 212d872a7..52a661324 100644 --- a/Keychy/Keychy/Presentation/Workshop/Making/Templates/ClearSketch/Views/ClearSketchCropView.swift +++ b/Keychy/Keychy/Presentation/Workshop/Making/Templates/ClearSketch/Views/ClearSketchCropView.swift @@ -27,7 +27,7 @@ struct ClearSketchCropView: View { if let bodyImage = viewModel.bodyImage { cropCanvasView(image: bodyImage, geometry: geometry) } else { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } } .frame(maxWidth: .infinity, maxHeight: .infinity) diff --git a/Keychy/Keychy/Presentation/Workshop/Making/Templates/Polaroid/Views/FramePreviewView.swift b/Keychy/Keychy/Presentation/Workshop/Making/Templates/Polaroid/Views/FramePreviewView.swift index 8a827d22c..cdf227c0c 100644 --- a/Keychy/Keychy/Presentation/Workshop/Making/Templates/Polaroid/Views/FramePreviewView.swift +++ b/Keychy/Keychy/Presentation/Workshop/Making/Templates/Polaroid/Views/FramePreviewView.swift @@ -63,7 +63,7 @@ struct FramePreviewView: View { // 로딩 중일 때 if !isFrameLoaded { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } } } @@ -227,7 +227,7 @@ struct FramePreviewView: View { // 프레임 크기 계산 LazyImage(url: URL(string: frame.frameURL)) { state in if state.isLoading { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) .frame(height: targetFrameHeight) } else if let image = state.image { let frameAspect = (state.imageContainer?.image.size.width ?? 1) / (state.imageContainer?.image.size.height ?? 1) diff --git a/Keychy/Keychy/Presentation/Workshop/Making/Templates/SpeechBubble/Views/SpeechBubbleFramePreviewView.swift b/Keychy/Keychy/Presentation/Workshop/Making/Templates/SpeechBubble/Views/SpeechBubbleFramePreviewView.swift index f6e7c7528..d214730b2 100644 --- a/Keychy/Keychy/Presentation/Workshop/Making/Templates/SpeechBubble/Views/SpeechBubbleFramePreviewView.swift +++ b/Keychy/Keychy/Presentation/Workshop/Making/Templates/SpeechBubble/Views/SpeechBubbleFramePreviewView.swift @@ -48,7 +48,7 @@ struct SpeechBubbleFramePreviewView: View { // 로딩 중일 때 if !isFrameLoaded { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } } } diff --git a/Keychy/Keychy/Presentation/Workshop/WorkshopComponents.swift b/Keychy/Keychy/Presentation/Workshop/WorkshopComponents.swift index 004402c16..992185e75 100644 --- a/Keychy/Keychy/Presentation/Workshop/WorkshopComponents.swift +++ b/Keychy/Keychy/Presentation/Workshop/WorkshopComponents.swift @@ -153,8 +153,7 @@ struct WorkshopItemView: View { .frame(width: twoGridCellWidth, height: itemHeight) .clipped() } else { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.5) + LoadingAlert(type: .short40, message: nil) .task { await ensureParticleReady(particle) } diff --git a/Keychy/Keychy/Presentation/Workshop/WorkshopPreview.swift b/Keychy/Keychy/Presentation/Workshop/WorkshopPreview.swift index 1a8c79156..e3424c069 100644 --- a/Keychy/Keychy/Presentation/Workshop/WorkshopPreview.swift +++ b/Keychy/Keychy/Presentation/Workshop/WorkshopPreview.swift @@ -130,7 +130,7 @@ struct WorkshopPreview: View { // 구매 중 로딩 if showPurchasingLoading { - LoadingAlert(type: .short, message: nil) + LoadingAlert(type: .short40, message: nil) } // 구매 성공 알림 @@ -208,8 +208,7 @@ extension WorkshopPreview { .aspectRatio(1, contentMode: .fit) .cornerRadius(20) } else { - LoadingAlert(type: .short, message: nil) - .scaleEffect(0.5) + LoadingAlert(type: .short40, message: nil) .task { await ensureParticleReady(particle) }