From e96344d6e3e1d57ce71223188233e4dd1908d52e Mon Sep 17 00:00:00 2001 From: hryeong66 Date: Wed, 4 Sep 2024 00:18:19 +0900 Subject: [PATCH] =?UTF-8?q?Etc:=20merge=20=ED=95=98=EB=A9=B4=EC=84=9C=20?= =?UTF-8?q?=EB=B9=A0=EC=A7=84=20=EC=BD=94=EB=93=9C=EB=93=A4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Etc: merge 하면서 빠진 코드들 수정 --- Projects/App/Sources/AppDelegate.swift | 1 + .../MyPage/Sources/Components/LevelProgressView.swift | 2 +- Projects/Features/Recommend/Project.swift | 2 +- Tuist/Package.resolved | 6 +++--- Tuist/Package.swift | 5 +++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Projects/App/Sources/AppDelegate.swift b/Projects/App/Sources/AppDelegate.swift index a6178ea..f5b31bf 100644 --- a/Projects/App/Sources/AppDelegate.swift +++ b/Projects/App/Sources/AppDelegate.swift @@ -29,6 +29,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { PPACAnalytics.shared.congigureFirebaseApp() + self.window = UIWindow(frame: UIScreen.main.bounds) let router = SplashRouter(navigationController, deeplinkMemeId: self.deeplinkMemeId) self.navigationController.setNavigationBarHidden(true, animated: false) self.appRouter = router diff --git a/Projects/Features/MyPage/Sources/Components/LevelProgressView.swift b/Projects/Features/MyPage/Sources/Components/LevelProgressView.swift index 424bab3..06ea461 100644 --- a/Projects/Features/MyPage/Sources/Components/LevelProgressView.swift +++ b/Projects/Features/MyPage/Sources/Components/LevelProgressView.swift @@ -49,7 +49,7 @@ struct LevelProgressView: View { RoundedRectangle(cornerRadius: 25, style: .circular) .stroke(Color.Border.primary, lineWidth: 2, fill: Color.Background.brand) .frame(width: isAnimation ? currnetlevelWidth : minimumWidth) - .animation(.easeInOut(duration: 1.0), value: isAnimation) + .animation(.easeInOut(duration: 1.2), value: isAnimation) } } } diff --git a/Projects/Features/Recommend/Project.swift b/Projects/Features/Recommend/Project.swift index 5373eca..be8e9ff 100644 --- a/Projects/Features/Recommend/Project.swift +++ b/Projects/Features/Recommend/Project.swift @@ -29,7 +29,7 @@ let project = Project( .Core.PPACDomain, .Core.PPACData, .Core.PPACUtil, - .Core.PPACAnalytics + .Core.PPACAnalytics, .Feature.MemeDetail ] ) diff --git a/Tuist/Package.resolved b/Tuist/Package.resolved index 38cdff2..207e360 100644 --- a/Tuist/Package.resolved +++ b/Tuist/Package.resolved @@ -16,7 +16,7 @@ "state" : { "revision" : "3b62f154d00019ae29a71e9738800bb6f18b236d", "version" : "10.19.2" - } + } }, { "identity" : "appsflyerframework-dynamic", @@ -203,8 +203,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-snapshot-testing", "state" : { - "revision" : "e883fc9ea51e76dc9ed13fd4a92b0ee258a1e8c9", - "version" : "1.17.3" + "revision" : "6d932a79e7173b275b96c600c86c603cf84f153c", + "version" : "1.17.4" } }, { diff --git a/Tuist/Package.swift b/Tuist/Package.swift index fe0eff6..3404361 100644 --- a/Tuist/Package.swift +++ b/Tuist/Package.swift @@ -22,7 +22,8 @@ let package = Package( .package(url: "https://github.com/airbnb/lottie-ios.git", from: "4.4.3"), .package(url: "https://github.com/onevcat/Kingfisher", from: "7.12.0"), .package(url: "https://github.com/exyte/PopupView.git", from: "3.0.4"), - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.27.0"), - .package(url: "https://github.com/AppsFlyerSDK/AppsFlyerFramework-Dynamic", from: "6.15.1") + .package(url: "https://github.com/CSolanaM/SkeletonUI.git", from: "2.0.2"), + .package(url: "https://github.com/AppsFlyerSDK/AppsFlyerFramework-Dynamic", from: "6.15.1"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.27.0") ] )