diff --git a/PingPong/Projects/DesignSystem/Resources/ImageAssets.xcassets/TabbarImage/selectedExploreTap.imageset/selectedExploreTap.png b/PingPong/Projects/DesignSystem/Resources/ImageAssets.xcassets/TabbarImage/selectedExploreTap.imageset/selectedExploreTap.png deleted file mode 100644 index 75ce0492..00000000 Binary files a/PingPong/Projects/DesignSystem/Resources/ImageAssets.xcassets/TabbarImage/selectedExploreTap.imageset/selectedExploreTap.png and /dev/null differ diff --git a/PingPong/Projects/DesignSystem/Resources/ImageAssets.xcassets/TabbarImage/selectedexploreTap.imageset/selectedexploreTap.svg b/PingPong/Projects/DesignSystem/Resources/ImageAssets.xcassets/TabbarImage/selectedexploreTap.imageset/selectedexploreTap.svg new file mode 100644 index 00000000..0c9ac20a --- /dev/null +++ b/PingPong/Projects/DesignSystem/Resources/ImageAssets.xcassets/TabbarImage/selectedexploreTap.imageset/selectedexploreTap.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/PingPong/Projects/Feature/Core/Sources/UI/View/TabView/CoreView.swift b/PingPong/Projects/Feature/Core/Sources/UI/View/TabView/CoreView.swift index 182cd478..10a65764 100644 --- a/PingPong/Projects/Feature/Core/Sources/UI/View/TabView/CoreView.swift +++ b/PingPong/Projects/Feature/Core/Sources/UI/View/TabView/CoreView.swift @@ -67,6 +67,28 @@ public struct CoreView: View { .backgroundColor(.basicBlackDimmed) } + .popup(isPresented: $viewModel.isLoginExplore, view: { + isExPlorePOPUP( + image: .mainHomeLogo, + title: "로그인 하세요!", + subTitle: "로그인을 하시면 더 많을걸 사용하실수 있어요!", + confirmAction: { + viewModel.isExploreApp = false + }, + cancelAction: { + viewModel.isLoginExplore = false + }, + noImage: false, noImageButton: false) + }, customize: { popup in + popup + .type(.default) + .position(.bottom) + .animation(.easeIn) + .closeOnTap(true) + .closeOnTapOutside(true) + .backgroundColor(.basicBlackDimmed) + }) + } .navigationBarBackButtonHidden() .navigationDestination(for: CoreViewState.self) { state in diff --git a/PingPong/Projects/Feature/Home/Sources/UI/View/HomeView/HomeView.swift b/PingPong/Projects/Feature/Home/Sources/UI/View/HomeView/HomeView.swift index 34a53e4c..d82ee202 100644 --- a/PingPong/Projects/Feature/Home/Sources/UI/View/HomeView/HomeView.swift +++ b/PingPong/Projects/Feature/Home/Sources/UI/View/HomeView/HomeView.swift @@ -56,28 +56,6 @@ public struct HomeView: View { } - .popup(isPresented: $viewModel.isLoginExplore, view: { - isExPlorePOPUP( - image: .mainHomeLogo, - title: "로그인 하세요!", - subTitle: "로그인을 하시면 더 많을걸 사용하실수 있어요!", - confirmAction: { - viewModel.isExploreApp = false - }, - cancelAction: { - viewModel.isLoginExplore = false - }, - noImage: false, noImageButton: false) - }, customize: { popup in - popup - .type(.default) - .position(.bottom) - .animation(.easeIn) - .closeOnTap(true) - .closeOnTapOutside(true) - .backgroundColor(.basicBlackDimmed) - }) - .onAppear { if !homeViewModel.isOn.isEmpty { homeViewModel.randomQuoteRequest(userID: "\(authViewModel.userid)") { @@ -208,7 +186,11 @@ public struct HomeView: View { } } .onTapGesture { - appState.goToBackingView = true + if viewModel.isLoginCheck { + appState.goToBackingView = true + } else { + viewModel.isLoginExplore = true + } } } diff --git a/PingPong/Projects/Feature/OnBoarding/Sources/UI/View/MainView/OnBoardingLoginView.swift b/PingPong/Projects/Feature/OnBoarding/Sources/UI/View/MainView/OnBoardingLoginView.swift index 4344a1df..b1687d19 100644 --- a/PingPong/Projects/Feature/OnBoarding/Sources/UI/View/MainView/OnBoardingLoginView.swift +++ b/PingPong/Projects/Feature/OnBoarding/Sources/UI/View/MainView/OnBoardingLoginView.swift @@ -153,7 +153,7 @@ public struct OnBoardingLoginView: View { commonViewViewModel.isLoginCheck = true authViewModel.userid = model.data?.id ?? .zero authViewModel.userNickName = model.data?.nickname ?? "" - commonViewViewModel.isExploreApp = false + commonViewViewModel.isLoginExplore = false }, failLoginCompletion: { appState.signUPFaillPOPUP.toggle() presentationMode.wrappedValue.dismiss() diff --git a/PingPong/Projects/Feature/OnBoarding/Sources/UI/View/MainView/OnBoardingView.swift b/PingPong/Projects/Feature/OnBoarding/Sources/UI/View/MainView/OnBoardingView.swift index bf061a1b..fc86a214 100644 --- a/PingPong/Projects/Feature/OnBoarding/Sources/UI/View/MainView/OnBoardingView.swift +++ b/PingPong/Projects/Feature/OnBoarding/Sources/UI/View/MainView/OnBoardingView.swift @@ -143,7 +143,7 @@ public struct OnBoardingView: View { return } authViewModel.appleLogin(credential: credential) - commonViewViewModel.isExploreApp = false + commonViewViewModel.isLoginExplore = false DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { commonViewViewModel.viewPath.append(ViewState.isStartServiceAgreement) }