diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Networking/Networker.swift b/apple/OmnivoreKit/Sources/Services/DataService/Networking/Networker.swift index 5da9691de..f9d442616 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Networking/Networker.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Networking/Networker.swift @@ -39,7 +39,7 @@ extension Networker { ) do { - let authVerification = try await urlSession.performReq(resource: resource) + let authVerification = try await urlSession.performRequest(resource: resource) return authVerification.authStatus.isAuthenticated } catch { return false diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResource.swift b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResource.swift index 5bdb206c7..331bac709 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResource.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResource.swift @@ -1,4 +1,3 @@ -import Combine import Foundation import Models import Utils @@ -37,7 +36,7 @@ extension ServerResponse { struct EmptyResponse: Decodable {} extension URLSession { - func performReq( + func performRequest( resource: ServerResource ) async throws -> ResponseModel { do { @@ -61,30 +60,6 @@ extension URLSession { throw ServerError(serverResponse: serverResponse) } } - - // TODO: remove performRequest - // swiftlint:disable:next line_length - func performRequest(resource: ServerResource) -> AnyPublisher { - let request = resource.urlRequest - - return dataTaskPublisher(for: resource.urlRequest) - .tryMap { data, response -> ResponseModel in - let serverResponse = ServerResponse(data: data, response: response) - NetworkRequestLogger.log(request: request, serverResponse: serverResponse) - - if let decodedValue = resource.decode(serverResponse) { - return decodedValue - } - - throw ServerError(serverResponse: serverResponse) - } - .mapError { error -> ServerError in - let serverResponse = ServerResponse(error: error) - NetworkRequestLogger.log(request: request, serverResponse: serverResponse) - return ServerError(serverResponse: serverResponse) - } - .eraseToAnyPublisher() - } } extension URLRequest { diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreateAccountResource.swift b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreateAccountResource.swift index 5e0b6f196..e144ea65a 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreateAccountResource.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreateAccountResource.swift @@ -14,7 +14,7 @@ extension Networker { ) do { - return try await urlSession.performReq(resource: resource) + return try await urlSession.performRequest(resource: resource) } catch { throw (error as? ServerError) ?? .unknown } diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreatePendingUserResource.swift b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreatePendingUserResource.swift index 596bca4ca..e5f03e97b 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreatePendingUserResource.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreatePendingUserResource.swift @@ -15,7 +15,7 @@ extension Networker { ) do { - return try await urlSession.performReq(resource: resource) + return try await urlSession.performRequest(resource: resource) } catch { throw (error as? ServerError) ?? .unknown } diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/VerifyAuthProviderToken.swift b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/VerifyAuthProviderToken.swift index 52304dfbf..febc2f0cf 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/VerifyAuthProviderToken.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/VerifyAuthProviderToken.swift @@ -27,7 +27,7 @@ extension Networker { ) do { - return try await urlSession.performReq(resource: resource) + return try await urlSession.performRequest(resource: resource) } catch { if let error = error as? ServerError { throw LoginError.make(serverError: error) diff --git a/apple/OmnivoreKit/Sources/Views/KeyboardManagement.swift b/apple/OmnivoreKit/Sources/Views/KeyboardManagement.swift deleted file mode 100644 index ca0e42a3a..000000000 --- a/apple/OmnivoreKit/Sources/Views/KeyboardManagement.swift +++ /dev/null @@ -1,63 +0,0 @@ -import Combine -import SwiftUI - -#if !os(macOS) - import UIKit -#endif - -public extension Publishers { - static var keyboardHeight: AnyPublisher { - #if os(iOS) - let willShow = NotificationCenter.default - .publisher(for: UIApplication.keyboardWillShowNotification) - .map(\.keyboardHeight) - .eraseToAnyPublisher() - - let willHide = NotificationCenter.default - .publisher(for: UIApplication.keyboardWillHideNotification) - .map { _ in CGFloat(0) } - .eraseToAnyPublisher() - - return Merge(willShow, willHide) - .eraseToAnyPublisher() - #elseif os(macOS) - Future { $0(.success(CGFloat.zero)) } - .eraseToAnyPublisher() - #endif - } -} - -extension Notification { - var keyboardHeight: CGFloat { - #if os(iOS) - (userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect)?.height ?? 0 - #elseif os(macOS) - 0 - #endif - } -} - -struct KeyboardAdaptive: ViewModifier { - @State private var keyboardHeight: CGFloat = 0 - - func body(content: Content) -> some View { - content - .padding(.bottom, keyboardHeight) - .onReceive(Publishers.keyboardHeight) { self.keyboardHeight = $0 } - } -} - -extension View { - func keyboardAdaptive() -> some View { - ModifiedContent(content: self, modifier: KeyboardAdaptive()) - } -} - -extension View { - func hideKeyboard() { - #if os(iOS) - UIApplication.shared - .sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil) - #endif - } -}