From 4d92643c33160d94df0e7b479eb3b9935993ae49 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 12 Jul 2024 15:18:04 +0800 Subject: [PATCH] Upgrade intercom, fix loading animation --- apple/Omnivore.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- .../OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift | 3 ++- .../Sources/App/Views/Home/HomeFeedViewModel.swift | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apple/Omnivore.xcodeproj/project.pbxproj b/apple/Omnivore.xcodeproj/project.pbxproj index ffe6b398c..3eb20ea5f 100644 --- a/apple/Omnivore.xcodeproj/project.pbxproj +++ b/apple/Omnivore.xcodeproj/project.pbxproj @@ -2043,7 +2043,7 @@ repositoryURL = "https://github.com/intercom/intercom-ios"; requirement = { kind = exactVersion; - version = 11.1.2; + version = 17.1.2; }; }; 048F592A2790EAF800E0B494 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { diff --git a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1e1f453e3..bf37d1aa9 100644 --- a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -122,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/intercom/intercom-ios", "state" : { - "revision" : "3345d9e7599141d7c844981423a7e5409f2bfb81", - "version" : "11.1.2" + "revision" : "ad789a51b350dffe804dbf083430e0d6e91ac4af", + "version" : "17.1.2" } }, { diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 6d55a5623..5d27bc54e 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -820,8 +820,9 @@ struct AnimatingCellHeight: AnimatableModifier { .onAppear { self.isAnimating = true } + .frame(height: 2) } - .background(Color.white) + .background(.clear) .edgesIgnoringSafeArea(.all) } diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift index 29ec1c998..f5356bb90 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift @@ -219,7 +219,7 @@ enum LoadingBarStyle { func loadItems(dataService: DataService, isRefresh: Bool, forceRemote: Bool = false, loadingBarStyle: LoadingBarStyle? = nil) async { isLoading = true - showLoadingBar = isRefresh ? loadingBarStyle ?? .redacted : .none + showLoadingBar = .simple // isRefresh ? loadingBarStyle ?? .redacted : .none if let filterState = filterState { await fetcher.loadItems(