From 655d86eeb8c747f1ec2a3399698824f1abdf8b44 Mon Sep 17 00:00:00 2001 From: KTH Date: Sat, 22 Jun 2024 23:35:54 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=94=A5=20::=20[#636]=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=EB=A1=9C=EC=A7=81=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/ViewControllers/IntroViewController.swift | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift b/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift index 18e783734..73ffad43e 100644 --- a/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift +++ b/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift @@ -154,23 +154,21 @@ private extension IntroViewController { dismissOnOverlayTapAndPull: false ) - #warning("도메인 변경으로 항상 failure > showTabBar() 호출은 추후 지워야 함") case let .failure(error): owner.lottiePlay(specialLogo: false) - owner.showTabBar() - /* owner.showBottomSheet( content: owner.textPopUpFactory.makeView( text: error.asWMError.errorDescription ?? "", cancelButtonIsHidden: true, - confirmButtonText: nil, + confirmButtonText: "재시도", cancelButtonText: nil, - completion: nil, + completion: { + owner.input.fetchAppCheck.onNext(()) + }, cancelCompletion: nil ), dismissOnOverlayTapAndPull: false ) - */ } }) .disposed(by: disposeBag) From a97458d5c64085a9177c3cadd5956c28dcbf0791 Mon Sep 17 00:00:00 2001 From: "pikagreen@nate.com" Date: Sat, 22 Jun 2024 23:35:59 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=8E=A8=20::=20=EC=BD=94=EB=93=9C=20Fo?= =?UTF-8?q?rmatting=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/IntroViewController.swift | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift b/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift index 73ffad43e..8b2c35d3f 100644 --- a/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift +++ b/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift @@ -156,19 +156,19 @@ private extension IntroViewController { case let .failure(error): owner.lottiePlay(specialLogo: false) - owner.showBottomSheet( - content: owner.textPopUpFactory.makeView( - text: error.asWMError.errorDescription ?? "", - cancelButtonIsHidden: true, - confirmButtonText: "재시도", - cancelButtonText: nil, - completion: { - owner.input.fetchAppCheck.onNext(()) - }, - cancelCompletion: nil - ), - dismissOnOverlayTapAndPull: false - ) + owner.showBottomSheet( + content: owner.textPopUpFactory.makeView( + text: error.asWMError.errorDescription ?? "", + cancelButtonIsHidden: true, + confirmButtonText: "재시도", + cancelButtonText: nil, + completion: { + owner.input.fetchAppCheck.onNext(()) + }, + cancelCompletion: nil + ), + dismissOnOverlayTapAndPull: false + ) } }) .disposed(by: disposeBag) From 423b37e2b7608952d538c4896a7cdc61ce56e434 Mon Sep 17 00:00:00 2001 From: KTH Date: Sat, 22 Jun 2024 23:35:54 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=94=A5=20::=20[#637]=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=EB=A1=9C=EC=A7=81=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/ViewControllers/IntroViewController.swift | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift b/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift index 18e783734..73ffad43e 100644 --- a/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift +++ b/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift @@ -154,23 +154,21 @@ private extension IntroViewController { dismissOnOverlayTapAndPull: false ) - #warning("도메인 변경으로 항상 failure > showTabBar() 호출은 추후 지워야 함") case let .failure(error): owner.lottiePlay(specialLogo: false) - owner.showTabBar() - /* owner.showBottomSheet( content: owner.textPopUpFactory.makeView( text: error.asWMError.errorDescription ?? "", cancelButtonIsHidden: true, - confirmButtonText: nil, + confirmButtonText: "재시도", cancelButtonText: nil, - completion: nil, + completion: { + owner.input.fetchAppCheck.onNext(()) + }, cancelCompletion: nil ), dismissOnOverlayTapAndPull: false ) - */ } }) .disposed(by: disposeBag) From 52c6e2cc3bccea4917334a9afd605e98e00dd9a6 Mon Sep 17 00:00:00 2001 From: "pikagreen@nate.com" Date: Sat, 22 Jun 2024 23:35:59 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=8E=A8=20::=20=EC=BD=94=EB=93=9C=20Fo?= =?UTF-8?q?rmatting=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/IntroViewController.swift | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift b/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift index 73ffad43e..8b2c35d3f 100644 --- a/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift +++ b/Projects/Features/RootFeature/Sources/ViewControllers/IntroViewController.swift @@ -156,19 +156,19 @@ private extension IntroViewController { case let .failure(error): owner.lottiePlay(specialLogo: false) - owner.showBottomSheet( - content: owner.textPopUpFactory.makeView( - text: error.asWMError.errorDescription ?? "", - cancelButtonIsHidden: true, - confirmButtonText: "재시도", - cancelButtonText: nil, - completion: { - owner.input.fetchAppCheck.onNext(()) - }, - cancelCompletion: nil - ), - dismissOnOverlayTapAndPull: false - ) + owner.showBottomSheet( + content: owner.textPopUpFactory.makeView( + text: error.asWMError.errorDescription ?? "", + cancelButtonIsHidden: true, + confirmButtonText: "재시도", + cancelButtonText: nil, + completion: { + owner.input.fetchAppCheck.onNext(()) + }, + cancelCompletion: nil + ), + dismissOnOverlayTapAndPull: false + ) } }) .disposed(by: disposeBag) From 215da5eb9691fd99a310a27301fa96ff3c99b1dd Mon Sep 17 00:00:00 2001 From: KTH Date: Sat, 22 Jun 2024 23:51:37 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=94=A5=20::=20[#637]=20=EB=AF=B8?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EB=85=B8=ED=8B=B0=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Extensions/Extension+Notification.Name.swift | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Projects/Modules/Utility/Sources/Extensions/Extension+Notification.Name.swift b/Projects/Modules/Utility/Sources/Extensions/Extension+Notification.Name.swift index 03c578891..a043c4a1c 100644 --- a/Projects/Modules/Utility/Sources/Extensions/Extension+Notification.Name.swift +++ b/Projects/Modules/Utility/Sources/Extensions/Extension+Notification.Name.swift @@ -1,11 +1,3 @@ -// -// Extension+Notification.Name.swift -// Utility -// -// Created by yongbeomkwak on 2023/02/21. -// Copyright © 2023 yongbeomkwak. All rights reserved. -// - import Foundation public extension Notification.Name { @@ -18,6 +10,5 @@ public extension Notification.Name { static let hideSongCart = Notification.Name("hideSongCart") static let movedTab = Notification.Name("movedTab") static let movedStorageFavoriteTab = Notification.Name("movedStorageFavoriteTab") - static let selectedSongOnSearch = Notification.Name("selectedSongOnSearch") static let updateCurrentSongLikeState = Notification.Name("updateCurrentSongLikeState") }