✨[feat]: 둘러보기 기능추가 수정

DDD-Community · Dec 10, 2023 · da9e9ce · da9e9ce
1 parent 13a7a6f
commit da9e9ce
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 25 deletions.
diff --git a/...eAssets.xcassets/TabbarImage/selectedExploreTap.imageset/selectedExploreTap.png b/...eAssets.xcassets/TabbarImage/selectedExploreTap.imageset/selectedExploreTap.png
diff --git a/...eAssets.xcassets/TabbarImage/selectedexploreTap.imageset/selectedexploreTap.svg b/...eAssets.xcassets/TabbarImage/selectedexploreTap.imageset/selectedexploreTap.svg
diff --git 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
@@ -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
@@ -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
@@ -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)
                 }