diff --git a/DesignKit/Source/ColorsSwiftUI.swift b/DesignKit/Source/ColorsSwiftUI.swift index b685ac0d7..ea3ca6779 100644 --- a/DesignKit/Source/ColorsSwiftUI.swift +++ b/DesignKit/Source/ColorsSwiftUI.swift @@ -20,7 +20,6 @@ import SwiftUI /** Struct for holding colors for use in SwiftUI. */ -@available(iOS 14.0, *) public struct ColorSwiftUI: Colors { public let accent: Color diff --git a/DesignKit/Source/FontsSwiftUI.swift b/DesignKit/Source/FontsSwiftUI.swift index a12a537ff..83b4e820b 100644 --- a/DesignKit/Source/FontsSwiftUI.swift +++ b/DesignKit/Source/FontsSwiftUI.swift @@ -20,7 +20,6 @@ import SwiftUI /** Struct for holding fonts for use in SwiftUI. */ -@available(iOS 14.0, *) public struct FontSwiftUI: Fonts { public let uiFonts: FontsUIKit diff --git a/DesignKit/Source/ThemeV2.swift b/DesignKit/Source/ThemeV2.swift index f04138faf..dedc4d6df 100644 --- a/DesignKit/Source/ThemeV2.swift +++ b/DesignKit/Source/ThemeV2.swift @@ -30,7 +30,6 @@ import UIKit } /// Theme v2 for SwiftUI. -@available(iOS 14.0, *) public protocol ThemeSwiftUIType { /// Colors object diff --git a/DesignKit/Variants/Colors/Dark/DarkColors.swift b/DesignKit/Variants/Colors/Dark/DarkColors.swift index 24678fcd0..88bd12ff3 100644 --- a/DesignKit/Variants/Colors/Dark/DarkColors.swift +++ b/DesignKit/Variants/Colors/Dark/DarkColors.swift @@ -47,6 +47,5 @@ public class DarkColors { ) public static var uiKit = ColorsUIKit(values: values) - @available(iOS 14.0, *) public static var swiftUI = ColorSwiftUI(values: values) } diff --git a/DesignKit/Variants/Colors/Light/LightColors.swift b/DesignKit/Variants/Colors/Light/LightColors.swift index 332a24162..93cb3eadb 100644 --- a/DesignKit/Variants/Colors/Light/LightColors.swift +++ b/DesignKit/Variants/Colors/Light/LightColors.swift @@ -48,7 +48,6 @@ public class LightColors { ) public static var uiKit = ColorsUIKit(values: values) - @available(iOS 14.0, *) public static var swiftUI = ColorSwiftUI(values: values) } diff --git a/Riot/Categories/Publisher+Riot.swift b/Riot/Categories/Publisher+Riot.swift index 6fa9e2051..98bb522b3 100644 --- a/Riot/Categories/Publisher+Riot.swift +++ b/Riot/Categories/Publisher+Riot.swift @@ -16,7 +16,6 @@ import Combine -@available(iOS 14.0, *) extension Publisher { /// diff --git a/Riot/Managers/UISIAutoReporter/UISIAutoReporter.swift b/Riot/Managers/UISIAutoReporter/UISIAutoReporter.swift index 893dbbe29..e6a02982b 100644 --- a/Riot/Managers/UISIAutoReporter/UISIAutoReporter.swift +++ b/Riot/Managers/UISIAutoReporter/UISIAutoReporter.swift @@ -41,7 +41,6 @@ extension UISIAutoReportData: Codable { /// Listens for failed decryption events and silently sends reports RageShake server. /// Also requests that message senders send a matching report to have both sides of the interaction. -@available(iOS 14.0, *) @objcMembers class UISIAutoReporter: NSObject, UISIDetectorDelegate { struct ReportInfo: Hashable { diff --git a/Riot/Modules/Common/SwiftUI/VectorHostingController.swift b/Riot/Modules/Common/SwiftUI/VectorHostingController.swift index 97e5ca5d3..c636350b1 100644 --- a/Riot/Modules/Common/SwiftUI/VectorHostingController.swift +++ b/Riot/Modules/Common/SwiftUI/VectorHostingController.swift @@ -21,7 +21,6 @@ import SwiftUI UIHostingController that applies some app-level specific configuration (E.g. `vectorContent` modifier and theming to the NavigationController container. */ -@available(iOS 14.0, *) class VectorHostingController: UIHostingController { // MARK: Private diff --git a/Riot/Modules/CreateRoom/CreateRoomCoordinator.swift b/Riot/Modules/CreateRoom/CreateRoomCoordinator.swift index b86728e93..f48222d01 100644 --- a/Riot/Modules/CreateRoom/CreateRoomCoordinator.swift +++ b/Riot/Modules/CreateRoom/CreateRoomCoordinator.swift @@ -114,7 +114,6 @@ final class CreateRoomCoordinator: CreateRoomCoordinatorType { return coordinator } - @available(iOS 14.0, *) private func createRoomSelectorCoordinator(parentSpace: MXSpace) -> MatrixItemChooserCoordinator { let paramaters = MatrixItemChooserCoordinatorParameters(session: self.parameters.session, viewProvider: AddRoomSelectorViewProvider(), itemsProcessor: AddRoomItemsProcessor(parentSpace: parentSpace)) let coordinator = MatrixItemChooserCoordinator(parameters: paramaters) diff --git a/Riot/Modules/MediaPickerV2/MediaPickerPresenter.swift b/Riot/Modules/MediaPickerV2/MediaPickerPresenter.swift index b9b7ba079..da009653d 100644 --- a/Riot/Modules/MediaPickerV2/MediaPickerPresenter.swift +++ b/Riot/Modules/MediaPickerV2/MediaPickerPresenter.swift @@ -74,7 +74,6 @@ final class MediaPickerPresenter: NSObject { } // MARK: - PHPickerViewControllerDelegate -@available(iOS 14, *) extension MediaPickerPresenter: PHPickerViewControllerDelegate { func picker(_ picker: PHPickerViewController, didFinishPicking results: [PHPickerResult]) { // TODO: Handle videos and multi-selection diff --git a/Riot/Modules/SideMenu/SideMenuCoordinator.swift b/Riot/Modules/SideMenu/SideMenuCoordinator.swift index a889ea05b..0b7ccae1a 100644 --- a/Riot/Modules/SideMenu/SideMenuCoordinator.swift +++ b/Riot/Modules/SideMenu/SideMenuCoordinator.swift @@ -260,7 +260,6 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType { self.spaceDetailPresenter.present(forSpaceWithId: spaceId, from: self.sideMenuViewController, sourceView: sourceView, session: session, animated: true) } - @available(iOS 14.0, *) private func showCreateSpace() { guard let session = self.parameters.userSessionsService.mainUserSession?.matrixSession else { return @@ -301,7 +300,6 @@ final class SideMenuCoordinator: NSObject, SideMenuCoordinatorType { self.createRoomCoordinator = createRoomCoordinator } - @available(iOS 14.0, *) private func showSpaceSettings(spaceId: String, session: MXSession) { let coordinator = SpaceSettingsModalCoordinator(parameters: SpaceSettingsModalCoordinatorParameters(session: session, spaceId: spaceId, parentSpaceId: nil)) coordinator.callback = { [weak self] result in diff --git a/Riot/Modules/Spaces/SpaceMenu/SpaceMenuPresenter.swift b/Riot/Modules/Spaces/SpaceMenu/SpaceMenuPresenter.swift index 8093578d5..44d77bd23 100644 --- a/Riot/Modules/Spaces/SpaceMenu/SpaceMenuPresenter.swift +++ b/Riot/Modules/Spaces/SpaceMenu/SpaceMenuPresenter.swift @@ -100,7 +100,6 @@ class SpaceMenuPresenter: NSObject { } } - @available(iOS 14.0, *) private func showLeaveSpace() { let name = session.spaceService.getSpace(withId: spaceId)?.summary?.displayname ?? VectorL10n.spaceTag diff --git a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift index 8e2a72808..817c4cceb 100644 --- a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift +++ b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift @@ -204,7 +204,6 @@ final class ExploreRoomCoordinator: NSObject, ExploreRoomCoordinatorType { self.navigationRouter.present(coordinator, animated: true) } - @available(iOS 14.0, *) private func showSpaceSettings(of childInfo: MXSpaceChildInfo) { let coordinator = SpaceSettingsModalCoordinator(parameters: SpaceSettingsModalCoordinatorParameters(session: session, spaceId: childInfo.childRoomId, parentSpaceId: spaceIdStack.last)) coordinator.callback = { [weak self] result in diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptViewModel.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptViewModel.swift index 7cd852f71..3fa94d351 100644 --- a/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptViewModel.swift +++ b/RiotSwiftUI/Modules/AnalyticsPrompt/AnalyticsPromptViewModel.swift @@ -17,11 +17,9 @@ import SwiftUI import Combine -@available(iOS 14, *) typealias AnalyticsPromptViewModelType = StateStoreViewModel -@available(iOS 14, *) class AnalyticsPromptViewModel: AnalyticsPromptViewModelType { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptCoordinator.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptCoordinator.swift index f96fe3eb9..bcfa19e17 100644 --- a/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptCoordinator.swift +++ b/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptCoordinator.swift @@ -31,7 +31,6 @@ final class AnalyticsPromptCoordinator: Coordinator, Presentable { private let analyticsPromptHostingController: UIViewController private var _analyticsPromptViewModel: Any? = nil - @available(iOS 14.0, *) fileprivate var analyticsPromptViewModel: AnalyticsPromptViewModel { return _analyticsPromptViewModel as! AnalyticsPromptViewModel } @@ -44,7 +43,6 @@ final class AnalyticsPromptCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: AnalyticsPromptCoordinatorParameters) { self.parameters = parameters diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptStrings.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptStrings.swift index 1915a4040..9ada08435 100644 --- a/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptStrings.swift +++ b/RiotSwiftUI/Modules/AnalyticsPrompt/Coordinator/AnalyticsPromptStrings.swift @@ -17,7 +17,6 @@ import Foundation import UIKit -@available(iOS 14.0, *) struct AnalyticsPromptStrings: AnalyticsPromptStringsProtocol { let point1 = HTMLFormatter.formatHTML(VectorL10n.analyticsPromptPoint1, withAllowedTags: ["b", "p"], diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptScreenState.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptScreenState.swift index ed947e303..290a88836 100644 --- a/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptScreenState.swift +++ b/RiotSwiftUI/Modules/AnalyticsPrompt/MockAnalyticsPromptScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockAnalyticsPromptScreenState: MockScreenState, CaseIterable { /// The type of prompt to display. case promptType(AnalyticsPromptType) diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/Test/UI/AnalyticsPromptUITests.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/Test/UI/AnalyticsPromptUITests.swift index c24e1fa63..fc12e4e74 100644 --- a/RiotSwiftUI/Modules/AnalyticsPrompt/Test/UI/AnalyticsPromptUITests.swift +++ b/RiotSwiftUI/Modules/AnalyticsPrompt/Test/UI/AnalyticsPromptUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class AnalyticsPromptUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPrompt.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPrompt.swift index 30e0b5b0c..16cbeb989 100644 --- a/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPrompt.swift +++ b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPrompt.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) /// A prompt that asks the user whether they would like to enable Analytics or not. struct AnalyticsPrompt: View { diff --git a/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptCheckmarkItem.swift b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptCheckmarkItem.swift index 9019e9033..cec25f2d7 100644 --- a/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptCheckmarkItem.swift +++ b/RiotSwiftUI/Modules/AnalyticsPrompt/View/AnalyticsPromptCheckmarkItem.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct AnalyticsPromptCheckmarkItem: View { // MARK: - Properties @@ -75,7 +74,6 @@ struct AnalyticsPromptCheckmarkItem: View { // MARK: - Previews -@available(iOS 14.0, *) struct AnalyticsPromptCheckmarkItem_Previews: PreviewProvider { static let strings = MockAnalyticsPromptStrings() diff --git a/RiotSwiftUI/Modules/Authentication/ChoosePassword/Coordinator/AuthenticationChoosePasswordCoordinator.swift b/RiotSwiftUI/Modules/Authentication/ChoosePassword/Coordinator/AuthenticationChoosePasswordCoordinator.swift index d1a0e40a3..03a520087 100644 --- a/RiotSwiftUI/Modules/Authentication/ChoosePassword/Coordinator/AuthenticationChoosePasswordCoordinator.swift +++ b/RiotSwiftUI/Modules/Authentication/ChoosePassword/Coordinator/AuthenticationChoosePasswordCoordinator.swift @@ -28,7 +28,6 @@ enum AuthenticationChoosePasswordCoordinatorResult { case cancel } -@available(iOS 14.0, *) final class AuthenticationChoosePasswordCoordinator: Coordinator, Presentable { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Authentication/ChoosePassword/MockAuthenticationChoosePasswordScreenState.swift b/RiotSwiftUI/Modules/Authentication/ChoosePassword/MockAuthenticationChoosePasswordScreenState.swift index da5df989a..c18b1398a 100644 --- a/RiotSwiftUI/Modules/Authentication/ChoosePassword/MockAuthenticationChoosePasswordScreenState.swift +++ b/RiotSwiftUI/Modules/Authentication/ChoosePassword/MockAuthenticationChoosePasswordScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockAuthenticationChoosePasswordScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Authentication/ForgotPassword/Coordinator/AuthenticationForgotPasswordCoordinator.swift b/RiotSwiftUI/Modules/Authentication/ForgotPassword/Coordinator/AuthenticationForgotPasswordCoordinator.swift index 99552be87..81cc08f97 100644 --- a/RiotSwiftUI/Modules/Authentication/ForgotPassword/Coordinator/AuthenticationForgotPasswordCoordinator.swift +++ b/RiotSwiftUI/Modules/Authentication/ForgotPassword/Coordinator/AuthenticationForgotPasswordCoordinator.swift @@ -29,7 +29,6 @@ enum AuthenticationForgotPasswordCoordinatorResult { case cancel } -@available(iOS 14.0, *) final class AuthenticationForgotPasswordCoordinator: Coordinator, Presentable { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Authentication/ForgotPassword/MockAuthenticationForgotPasswordScreenState.swift b/RiotSwiftUI/Modules/Authentication/ForgotPassword/MockAuthenticationForgotPasswordScreenState.swift index 9428fb4ef..c955e1518 100644 --- a/RiotSwiftUI/Modules/Authentication/ForgotPassword/MockAuthenticationForgotPasswordScreenState.swift +++ b/RiotSwiftUI/Modules/Authentication/ForgotPassword/MockAuthenticationForgotPasswordScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockAuthenticationForgotPasswordScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Authentication/SoftLogout/Coordinator/AuthenticationSoftLogoutCoordinator.swift b/RiotSwiftUI/Modules/Authentication/SoftLogout/Coordinator/AuthenticationSoftLogoutCoordinator.swift index d044a14e9..632d0ac8e 100644 --- a/RiotSwiftUI/Modules/Authentication/SoftLogout/Coordinator/AuthenticationSoftLogoutCoordinator.swift +++ b/RiotSwiftUI/Modules/Authentication/SoftLogout/Coordinator/AuthenticationSoftLogoutCoordinator.swift @@ -49,7 +49,6 @@ enum AuthenticationSoftLogoutCoordinatorResult: CustomStringConvertible { } } -@available(iOS 14.0, *) final class AuthenticationSoftLogoutCoordinator: Coordinator, Presentable { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Authentication/SoftLogout/MockAuthenticationSoftLogoutScreenState.swift b/RiotSwiftUI/Modules/Authentication/SoftLogout/MockAuthenticationSoftLogoutScreenState.swift index 160cf5c08..8efa80d67 100644 --- a/RiotSwiftUI/Modules/Authentication/SoftLogout/MockAuthenticationSoftLogoutScreenState.swift +++ b/RiotSwiftUI/Modules/Authentication/SoftLogout/MockAuthenticationSoftLogoutScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockAuthenticationSoftLogoutScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Authentication/VerifyEmail/Coordinator/AuthenticationVerifyEmailCoordinator.swift b/RiotSwiftUI/Modules/Authentication/VerifyEmail/Coordinator/AuthenticationVerifyEmailCoordinator.swift index dcc2eea4e..dede95bee 100644 --- a/RiotSwiftUI/Modules/Authentication/VerifyEmail/Coordinator/AuthenticationVerifyEmailCoordinator.swift +++ b/RiotSwiftUI/Modules/Authentication/VerifyEmail/Coordinator/AuthenticationVerifyEmailCoordinator.swift @@ -21,7 +21,6 @@ struct AuthenticationVerifyEmailCoordinatorParameters { let registrationWizard: RegistrationWizard } -@available(iOS 14.0, *) final class AuthenticationVerifyEmailCoordinator: Coordinator, Presentable { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Authentication/VerifyEmail/MockAuthenticationVerifyEmailScreenState.swift b/RiotSwiftUI/Modules/Authentication/VerifyEmail/MockAuthenticationVerifyEmailScreenState.swift index fce859bf9..12b66140c 100644 --- a/RiotSwiftUI/Modules/Authentication/VerifyEmail/MockAuthenticationVerifyEmailScreenState.swift +++ b/RiotSwiftUI/Modules/Authentication/VerifyEmail/MockAuthenticationVerifyEmailScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockAuthenticationVerifyEmailScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Authentication/VerifyMsisdn/MockAuthenticationVerifyMsisdnScreenState.swift b/RiotSwiftUI/Modules/Authentication/VerifyMsisdn/MockAuthenticationVerifyMsisdnScreenState.swift index f9dfc34ad..8e86e9ff7 100644 --- a/RiotSwiftUI/Modules/Authentication/VerifyMsisdn/MockAuthenticationVerifyMsisdnScreenState.swift +++ b/RiotSwiftUI/Modules/Authentication/VerifyMsisdn/MockAuthenticationVerifyMsisdnScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockAuthenticationVerifyMsisdnScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicator.swift b/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicator.swift index 541bfbd60..51c4ecdd8 100644 --- a/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicator.swift +++ b/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicator.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) /// A visual cue to user that something is in progress. struct ActivityIndicator: View { @@ -34,7 +33,6 @@ struct ActivityIndicator: View { } } -@available(iOS 14.0, *) struct ActivityIndicator_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicatorModifier.swift b/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicatorModifier.swift index 1b083d1e0..cd4bb859f 100644 --- a/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicatorModifier.swift +++ b/RiotSwiftUI/Modules/Common/ActivityIndicator/ActivityIndicatorModifier.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) /// A modifier for showing the activity indicator centered over a view. struct ActivityIndicatorModifier: ViewModifier { var show: Bool @@ -36,9 +35,7 @@ struct ActivityIndicatorModifier: ViewModifier { } } -@available(iOS 14.0, *) extension View { - @available(iOS 14.0, *) func activityIndicator(show: Bool) -> some View { self.modifier(ActivityIndicatorModifier(show: show)) } diff --git a/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift b/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift index 34b6db55a..2e6ca5a94 100644 --- a/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift +++ b/RiotSwiftUI/Modules/Common/Avatar/Service/MatrixSDK/AvatarService.swift @@ -48,7 +48,6 @@ class AvatarService: AvatarServiceProtocol { /// - mxContentUri: matrix uri of the avatar to fetch /// - avatarSize: The size of avatar to retrieve as defined in the DesignKit spec. /// - Returns: A Future of UIImage that returns an error if it fails to fetch the image. - @available(iOS 14.0, *) func avatarImage(mxContentUri: String, avatarSize: AvatarSize) -> Future { let cachePath = MXMediaManager.thumbnailCachePath( diff --git a/RiotSwiftUI/Modules/Common/Avatar/Service/Mock/MockAvatarService.swift b/RiotSwiftUI/Modules/Common/Avatar/Service/Mock/MockAvatarService.swift index e8032ee07..94ea01c55 100644 --- a/RiotSwiftUI/Modules/Common/Avatar/Service/Mock/MockAvatarService.swift +++ b/RiotSwiftUI/Modules/Common/Avatar/Service/Mock/MockAvatarService.swift @@ -19,7 +19,6 @@ import Combine import DesignKit import UIKit -@available(iOS 14.0, *) class MockAvatarService: AvatarServiceProtocol { static let example: AvatarServiceProtocol = MockAvatarService() func avatarImage(mxContentUri: String, avatarSize: AvatarSize) -> Future { diff --git a/RiotSwiftUI/Modules/Common/Avatar/View/AvatarImage.swift b/RiotSwiftUI/Modules/Common/Avatar/View/AvatarImage.swift index 6d0d444dc..2b7fa9e60 100644 --- a/RiotSwiftUI/Modules/Common/Avatar/View/AvatarImage.swift +++ b/RiotSwiftUI/Modules/Common/Avatar/View/AvatarImage.swift @@ -17,7 +17,6 @@ import SwiftUI import DesignKit -@available(iOS 14.0, *) struct AvatarImage: View { @Environment(\.theme) var theme: ThemeSwiftUI @@ -57,7 +56,6 @@ struct AvatarImage: View { } } -@available(iOS 14.0, *) extension AvatarImage { init(avatarData: AvatarInputProtocol, size: AvatarSize) { self.init( @@ -69,7 +67,6 @@ extension AvatarImage { } } -@available(iOS 14.0, *) extension AvatarImage { func border(color: Color) -> some View { modifier(BorderModifier(color: color, borderWidth: 3, shape: Circle())) @@ -82,7 +79,6 @@ extension AvatarImage { } } -@available(iOS 14.0, *) struct AvatarImage_Previews: PreviewProvider { static let mxContentUri = "fakeUri" static let name = "Alice" diff --git a/RiotSwiftUI/Modules/Common/Avatar/View/PlaceholderAvatarImage.swift b/RiotSwiftUI/Modules/Common/Avatar/View/PlaceholderAvatarImage.swift index 93f0a7186..f119a7e14 100644 --- a/RiotSwiftUI/Modules/Common/Avatar/View/PlaceholderAvatarImage.swift +++ b/RiotSwiftUI/Modules/Common/Avatar/View/PlaceholderAvatarImage.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) /// A reusable view that will show a standard placeholder avatar with the /// supplied character and colour index for the `namesAndAvatars` color array. /// @@ -50,7 +49,6 @@ struct PlaceholderAvatarImage: View { } } -@available(iOS 14.0, *) struct Previews_TemplateAvatarImage_Previews: PreviewProvider { static var previews: some View { PlaceholderAvatarImage(firstCharacter: "X", colorIndex: 1) diff --git a/RiotSwiftUI/Modules/Common/Avatar/View/SpaceAvatarImage.swift b/RiotSwiftUI/Modules/Common/Avatar/View/SpaceAvatarImage.swift index e0bb01e97..d82e2107f 100644 --- a/RiotSwiftUI/Modules/Common/Avatar/View/SpaceAvatarImage.swift +++ b/RiotSwiftUI/Modules/Common/Avatar/View/SpaceAvatarImage.swift @@ -17,7 +17,6 @@ import SwiftUI import DesignKit -@available(iOS 14.0, *) struct SpaceAvatarImage: View { @Environment(\.theme) var theme: ThemeSwiftUI @@ -73,7 +72,6 @@ struct SpaceAvatarImage: View { } } -@available(iOS 14.0, *) extension SpaceAvatarImage { init(avatarData: AvatarInputProtocol, size: AvatarSize) { self.init( @@ -85,7 +83,6 @@ extension SpaceAvatarImage { } } -@available(iOS 14.0, *) struct LiveAvatarImage_Previews: PreviewProvider { static let mxContentUri = "fakeUri" static let name = "Alice" diff --git a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarServiceProtocol.swift b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarServiceProtocol.swift index bc8283ee6..1f505a7db 100644 --- a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarServiceProtocol.swift @@ -22,6 +22,5 @@ import UIKit /// Provides a simple api to retrieve and cache avatar images protocol AvatarServiceProtocol { - @available(iOS 14.0, *) func avatarImage(mxContentUri: String, avatarSize: AvatarSize) -> Future } diff --git a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift index 00d410f80..6a1ee265a 100644 --- a/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift +++ b/RiotSwiftUI/Modules/Common/Avatar/ViewModel/AvatarViewModel.swift @@ -18,7 +18,6 @@ import Foundation import Combine import DesignKit -@available(iOS 14.0, *) /// Simple ViewModel that supports loading an avatar image class AvatarViewModel: InjectableObject, ObservableObject { diff --git a/RiotSwiftUI/Modules/Common/Bridging/VectorContentView.swift b/RiotSwiftUI/Modules/Common/Bridging/VectorContentView.swift index 73f565dbd..4783fd01c 100644 --- a/RiotSwiftUI/Modules/Common/Bridging/VectorContentView.swift +++ b/RiotSwiftUI/Modules/Common/Bridging/VectorContentView.swift @@ -19,7 +19,6 @@ import SwiftUI /// A Modifier to be called from the top-most SwiftUI view before being added to a HostViewController. /// /// Provides any app level configuration the SwiftUI hierarchy might need (E.g. to monitor theme changes). -@available(iOS 14.0, *) struct VectorContentModifier: ViewModifier { @ObservedObject private var themePublisher = ThemePublisher.shared @@ -38,7 +37,6 @@ struct VectorContentModifier: ViewModifier { } } -@available(iOS 14.0, *) extension View { func vectorContent() -> some View { self.modifier(VectorContentModifier()) diff --git a/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainerKey.swift b/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainerKey.swift index 1bfbd48b5..b788b362d 100644 --- a/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainerKey.swift +++ b/RiotSwiftUI/Modules/Common/DependencyInjection/DependencyContainerKey.swift @@ -25,7 +25,6 @@ private struct DependencyContainerKey: EnvironmentKey { static let defaultValue = DependencyContainer() } -@available(iOS 14.0, *) extension EnvironmentValues { var dependencies: DependencyContainer { get { self[DependencyContainerKey.self] } @@ -33,7 +32,6 @@ extension EnvironmentValues { } } -@available(iOS 14.0, *) extension View { /// A modifier for adding a dependency to the SwiftUI view hierarchy's dependency container. diff --git a/RiotSwiftUI/Modules/Common/EffectsScene/EffectsScene.swift b/RiotSwiftUI/Modules/Common/EffectsScene/EffectsScene.swift index affd35eea..67ef9bc7c 100644 --- a/RiotSwiftUI/Modules/Common/EffectsScene/EffectsScene.swift +++ b/RiotSwiftUI/Modules/Common/EffectsScene/EffectsScene.swift @@ -17,7 +17,6 @@ import SceneKit import SwiftUI -@available(iOS 14.0, *) class EffectsScene: SCNScene { // MARK: - Constants @@ -61,7 +60,6 @@ class EffectsScene: SCNScene { } } -@available(iOS 14.0, *) fileprivate extension Color { /// The color's components as an array of floats in the extended linear sRGB colorspace. /// diff --git a/RiotSwiftUI/Modules/Common/EffectsScene/EffectsView.swift b/RiotSwiftUI/Modules/Common/EffectsScene/EffectsView.swift index a3ca268f1..2422a2ef5 100644 --- a/RiotSwiftUI/Modules/Common/EffectsScene/EffectsView.swift +++ b/RiotSwiftUI/Modules/Common/EffectsScene/EffectsView.swift @@ -17,7 +17,6 @@ import SwiftUI import SceneKit -@available(iOS 14.0, *) /// A SwiftUI wrapper around `SCNView`, that unlike `SceneView` allows the /// scene to have a transparent background and be rendered on top of other views. struct EffectsView: UIViewRepresentable { diff --git a/RiotSwiftUI/Modules/Common/Extensions/Publisher.swift b/RiotSwiftUI/Modules/Common/Extensions/Publisher.swift index e19d516ac..892608cef 100644 --- a/RiotSwiftUI/Modules/Common/Extensions/Publisher.swift +++ b/RiotSwiftUI/Modules/Common/Extensions/Publisher.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) extension Publisher where Failure == Never { /// Same as `assign(to:on:)` but maintains a weak reference to object /// diff --git a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift index ddb96ab60..a55633467 100644 --- a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift +++ b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift @@ -17,7 +17,6 @@ import Foundation /// The static list of mocked screens in RiotSwiftUI -@available(iOS 14.0, *) enum MockAppScreens { static let appScreens: [MockScreenState.Type] = [ MockLiveLocationSharingViewerScreenState.self, diff --git a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift index d4ac2a9e7..073d32381 100644 --- a/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift +++ b/RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift @@ -17,14 +17,12 @@ import SwiftUI /// Used for mocking top level screens and their various states. -@available(iOS 14.0, *) protocol MockScreenState { static var screenStates: [MockScreenState] { get } var screenType: Any.Type { get } var screenView: ([Any], AnyView) { get } } -@available(iOS 14.0, *) extension MockScreenState { /// Get a list of the screens for every screen state. @@ -60,7 +58,6 @@ extension MockScreenState { } } -@available(iOS 14.0, *) extension MockScreenState where Self: CaseIterable { static var screenStates: [MockScreenState] { return Array(self.allCases) diff --git a/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift b/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift index faf39e0e4..c8c442625 100644 --- a/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift +++ b/RiotSwiftUI/Modules/Common/Mock/ScreenList.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct ScreenList: View { private var allStates: [ScreenStateInfo] @@ -49,7 +48,6 @@ struct ScreenList: View { } } -@available(iOS 14.0, *) struct ScreenList_Previews: PreviewProvider { static var previews: some View { ScreenList(screens: [MockTemplateUserProfileScreenState.self]) diff --git a/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift b/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift index 4ebd1232e..6ebc6f591 100644 --- a/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift +++ b/RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) struct ScreenStateInfo { var dependencies: [Any] var view: AnyView diff --git a/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift b/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift index c833550ae..207146794 100644 --- a/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift +++ b/RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) class StateRenderer { var states: [ScreenStateInfo] init(states: [ScreenStateInfo]) { diff --git a/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift b/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift index 9803b0f22..0246d7c00 100644 --- a/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift +++ b/RiotSwiftUI/Modules/Common/Test/UI/MockScreenTest.swift @@ -21,7 +21,6 @@ import RiotSwiftUI /// Creates a test case for each screen state, launches the app, /// goes to the correct screen and provides the state and key for each /// invocation of the test. -@available(iOS 14.0, *) class MockScreenTest: XCTestCase { enum Constants { diff --git a/RiotSwiftUI/Modules/Common/Test/XCTestPublisherExtensions.swift b/RiotSwiftUI/Modules/Common/Test/XCTestPublisherExtensions.swift index 7c0f2ec72..11db89923 100644 --- a/RiotSwiftUI/Modules/Common/Test/XCTestPublisherExtensions.swift +++ b/RiotSwiftUI/Modules/Common/Test/XCTestPublisherExtensions.swift @@ -17,7 +17,6 @@ import XCTest import Combine -@available(iOS 14.0, *) extension XCTestCase { /// XCTest utility to wait for results from publishers, so that the output can be used for assertions. /// diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemeIdentifierExtensions.swift b/RiotSwiftUI/Modules/Common/Theme/ThemeIdentifierExtensions.swift index d3e3c6c4b..d5401d27e 100644 --- a/RiotSwiftUI/Modules/Common/Theme/ThemeIdentifierExtensions.swift +++ b/RiotSwiftUI/Modules/Common/Theme/ThemeIdentifierExtensions.swift @@ -17,7 +17,6 @@ import Foundation import DesignKit -@available(iOS 14.0, *) extension ThemeIdentifier { fileprivate static let defaultTheme = DefaultThemeSwiftUI() fileprivate static let darkTheme = DarkThemeSwiftUI() diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemeKey.swift b/RiotSwiftUI/Modules/Common/Theme/ThemeKey.swift index eb4de70c1..a2e742b7f 100644 --- a/RiotSwiftUI/Modules/Common/Theme/ThemeKey.swift +++ b/RiotSwiftUI/Modules/Common/Theme/ThemeKey.swift @@ -18,12 +18,10 @@ import Foundation import SwiftUI import DesignKit -@available(iOS 14.0, *) private struct ThemeKey: EnvironmentKey { static let defaultValue = ThemePublisher.shared.theme } -@available(iOS 14.0, *) extension EnvironmentValues { var theme: ThemeSwiftUI { get { self[ThemeKey.self] } @@ -31,7 +29,6 @@ extension EnvironmentValues { } } -@available(iOS 14.0, *) extension View { /// A theme modifier for setting the theme for this view and all its descendants in the hierarchy. /// - Parameter theme: A theme to be set as the environment value. @@ -41,7 +38,6 @@ extension View { } } -@available(iOS 14.0, *) extension View { /// A theme modifier for setting the theme by id for this view and all its descendants in the hierarchy. /// - Parameter themeId: ThemeIdentifier of a theme to be set as the environment value. diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift b/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift index c57034fd7..ff0a39eca 100644 --- a/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift +++ b/RiotSwiftUI/Modules/Common/Theme/ThemePublisher.swift @@ -21,7 +21,6 @@ import Combine /// /// Replaces the old ThemeObserver. Riot app can push updates to this class /// removing the dependency of this class on the `ThemeService`. -@available(iOS 14.0, *) class ThemePublisher: ObservableObject { private static var _shared: ThemePublisher? = nil diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemeSwiftUI.swift b/RiotSwiftUI/Modules/Common/Theme/ThemeSwiftUI.swift index 6a389c86f..f5a15424f 100644 --- a/RiotSwiftUI/Modules/Common/Theme/ThemeSwiftUI.swift +++ b/RiotSwiftUI/Modules/Common/Theme/ThemeSwiftUI.swift @@ -17,7 +17,6 @@ import Foundation import DesignKit -@available(iOS 14.0, *) protocol ThemeSwiftUI: ThemeSwiftUIType { var identifier: ThemeIdentifier { get } var isDark: Bool { get } diff --git a/RiotSwiftUI/Modules/Common/Theme/ThemeUsersColorsExtension.swift b/RiotSwiftUI/Modules/Common/Theme/ThemeUsersColorsExtension.swift index dc1d93f0c..ad1eeb222 100644 --- a/RiotSwiftUI/Modules/Common/Theme/ThemeUsersColorsExtension.swift +++ b/RiotSwiftUI/Modules/Common/Theme/ThemeUsersColorsExtension.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) extension ThemeSwiftUI { /// Get the stable display user color based on userId. diff --git a/RiotSwiftUI/Modules/Common/Theme/Themes/DarkThemeSwiftUI.swift b/RiotSwiftUI/Modules/Common/Theme/Themes/DarkThemeSwiftUI.swift index f21ef8b4f..0e9250070 100644 --- a/RiotSwiftUI/Modules/Common/Theme/Themes/DarkThemeSwiftUI.swift +++ b/RiotSwiftUI/Modules/Common/Theme/Themes/DarkThemeSwiftUI.swift @@ -17,7 +17,6 @@ import Foundation import DesignKit -@available(iOS 14.0, *) struct DarkThemeSwiftUI: ThemeSwiftUI { var identifier: ThemeIdentifier = .dark let isDark: Bool = true diff --git a/RiotSwiftUI/Modules/Common/Theme/Themes/DefaultThemeSwiftUI.swift b/RiotSwiftUI/Modules/Common/Theme/Themes/DefaultThemeSwiftUI.swift index 0d2a7d9c6..85ba4d810 100644 --- a/RiotSwiftUI/Modules/Common/Theme/Themes/DefaultThemeSwiftUI.swift +++ b/RiotSwiftUI/Modules/Common/Theme/Themes/DefaultThemeSwiftUI.swift @@ -17,7 +17,6 @@ import Foundation import DesignKit -@available(iOS 14.0, *) struct DefaultThemeSwiftUI: ThemeSwiftUI { var identifier: ThemeIdentifier = .light let isDark: Bool = false diff --git a/RiotSwiftUI/Modules/Common/Util/BorderModifier.swift b/RiotSwiftUI/Modules/Common/Util/BorderModifier.swift index e6da415b4..6d5ad7aef 100644 --- a/RiotSwiftUI/Modules/Common/Util/BorderModifier.swift +++ b/RiotSwiftUI/Modules/Common/Util/BorderModifier.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct BorderModifier: ViewModifier { var color: Color @@ -29,7 +28,6 @@ struct BorderModifier: ViewModifier { } } -@available(iOS 14.0, *) extension View { func shapedBorder(color: Color, borderWidth: CGFloat, shape: Shape) -> some View { modifier(BorderModifier(color: color, borderWidth: borderWidth, shape: shape)) diff --git a/RiotSwiftUI/Modules/Common/Util/BorderedInputFieldStyle.swift b/RiotSwiftUI/Modules/Common/Util/BorderedInputFieldStyle.swift index a932ce193..fe75aa300 100644 --- a/RiotSwiftUI/Modules/Common/Util/BorderedInputFieldStyle.swift +++ b/RiotSwiftUI/Modules/Common/Util/BorderedInputFieldStyle.swift @@ -18,7 +18,6 @@ import Foundation import SwiftUI import Introspect -@available(iOS 14.0, *) /// A bordered style of text input /// /// As defined in: @@ -90,7 +89,6 @@ struct BorderedInputFieldStyle: TextFieldStyle { } } -@available(iOS 14.0, *) struct BorderedInputFieldStyle_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Common/Util/InlineTextButton.swift b/RiotSwiftUI/Modules/Common/Util/InlineTextButton.swift index 1b1924b0b..fa394b827 100644 --- a/RiotSwiftUI/Modules/Common/Util/InlineTextButton.swift +++ b/RiotSwiftUI/Modules/Common/Util/InlineTextButton.swift @@ -78,7 +78,6 @@ struct InlineTextButton: View { } } -@available(iOS 14.0, *) struct Previews_InlineButtonText_Previews: PreviewProvider { static var previews: some View { InlineTextButton("Hello there this is a sentence. %@.", diff --git a/RiotSwiftUI/Modules/Common/Util/MultilineTextField.swift b/RiotSwiftUI/Modules/Common/Util/MultilineTextField.swift index dd710f70e..5e20f11b0 100644 --- a/RiotSwiftUI/Modules/Common/Util/MultilineTextField.swift +++ b/RiotSwiftUI/Modules/Common/Util/MultilineTextField.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct MultilineTextField: View { @Environment(\.theme) private var theme: ThemeSwiftUI @@ -92,7 +91,6 @@ struct MultilineTextField: View { } } -@available(iOS 14.0, *) fileprivate struct UITextViewWrapper: UIViewRepresentable { typealias UIViewType = UITextView @@ -172,7 +170,6 @@ fileprivate struct UITextViewWrapper: UIViewRepresentable { } } -@available(iOS 14.0, *) struct MultilineTextField_Previews: PreviewProvider { static var previews: some View { diff --git a/RiotSwiftUI/Modules/Common/Util/OptionButton.swift b/RiotSwiftUI/Modules/Common/Util/OptionButton.swift index 9a4ca7b5f..17e54bbda 100644 --- a/RiotSwiftUI/Modules/Common/Util/OptionButton.swift +++ b/RiotSwiftUI/Modules/Common/Util/OptionButton.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct OptionButton: View { // MARK: - Style @@ -70,7 +69,6 @@ struct OptionButton: View { // MARK: - Previews -@available(iOS 14.0, *) struct OptionButton_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Common/Util/PrimaryActionButtonStyle.swift b/RiotSwiftUI/Modules/Common/Util/PrimaryActionButtonStyle.swift index b2d0206fc..461f232ff 100644 --- a/RiotSwiftUI/Modules/Common/Util/PrimaryActionButtonStyle.swift +++ b/RiotSwiftUI/Modules/Common/Util/PrimaryActionButtonStyle.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct PrimaryActionButtonStyle: ButtonStyle { @Environment(\.theme) private var theme @Environment(\.isEnabled) private var isEnabled @@ -48,7 +47,6 @@ struct PrimaryActionButtonStyle: ButtonStyle { } } -@available(iOS 14.0, *) struct PrimaryActionButtonStyle_Previews: PreviewProvider { static var buttons: some View { Group { diff --git a/RiotSwiftUI/Modules/Common/Util/RadioButton.swift b/RiotSwiftUI/Modules/Common/Util/RadioButton.swift index 83e21c224..69e408410 100644 --- a/RiotSwiftUI/Modules/Common/Util/RadioButton.swift +++ b/RiotSwiftUI/Modules/Common/Util/RadioButton.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct RadioButton: View { // MARK: - Properties @@ -51,7 +50,6 @@ struct RadioButton: View { // MARK: - Previews -@available(iOS 14.0, *) struct RadioButton_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Common/Util/RoundedBorderTextEditor.swift b/RiotSwiftUI/Modules/Common/Util/RoundedBorderTextEditor.swift index ca3d2f1b1..38e50ff19 100644 --- a/RiotSwiftUI/Modules/Common/Util/RoundedBorderTextEditor.swift +++ b/RiotSwiftUI/Modules/Common/Util/RoundedBorderTextEditor.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct RoundedBorderTextEditor: View { // MARK: - Properties @@ -100,7 +99,6 @@ struct RoundedBorderTextEditor: View { // MARK: - Previews -@available(iOS 14.0, *) struct ThemableTextEditor_Previews: PreviewProvider { static var previews: some View { diff --git a/RiotSwiftUI/Modules/Common/Util/RoundedCornerShape.swift b/RiotSwiftUI/Modules/Common/Util/RoundedCornerShape.swift index 69a3cf881..0fc77b56e 100644 --- a/RiotSwiftUI/Modules/Common/Util/RoundedCornerShape.swift +++ b/RiotSwiftUI/Modules/Common/Util/RoundedCornerShape.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) struct RoundedCornerShape: Shape { let radius: CGFloat diff --git a/RiotSwiftUI/Modules/Common/Util/SafeBindingCollectionEnumerator.swift b/RiotSwiftUI/Modules/Common/Util/SafeBindingCollectionEnumerator.swift index 45ea51855..92d6135cd 100644 --- a/RiotSwiftUI/Modules/Common/Util/SafeBindingCollectionEnumerator.swift +++ b/RiotSwiftUI/Modules/Common/Util/SafeBindingCollectionEnumerator.swift @@ -21,7 +21,6 @@ import SwiftUI https://stackoverflow.com/q/65375372 Replace with Swift 5.5 bindings enumerator later. */ -@available(iOS 14.0, *) struct SafeBindingCollectionEnumerator: View { typealias BoundElement = Binding diff --git a/RiotSwiftUI/Modules/Common/Util/ScreenTrackerViewModifier.swift b/RiotSwiftUI/Modules/Common/Util/ScreenTrackerViewModifier.swift index 6e96348fc..b8eaf74d2 100644 --- a/RiotSwiftUI/Modules/Common/Util/ScreenTrackerViewModifier.swift +++ b/RiotSwiftUI/Modules/Common/Util/ScreenTrackerViewModifier.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) /// `ScreenTrackerViewModifier` is a helper class used to track PostHog screen from SwiftUI screens. struct ScreenTrackerViewModifier: ViewModifier { let screen: AnalyticsScreen @@ -32,7 +31,6 @@ struct ScreenTrackerViewModifier: ViewModifier { } } -@available(iOS 14.0, *) extension View { func track(screen: AnalyticsScreen) -> some View { return self.modifier(ScreenTrackerViewModifier(screen: screen)) diff --git a/RiotSwiftUI/Modules/Common/Util/SearchBar.swift b/RiotSwiftUI/Modules/Common/Util/SearchBar.swift index f498c24e6..4edaa2e5c 100644 --- a/RiotSwiftUI/Modules/Common/Util/SearchBar.swift +++ b/RiotSwiftUI/Modules/Common/Util/SearchBar.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SearchBar: View { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Common/Util/SecondaryActionButtonStyle.swift b/RiotSwiftUI/Modules/Common/Util/SecondaryActionButtonStyle.swift index 2d081dd2d..8f0eb6aac 100644 --- a/RiotSwiftUI/Modules/Common/Util/SecondaryActionButtonStyle.swift +++ b/RiotSwiftUI/Modules/Common/Util/SecondaryActionButtonStyle.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SecondaryActionButtonStyle: ButtonStyle { @Environment(\.theme) private var theme @Environment(\.isEnabled) private var isEnabled @@ -41,7 +40,6 @@ struct SecondaryActionButtonStyle: ButtonStyle { } } -@available(iOS 14.0, *) struct SecondaryActionButtonStyle_Previews: PreviewProvider { static var theme: ThemeSwiftUI = DefaultThemeSwiftUI() diff --git a/RiotSwiftUI/Modules/Common/Util/StyledText.swift b/RiotSwiftUI/Modules/Common/Util/StyledText.swift index fbb7919f2..1c4b0a74f 100644 --- a/RiotSwiftUI/Modules/Common/Util/StyledText.swift +++ b/RiotSwiftUI/Modules/Common/Util/StyledText.swift @@ -81,7 +81,6 @@ struct StyledText: View { } -@available(iOS 14.0, *) struct StyledText_Previews: PreviewProvider { static func prettyText() -> NSAttributedString { let string = NSMutableAttributedString(string: "T", attributes: [ diff --git a/RiotSwiftUI/Modules/Common/Util/ThemableButton.swift b/RiotSwiftUI/Modules/Common/Util/ThemableButton.swift index 13169ffc9..61a066c38 100644 --- a/RiotSwiftUI/Modules/Common/Util/ThemableButton.swift +++ b/RiotSwiftUI/Modules/Common/Util/ThemableButton.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct ThemableButton: View { // MARK: - Style @@ -64,7 +63,6 @@ struct ThemableButton: View { // MARK: - Previews -@available(iOS 14.0, *) struct ThemableButton_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Common/Util/ThemableNavigationBar.swift b/RiotSwiftUI/Modules/Common/Util/ThemableNavigationBar.swift index 010034d18..2c6fc3727 100644 --- a/RiotSwiftUI/Modules/Common/Util/ThemableNavigationBar.swift +++ b/RiotSwiftUI/Modules/Common/Util/ThemableNavigationBar.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct ThemableNavigationBar: View { // MARK: - Style @@ -65,7 +64,6 @@ struct ThemableNavigationBar: View { // MARK: - Previews -@available(iOS 14.0, *) struct NavigationBar_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Common/Util/ThemableTextEditor.swift b/RiotSwiftUI/Modules/Common/Util/ThemableTextEditor.swift index e57b08d68..d9f0d1ca7 100644 --- a/RiotSwiftUI/Modules/Common/Util/ThemableTextEditor.swift +++ b/RiotSwiftUI/Modules/Common/Util/ThemableTextEditor.swift @@ -17,7 +17,6 @@ import SwiftUI -@available(iOS 14.0, *) struct ThemableTextEditor: UIViewRepresentable { // MARK: Properties @@ -128,7 +127,6 @@ struct ThemableTextEditor: UIViewRepresentable { // MARK: - modifiers -@available(iOS 14.0, *) extension ThemableTextEditor { func keyboardType(_ type: UIKeyboardType) -> ThemableTextEditor { textView.keyboardType = type diff --git a/RiotSwiftUI/Modules/Common/Util/WaitOverlay.swift b/RiotSwiftUI/Modules/Common/Util/WaitOverlay.swift index b5cd70d1f..60f7315bb 100644 --- a/RiotSwiftUI/Modules/Common/Util/WaitOverlay.swift +++ b/RiotSwiftUI/Modules/Common/Util/WaitOverlay.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) /// A modifier for showing the wait overlay view over a view. struct WaitOverlayModifier: ViewModifier { @@ -34,16 +33,13 @@ struct WaitOverlayModifier: ViewModifier { } } -@available(iOS 14.0, *) extension View { - @available(iOS 14.0, *) func waitOverlay(show: Bool, message: String? = nil, allowUserInteraction: Bool = true) -> some View { self.modifier(WaitOverlayModifier(allowUserInteraction: allowUserInteraction, show: show, message: message)) } } /// `WaitOverlay` allows to easily add an overlay that covers the entire with an `ActivityIndicator` at the center -@available(iOS 14.0, *) struct WaitOverlay: ViewModifier { // MARK: - Properties @@ -103,7 +99,6 @@ struct WaitOverlay: ViewModifier { } } -@available(iOS 14.0, *) struct WaitOverlay_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Common/ViewFrameReader/FramePreferenceKey.swift b/RiotSwiftUI/Modules/Common/ViewFrameReader/FramePreferenceKey.swift index 9da914bd2..1eb7e97dd 100644 --- a/RiotSwiftUI/Modules/Common/ViewFrameReader/FramePreferenceKey.swift +++ b/RiotSwiftUI/Modules/Common/ViewFrameReader/FramePreferenceKey.swift @@ -17,7 +17,6 @@ import SwiftUI /// A SwiftUI `PreferenceKey` for `CGRect` values such as a view's frame. -@available(iOS 14.0, *) struct FramePreferenceKey: PreferenceKey { static var defaultValue: CGRect = .zero diff --git a/RiotSwiftUI/Modules/Common/ViewFrameReader/ViewFrameReader.swift b/RiotSwiftUI/Modules/Common/ViewFrameReader/ViewFrameReader.swift index 5c5671584..834c018a7 100644 --- a/RiotSwiftUI/Modules/Common/ViewFrameReader/ViewFrameReader.swift +++ b/RiotSwiftUI/Modules/Common/ViewFrameReader/ViewFrameReader.swift @@ -26,7 +26,6 @@ import SwiftUI /// SomeView() /// .background(ViewFrameReader(frame: $frame)) /// ``` -@available(iOS 14.0, *) struct ViewFrameReader: View { @Binding var frame: CGRect diff --git a/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift b/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift index efde322fb..63c1ae7ae 100644 --- a/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift +++ b/RiotSwiftUI/Modules/Common/ViewModel/StateStoreViewModel.swift @@ -33,7 +33,6 @@ import Combine /// A similar approach is taken in libraries like [CombineFeedback](https://github.com/sergdort/CombineFeedback). /// It provides a nice layer of consistency and also safety. As we are not passing the `ViewModel` to the view directly, shortcuts/hacks /// can't be made into the `ViewModel`. -@available(iOS 14, *) @dynamicMemberLookup class ViewModelContext: ObservableObject { // MARK: - Properties @@ -75,7 +74,6 @@ class ViewModelContext: ObservableObject { /// a specific portion of state that can be safely bound to. /// If we decide to add more features to our state management (like doing state processing off the main thread) /// we can do it in this centralised place. -@available(iOS 14, *) class StateStoreViewModel { typealias Context = ViewModelContext diff --git a/RiotSwiftUI/Modules/Onboarding/Common/OnboardingIcon.swift b/RiotSwiftUI/Modules/Onboarding/Common/OnboardingIcon.swift index 4ea44af27..598f07446 100644 --- a/RiotSwiftUI/Modules/Onboarding/Common/OnboardingIcon.swift +++ b/RiotSwiftUI/Modules/Onboarding/Common/OnboardingIcon.swift @@ -35,7 +35,6 @@ struct OnboardingIconImage: View { // MARK: - Previews -@available(iOS 14.0, *) struct OnboardingIconImage_Previews: PreviewProvider { static var previews: some View { OnboardingIconImage(image: Asset.Images.authenticationEmailIcon) diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Coordinator/LiveLocationSharingViewerCoordinator.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Coordinator/LiveLocationSharingViewerCoordinator.swift index 40f079692..ffe471f16 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Coordinator/LiveLocationSharingViewerCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Coordinator/LiveLocationSharingViewerCoordinator.swift @@ -44,7 +44,6 @@ final class LiveLocationSharingViewerCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: LiveLocationSharingViewerCoordinatorParameters) { self.parameters = parameters diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerModels.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerModels.swift index 5ea241749..7d5a38ab4 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerModels.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerModels.swift @@ -29,7 +29,6 @@ enum LiveLocationSharingViewerViewModelResult { // MARK: View -@available(iOS 14, *) struct LiveLocationSharingViewerViewState: BindableState { /// Map style URL diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerViewModel.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerViewModel.swift index c34be9bdb..3a365b627 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerViewModel.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerViewModel.swift @@ -18,11 +18,9 @@ import SwiftUI import Combine import Mapbox -@available(iOS 14, *) typealias LiveLocationSharingViewerViewModelType = StateStoreViewModel -@available(iOS 14, *) class LiveLocationSharingViewerViewModel: LiveLocationSharingViewerViewModelType, LiveLocationSharingViewerViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerViewModelProtocol.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerViewModelProtocol.swift index 64f489745..a8626b528 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/LiveLocationSharingViewerViewModelProtocol.swift @@ -19,6 +19,5 @@ import Foundation protocol LiveLocationSharingViewerViewModelProtocol { var completion: ((LiveLocationSharingViewerViewModelResult) -> Void)? { get set } - @available(iOS 14, *) var context: LiveLocationSharingViewerViewModelType.Context { get } } diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/MockLiveLocationSharingViewerScreenState.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/MockLiveLocationSharingViewerScreenState.swift index 10e198471..61353c169 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/MockLiveLocationSharingViewerScreenState.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/MockLiveLocationSharingViewerScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockLiveLocationSharingViewerScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/LiveLocationSharingViewerServiceProtocol.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/LiveLocationSharingViewerServiceProtocol.swift index 5e23bd64e..3b0cbeeaa 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/LiveLocationSharingViewerServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/LiveLocationSharingViewerServiceProtocol.swift @@ -18,7 +18,6 @@ import Foundation import Combine import CoreLocation -@available(iOS 14.0, *) protocol LiveLocationSharingViewerServiceProtocol { /// All shared users live location diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/MatrixSDK/LiveLocationSharingViewerService.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/MatrixSDK/LiveLocationSharingViewerService.swift index 560a4e9c5..f7b4155b6 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/MatrixSDK/LiveLocationSharingViewerService.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/MatrixSDK/LiveLocationSharingViewerService.swift @@ -18,7 +18,6 @@ import Foundation import CoreLocation import MatrixSDK -@available(iOS 14.0, *) class LiveLocationSharingViewerService: LiveLocationSharingViewerServiceProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/Mock/MockLiveLocationSharingViewerService.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/Mock/MockLiveLocationSharingViewerService.swift index d941ddfdc..ac192ec37 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/Mock/MockLiveLocationSharingViewerService.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Service/Mock/MockLiveLocationSharingViewerService.swift @@ -18,7 +18,6 @@ import Foundation import Combine import CoreLocation -@available(iOS 14.0, *) class MockLiveLocationSharingViewerService: LiveLocationSharingViewerServiceProtocol { // MARK: Properties diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Test/UI/LiveLocationSharingViewerUITests.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Test/UI/LiveLocationSharingViewerUITests.swift index 3137d1381..f3e032d7c 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Test/UI/LiveLocationSharingViewerUITests.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Test/UI/LiveLocationSharingViewerUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class LiveLocationSharingViewerUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Test/Unit/LiveLocationSharingViewerViewModelTests.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Test/Unit/LiveLocationSharingViewerViewModelTests.swift index ec6f6a59b..ca59e9ac3 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Test/Unit/LiveLocationSharingViewerViewModelTests.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/Test/Unit/LiveLocationSharingViewerViewModelTests.swift @@ -19,7 +19,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class LiveLocationSharingViewerViewModelTests: XCTestCase { var service: MockLiveLocationSharingViewerService! diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationListItem.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationListItem.swift index 86d192a0c..472652420 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationListItem.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationListItem.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct LiveLocationListItem: View { // MARK: - Properties @@ -121,7 +120,6 @@ struct LiveLocationListItem: View { } } -@available(iOS 14.0, *) struct LiveLocationListPreview: View { let liveLocationSharingViewerService: LiveLocationSharingViewerServiceProtocol = MockLiveLocationSharingViewerService() @@ -181,7 +179,6 @@ struct LiveLocationListPreview: View { } } -@available(iOS 14.0, *) struct LiveLocationListItem_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift index b5d3cb688..fbce0630a 100644 --- a/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift +++ b/RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift @@ -17,7 +17,6 @@ import SwiftUI import DSBottomSheet -@available(iOS 14.0, *) struct LiveLocationSharingViewer: View { // MARK: - Properties @@ -90,7 +89,6 @@ struct LiveLocationSharingViewer: View { } // MARK: - Bottom sheet -@available(iOS 14.0, *) extension LiveLocationSharingViewer { var sheetStyle: BottomSheetStyle { @@ -119,7 +117,6 @@ extension LiveLocationSharingViewer { // MARK: - Previews -@available(iOS 14.0, *) struct LiveLocationSharingViewer_Previews: PreviewProvider { static let stateRenderer = MockLiveLocationSharingViewerScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift b/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift index b4e11f34e..cece7e003 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift @@ -73,7 +73,6 @@ final class LocationSharingCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: LocationSharingCoordinatorParameters) { self.parameters = parameters diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift index b819e303e..22720eeff 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift @@ -55,7 +55,6 @@ enum LocationSharingViewError { case failedSharingLocation } -@available(iOS 14, *) struct LocationSharingViewState: BindableState { /// Map style URL diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingScreenState.swift b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingScreenState.swift index 36aaf6880..defbf11fc 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingScreenState.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingScreenState.swift @@ -18,7 +18,6 @@ import Foundation import SwiftUI import CoreLocation -@available(iOS 14.0, *) enum MockLocationSharingScreenState: MockScreenState, CaseIterable { case shareUserLocation diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift index e2b64ff85..f7d1de9d3 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift @@ -18,11 +18,9 @@ import SwiftUI import Combine import CoreLocation -@available(iOS 14, *) typealias LocationSharingViewModelType = StateStoreViewModel -@available(iOS 14, *) class LocationSharingViewModel: LocationSharingViewModelType, LocationSharingViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/Service/Mock/MockLocationSharingService.swift b/RiotSwiftUI/Modules/Room/LocationSharing/Service/Mock/MockLocationSharingService.swift index 44eb703fb..8b8de5a5a 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/Service/Mock/MockLocationSharingService.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/Service/Mock/MockLocationSharingService.swift @@ -18,7 +18,6 @@ import Foundation import Combine import CoreLocation -@available(iOS 14.0, *) class MockLocationSharingService: LocationSharingServiceProtocol { func requestAuthorization(_ handler: @escaping LocationAuthorizationHandler) { handler(.authorizedAlways) diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift b/RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift index b51a6fb61..65029026c 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class LocationSharingUITests: XCTestCase { private var app: XCUIApplication! diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/Test/Unit/LocationSharingViewModelTests.swift b/RiotSwiftUI/Modules/Room/LocationSharing/Test/Unit/LocationSharingViewModelTests.swift index e70a1a2a8..020021026 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/Test/Unit/LocationSharingViewModelTests.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/Test/Unit/LocationSharingViewModelTests.swift @@ -20,7 +20,6 @@ import CoreLocation @testable import RiotSwiftUI -@available(iOS 14.0, *) class LocationSharingViewModelTests: XCTestCase { var cancellables = Set() diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift index 8ad3ccceb..d244437ae 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift @@ -18,7 +18,6 @@ import SwiftUI import Combine import Mapbox -@available(iOS 14, *) struct LocationSharingMapView: UIViewRepresentable { // MARK: - Constants @@ -109,7 +108,6 @@ struct LocationSharingMapView: UIViewRepresentable { } // MARK: - Coordinator -@available(iOS 14, *) extension LocationSharingMapView { class Coordinator: NSObject, MGLMapViewDelegate, UIGestureRecognizerDelegate { diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMarkerView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMarkerView.swift index 3c36e7d50..0450b16a3 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMarkerView.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMarkerView.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct LocationSharingMarkerView: View { // MARK: - Properties @@ -45,7 +44,6 @@ struct LocationSharingMarkerView: View { // MARK: - Previews -@available(iOS 14.0, *) struct LocationSharingUserMarkerView_Previews: PreviewProvider { static var previews: some View { let avatarData = AvatarInput(mxContentUri: "", diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingOptionButton.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingOptionButton.swift index 32fde8f48..964784f57 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingOptionButton.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingOptionButton.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct LocationSharingOptionButton: View { // MARK: - Properties @@ -42,7 +41,6 @@ struct LocationSharingOptionButton: View { } } -@available(iOS 14.0, *) struct LocationSharingOptionButton_Previews: PreviewProvider { static var previews: some View { VStack(alignment: .leading) { diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift index c986f5a6a..89c86d3ac 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift @@ -17,7 +17,6 @@ import SwiftUI import CoreLocation -@available(iOS 14.0, *) struct LocationSharingView: View { // MARK: - Properties @@ -164,7 +163,6 @@ struct LocationSharingView: View { // MARK: - Previews -@available(iOS 14.0, *) struct LocationSharingView_Previews: PreviewProvider { static let stateRenderer = MockLocationSharingScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/MapCreditsView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/MapCreditsView.swift index ede4cf938..da8509918 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/View/MapCreditsView.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/MapCreditsView.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct MapCreditsView: View { // MARK: - Properties @@ -36,7 +35,6 @@ struct MapCreditsView: View { } } -@available(iOS 14.0, *) struct MapCreditsView_Previews: PreviewProvider { static var previews: some View { MapCreditsView() diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotationView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotationView.swift index 5b9956111..4662ae485 100644 --- a/RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotationView.swift +++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotationView.swift @@ -18,7 +18,6 @@ import Foundation import SwiftUI import Mapbox -@available(iOS 14, *) class LocationAnnotationView: MGLUserLocationAnnotationView { // MARK: - Constants diff --git a/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormItemButtonStyle.swift b/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormItemButtonStyle.swift index 326f3fb85..385aacff0 100644 --- a/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormItemButtonStyle.swift +++ b/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormItemButtonStyle.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) struct FormItemButtonStyle: ButtonStyle { @Environment(\.theme) var theme: ThemeSwiftUI func makeBody(configuration: Self.Configuration) -> some View { diff --git a/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormPickerItem.swift b/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormPickerItem.swift index 7c12de11b..43aee6da8 100644 --- a/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormPickerItem.swift +++ b/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormPickerItem.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct FormPickerItem: View { typealias TapCallback = () -> Void @@ -53,7 +52,6 @@ struct FormPickerItem: View { } } -@available(iOS 14.0, *) struct FormPickerItem_Previews: PreviewProvider { static let items = ["Item 1", "Item 2", "Item 3"] diff --git a/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormSectionFooter.swift b/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormSectionFooter.swift index 9518e0b51..3465c40c9 100644 --- a/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormSectionFooter.swift +++ b/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormSectionFooter.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct FormSectionFooter: View { @Environment(\.theme) var theme: ThemeSwiftUI @@ -32,7 +31,6 @@ struct FormSectionFooter: View { } } -@available(iOS 14.0, *) struct FormSectionFooter_Previews: PreviewProvider { static var previews: some View { VectorForm { diff --git a/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormSectionHeader.swift b/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormSectionHeader.swift index a82afd1de..0ca745ef4 100644 --- a/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormSectionHeader.swift +++ b/RiotSwiftUI/Modules/Room/NotificationSettings/View/FormSectionHeader.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct FormSectionHeader: View { @Environment(\.theme) var theme: ThemeSwiftUI @@ -34,7 +33,6 @@ struct FormSectionHeader: View { } } -@available(iOS 14.0, *) struct FormSectionHeader_Previews: PreviewProvider { static var previews: some View { VectorForm { diff --git a/RiotSwiftUI/Modules/Room/NotificationSettings/View/RoomNotificationSettings.swift b/RiotSwiftUI/Modules/Room/NotificationSettings/View/RoomNotificationSettings.swift index ee0389982..864482e4b 100644 --- a/RiotSwiftUI/Modules/Room/NotificationSettings/View/RoomNotificationSettings.swift +++ b/RiotSwiftUI/Modules/Room/NotificationSettings/View/RoomNotificationSettings.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0.0, *) struct RoomNotificationSettings: View { @Environment(\.theme) var theme: ThemeSwiftUI @@ -74,7 +73,6 @@ struct RoomNotificationSettings: View { } } -@available(iOS 14.0, *) struct RoomNotificationSettings_Previews: PreviewProvider { static let mockViewModel = RoomNotificationSettingsSwiftUIViewModel( diff --git a/RiotSwiftUI/Modules/Room/NotificationSettings/View/RoomNotificationSettingsHeader.swift b/RiotSwiftUI/Modules/Room/NotificationSettings/View/RoomNotificationSettingsHeader.swift index 7379eab71..a0b602fd8 100644 --- a/RiotSwiftUI/Modules/Room/NotificationSettings/View/RoomNotificationSettingsHeader.swift +++ b/RiotSwiftUI/Modules/Room/NotificationSettings/View/RoomNotificationSettingsHeader.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct RoomNotificationSettingsHeader: View { @Environment(\.theme) var theme: ThemeSwiftUI @@ -41,7 +40,6 @@ struct RoomNotificationSettingsHeader: View { } } -@available(iOS 14.0, *) struct RoomNotificationSettingsHeader_Previews: PreviewProvider { static let name = "Element" static var previews: some View { diff --git a/RiotSwiftUI/Modules/Room/NotificationSettings/View/VectorForm.swift b/RiotSwiftUI/Modules/Room/NotificationSettings/View/VectorForm.swift index 10271ec14..1ca9933ec 100644 --- a/RiotSwiftUI/Modules/Room/NotificationSettings/View/VectorForm.swift +++ b/RiotSwiftUI/Modules/Room/NotificationSettings/View/VectorForm.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct VectorForm: View { @Environment(\.theme) var theme: ThemeSwiftUI @@ -43,7 +42,6 @@ struct VectorForm: View { } } -@available(iOS 14.0, *) struct VectorForm_Previews: PreviewProvider { static var previews: some View { diff --git a/RiotSwiftUI/Modules/Room/NotificationSettings/ViewModel/RoomNotificationSettingsSwiftUIViewModel.swift b/RiotSwiftUI/Modules/Room/NotificationSettings/ViewModel/RoomNotificationSettingsSwiftUIViewModel.swift index 6f7738e77..d9b6d9bc8 100644 --- a/RiotSwiftUI/Modules/Room/NotificationSettings/ViewModel/RoomNotificationSettingsSwiftUIViewModel.swift +++ b/RiotSwiftUI/Modules/Room/NotificationSettings/ViewModel/RoomNotificationSettingsSwiftUIViewModel.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class RoomNotificationSettingsSwiftUIViewModel: RoomNotificationSettingsViewModel, ObservableObject { @Published var viewState: RoomNotificationSettingsViewState diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift b/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift index a3fa803e2..d21962bf5 100644 --- a/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/PollEditForm/Coordinator/PollEditFormCoordinator.swift @@ -41,7 +41,6 @@ final class PollEditFormCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: PollEditFormCoordinatorParameters) { self.parameters = parameters diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormScreenState.swift b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormScreenState.swift index 8d6720340..3d15e3be4 100644 --- a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormScreenState.swift +++ b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormScreenState.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) enum MockPollEditFormScreenState: MockScreenState, CaseIterable { case standard diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift index ec6ca5e09..6b22edc50 100644 --- a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift +++ b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift @@ -22,11 +22,9 @@ struct PollEditFormViewModelParameters { let pollDetails: EditFormPollDetails } -@available(iOS 14, *) typealias PollEditFormViewModelType = StateStoreViewModel -@available(iOS 14, *) class PollEditFormViewModel: PollEditFormViewModelType, PollEditFormViewModelProtocol { private struct Constants { diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/Test/UI/PollEditFormUITests.swift b/RiotSwiftUI/Modules/Room/PollEditForm/Test/UI/PollEditFormUITests.swift index 70042a696..2ce4ca26c 100644 --- a/RiotSwiftUI/Modules/Room/PollEditForm/Test/UI/PollEditFormUITests.swift +++ b/RiotSwiftUI/Modules/Room/PollEditForm/Test/UI/PollEditFormUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class PollEditFormUITests: XCTestCase { private var app: XCUIApplication! diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/Test/Unit/PollEditFormViewModelTests.swift b/RiotSwiftUI/Modules/Room/PollEditForm/Test/Unit/PollEditFormViewModelTests.swift index 662f12c1a..4f587a519 100644 --- a/RiotSwiftUI/Modules/Room/PollEditForm/Test/Unit/PollEditFormViewModelTests.swift +++ b/RiotSwiftUI/Modules/Room/PollEditForm/Test/Unit/PollEditFormViewModelTests.swift @@ -19,7 +19,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class PollEditFormViewModelTests: XCTestCase { var viewModel: PollEditFormViewModel! var context: PollEditFormViewModelType.Context! diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift index c92acd3fa..6f8419f28 100644 --- a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift +++ b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct PollEditForm: View { // MARK: - Properties @@ -128,7 +127,6 @@ struct PollEditForm: View { // MARK: - Previews -@available(iOS 14.0, *) struct PollEditForm_Previews: PreviewProvider { static let stateRenderer = MockPollEditFormScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormAnswerOptionView.swift b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormAnswerOptionView.swift index 44e819766..ccae185aa 100644 --- a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormAnswerOptionView.swift +++ b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormAnswerOptionView.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct PollEditFormAnswerOptionView: View { @Environment(\.theme) private var theme: ThemeSwiftUI @@ -48,7 +47,6 @@ struct PollEditFormAnswerOptionView: View { } } -@available(iOS 14.0, *) struct PollEditFormAnswerOptionView_Previews: PreviewProvider { static var previews: some View { VStack(spacing: 32.0) { diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormTypePicker.swift b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormTypePicker.swift index 590587d83..aa8f54289 100644 --- a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormTypePicker.swift +++ b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormTypePicker.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct PollEditFormTypePicker: View { @Environment(\.theme) private var theme: ThemeSwiftUI @@ -33,7 +32,6 @@ struct PollEditFormTypePicker: View { } } -@available(iOS 14.0, *) private struct PollEditFormTypeButton: View { @Environment(\.theme) private var theme: ThemeSwiftUI @@ -87,7 +85,6 @@ private struct PollEditFormTypeButton: View { } } -@available(iOS 14.0, *) struct PollEditFormTypePicker_Previews: PreviewProvider { static var previews: some View { VStack { diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/Coordinator/RoomAccessCoordinator.swift b/RiotSwiftUI/Modules/Room/RoomAccess/Coordinator/RoomAccessCoordinator.swift index ecf49b173..5ca4563dc 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/Coordinator/RoomAccessCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/Coordinator/RoomAccessCoordinator.swift @@ -25,7 +25,6 @@ enum RoomAccessCoordinatorCoordinatorAction { } @objcMembers -@available(iOS 14.0, *) final class RoomAccessCoordinator: Coordinator { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/Coordinator/RoomAccessCoordinatorBridgePresenter.swift b/RiotSwiftUI/Modules/Room/RoomAccess/Coordinator/RoomAccessCoordinatorBridgePresenter.swift index cf103a702..78a3215ba 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/Coordinator/RoomAccessCoordinatorBridgePresenter.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/Coordinator/RoomAccessCoordinatorBridgePresenter.swift @@ -16,7 +16,6 @@ import UIKit import MatrixSDK -@available(iOS 14.0, *) @objc protocol RoomAccessCoordinatorBridgePresenterDelegate { func roomAccessCoordinatorBridgePresenterDelegate(_ coordinatorBridgePresenter: RoomAccessCoordinatorBridgePresenter, didCancelRoomWithId roomId: String) func roomAccessCoordinatorBridgePresenterDelegate(_ coordinatorBridgePresenter: RoomAccessCoordinatorBridgePresenter, didCompleteRoomWithId roomId: String) @@ -27,7 +26,6 @@ import MatrixSDK /// It breaks the Coordinator abstraction and it has been introduced for Objective-C compatibility (mainly for integration in legacy view controllers). /// Each bridge should be removed once the underlying Coordinator has been integrated by another Coordinator. @objcMembers -@available(iOS 14.0, *) final class RoomAccessCoordinatorBridgePresenter: NSObject { // MARK: - Properties @@ -99,7 +97,6 @@ final class RoomAccessCoordinatorBridgePresenter: NSObject { // MARK: - UIAdaptivePresentationControllerDelegate -@available(iOS 14.0, *) extension RoomAccessCoordinatorBridgePresenter: UIAdaptivePresentationControllerDelegate { func roomNotificationSettingsCoordinatorDidComplete(_ presentationController: UIPresentationController) { diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Coordinator/RoomAccessTypeChooserCoordinator.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Coordinator/RoomAccessTypeChooserCoordinator.swift index c88bcd26d..a46542a42 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Coordinator/RoomAccessTypeChooserCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Coordinator/RoomAccessTypeChooserCoordinator.swift @@ -40,7 +40,6 @@ final class RoomAccessTypeChooserCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: RoomAccessTypeChooserCoordinatorParameters) { self.parameters = parameters let viewModel = RoomAccessTypeChooserViewModel(roomAccessTypeChooserService: RoomAccessTypeChooserService(roomId: parameters.roomId, allowsRoomUpgrade: parameters.allowsRoomUpgrade, session: parameters.session)) diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/MockRoomAccessTypeChooserScreenState.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/MockRoomAccessTypeChooserScreenState.swift index 414f4893b..47037d07f 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/MockRoomAccessTypeChooserScreenState.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/MockRoomAccessTypeChooserScreenState.swift @@ -20,7 +20,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockRoomAccessTypeChooserScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/RoomAccessTypeChooserViewModel.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/RoomAccessTypeChooserViewModel.swift index 057386298..7b97bd753 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/RoomAccessTypeChooserViewModel.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/RoomAccessTypeChooserViewModel.swift @@ -17,11 +17,9 @@ import SwiftUI import Combine -@available(iOS 14, *) typealias RoomAccessTypeChooserViewModelType = StateStoreViewModel -@available(iOS 14.0, *) class RoomAccessTypeChooserViewModel: RoomAccessTypeChooserViewModelType, RoomAccessTypeChooserViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/RoomAccessTypeChooserViewModelProtocol.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/RoomAccessTypeChooserViewModelProtocol.swift index 4dd2d43ad..92b0b430a 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/RoomAccessTypeChooserViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/RoomAccessTypeChooserViewModelProtocol.swift @@ -18,7 +18,6 @@ import Foundation protocol RoomAccessTypeChooserViewModelProtocol { var callback: ((RoomAccessTypeChooserViewModelAction) -> Void)? { get set } - @available(iOS 14, *) var context: RoomAccessTypeChooserViewModelType.Context { get } func handleRoomUpgradeResult(_ result: RoomUpgradeCoordinatorResult) diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/MatrixSDK/RoomAccessTypeChooserService.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/MatrixSDK/RoomAccessTypeChooserService.swift index 2fbc4fdba..dd16c54e4 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/MatrixSDK/RoomAccessTypeChooserService.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/MatrixSDK/RoomAccessTypeChooserService.swift @@ -18,7 +18,6 @@ import Foundation import Combine import MatrixSDK -@available(iOS 14.0, *) class RoomAccessTypeChooserService: RoomAccessTypeChooserServiceProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/Mock/MockRoomAccessTypeChooserService.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/Mock/MockRoomAccessTypeChooserService.swift index 5533c3a13..5bd115685 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/Mock/MockRoomAccessTypeChooserService.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/Mock/MockRoomAccessTypeChooserService.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class MockRoomAccessTypeChooserService: RoomAccessTypeChooserServiceProtocol { static let mockAccessItems: [RoomAccessTypeChooserAccessItem] = [ diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/RoomAccessTypeChooserServiceProtocol.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/RoomAccessTypeChooserServiceProtocol.swift index a246862e2..b96bb2ad0 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/RoomAccessTypeChooserServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Service/RoomAccessTypeChooserServiceProtocol.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) protocol RoomAccessTypeChooserServiceProtocol { var accessItemsSubject: CurrentValueSubject<[RoomAccessTypeChooserAccessItem], Never> { get } var roomUpgradeRequiredSubject: CurrentValueSubject { get } diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Test/UI/RoomAccessTypeChooserUITests.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Test/UI/RoomAccessTypeChooserUITests.swift index 628d50ccb..0e51a82d4 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Test/UI/RoomAccessTypeChooserUITests.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Test/UI/RoomAccessTypeChooserUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class RoomAccessTypeChooserUITests: MockScreenTest { // Tests to be implemented. } diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Test/Unit/RoomAccessTypeChooserViewModelTests.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Test/Unit/RoomAccessTypeChooserViewModelTests.swift index 014450429..7eda5de05 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Test/Unit/RoomAccessTypeChooserViewModelTests.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/Test/Unit/RoomAccessTypeChooserViewModelTests.swift @@ -19,7 +19,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class RoomAccessTypeChooserViewModelTests: XCTestCase { } diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/View/RoomAccessTypeChooser.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/View/RoomAccessTypeChooser.swift index d77b1ac59..9786273d3 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/View/RoomAccessTypeChooser.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/View/RoomAccessTypeChooser.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct RoomAccessTypeChooser: View { // MARK: - Properties @@ -84,7 +83,6 @@ struct RoomAccessTypeChooser: View { // MARK: - Previews -@available(iOS 14.0, *) struct RoomAccessTypeChooser_Previews: PreviewProvider { static let stateRenderer = MockRoomAccessTypeChooserScreenState.stateRenderer diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/View/RoomAccessTypeChooserRow.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/View/RoomAccessTypeChooserRow.swift index 66b9b68e5..a38cd0efe 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/View/RoomAccessTypeChooserRow.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomAccessTypeChooser/View/RoomAccessTypeChooserRow.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct RoomAccessTypeChooserRow: View { // MARK: - Properties @@ -70,7 +69,6 @@ struct RoomAccessTypeChooserRow: View { // MARK: - Previews -@available(iOS 14.0, *) struct RoomAccessTypeChooserRow_Previews: PreviewProvider { static var previews: some View { VStack { diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomRestrictedAccessSpaceChooser/Coordinator/RoomRestrictedAccessSpaceChooserViewProvider.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomRestrictedAccessSpaceChooser/Coordinator/RoomRestrictedAccessSpaceChooserViewProvider.swift index 0d4d6f80f..389716a8f 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomRestrictedAccessSpaceChooser/Coordinator/RoomRestrictedAccessSpaceChooserViewProvider.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomRestrictedAccessSpaceChooser/Coordinator/RoomRestrictedAccessSpaceChooserViewProvider.swift @@ -24,7 +24,6 @@ class RoomRestrictedAccessSpaceChooserViewProvider: MatrixItemChooserCoordinator self.navTitle = navTitle } - @available(iOS 14, *) func view(with viewModel: MatrixItemChooserViewModelType.Context) -> AnyView { return AnyView(RoomRestrictedAccessSpaceChooserSelector(viewModel: viewModel, navTitle: navTitle)) } diff --git a/RiotSwiftUI/Modules/Room/RoomAccess/RoomRestrictedAccessSpaceChooser/View/RoomRestrictedAccessSpaceChooserSelector.swift b/RiotSwiftUI/Modules/Room/RoomAccess/RoomRestrictedAccessSpaceChooser/View/RoomRestrictedAccessSpaceChooserSelector.swift index d6c00643d..3b52c9e41 100644 --- a/RiotSwiftUI/Modules/Room/RoomAccess/RoomRestrictedAccessSpaceChooser/View/RoomRestrictedAccessSpaceChooserSelector.swift +++ b/RiotSwiftUI/Modules/Room/RoomAccess/RoomRestrictedAccessSpaceChooser/View/RoomRestrictedAccessSpaceChooserSelector.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct RoomRestrictedAccessSpaceChooserSelector: View { // MARK: Properties diff --git a/RiotSwiftUI/Modules/Room/RoomSuggestion/Coordinator/RoomSuggestionCoordinator.swift b/RiotSwiftUI/Modules/Room/RoomSuggestion/Coordinator/RoomSuggestionCoordinator.swift index 560f5a618..ffdfc5e3f 100644 --- a/RiotSwiftUI/Modules/Room/RoomSuggestion/Coordinator/RoomSuggestionCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/RoomSuggestion/Coordinator/RoomSuggestionCoordinator.swift @@ -23,7 +23,6 @@ enum RoomSuggestionCoordinatorCoordinatorAction { } @objcMembers -@available(iOS 14.0, *) final class RoomSuggestionCoordinator: Coordinator { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/RoomSuggestion/Coordinator/RoomSuggestionCoordinatorBridgePresenter.swift b/RiotSwiftUI/Modules/Room/RoomSuggestion/Coordinator/RoomSuggestionCoordinatorBridgePresenter.swift index f3b4132d3..a6bfa2ee5 100644 --- a/RiotSwiftUI/Modules/Room/RoomSuggestion/Coordinator/RoomSuggestionCoordinatorBridgePresenter.swift +++ b/RiotSwiftUI/Modules/Room/RoomSuggestion/Coordinator/RoomSuggestionCoordinatorBridgePresenter.swift @@ -15,7 +15,6 @@ // import UIKit -@available(iOS 14.0, *) @objc protocol RoomSuggestionCoordinatorBridgePresenterDelegate { func roomSuggestionCoordinatorBridgePresenterDelegateDidCancel(_ coordinatorBridgePresenter: RoomSuggestionCoordinatorBridgePresenter) func roomSuggestionCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: RoomSuggestionCoordinatorBridgePresenter) @@ -26,7 +25,6 @@ import UIKit /// It breaks the Coordinator abstraction and it has been introduced for Objective-C compatibility (mainly for integration in legacy view controllers). /// Each bridge should be removed once the underlying Coordinator has been integrated by another Coordinator. @objcMembers -@available(iOS 14.0, *) final class RoomSuggestionCoordinatorBridgePresenter: NSObject { // MARK: - Properties @@ -87,7 +85,6 @@ final class RoomSuggestionCoordinatorBridgePresenter: NSObject { // MARK: - UIAdaptivePresentationControllerDelegate -@available(iOS 14.0, *) extension RoomSuggestionCoordinatorBridgePresenter: UIAdaptivePresentationControllerDelegate { func roomNotificationSettingsCoordinatorDidComplete(_ presentationController: UIPresentationController) { diff --git a/RiotSwiftUI/Modules/Room/RoomSuggestion/RoomSuggestionSpaceChooser/Coordinator/RoomSuggestionSpaceChooserViewProvider.swift b/RiotSwiftUI/Modules/Room/RoomSuggestion/RoomSuggestionSpaceChooser/Coordinator/RoomSuggestionSpaceChooserViewProvider.swift index 2e2a2343d..a5b261fd0 100644 --- a/RiotSwiftUI/Modules/Room/RoomSuggestion/RoomSuggestionSpaceChooser/Coordinator/RoomSuggestionSpaceChooserViewProvider.swift +++ b/RiotSwiftUI/Modules/Room/RoomSuggestion/RoomSuggestionSpaceChooser/Coordinator/RoomSuggestionSpaceChooserViewProvider.swift @@ -24,7 +24,6 @@ class RoomSuggestionSpaceChooserViewProvider: MatrixItemChooserCoordinatorViewPr self.navTitle = navTitle } - @available(iOS 14, *) func view(with viewModel: MatrixItemChooserViewModelType.Context) -> AnyView { return AnyView(RoomSuggestionSpaceChooserSelector(viewModel: viewModel, navTitle: navTitle)) } diff --git a/RiotSwiftUI/Modules/Room/RoomSuggestion/RoomSuggestionSpaceChooser/View/RoomSuggestionSpaceChooserSelector.swift b/RiotSwiftUI/Modules/Room/RoomSuggestion/RoomSuggestionSpaceChooser/View/RoomSuggestionSpaceChooserSelector.swift index bacf1ccfd..d0c1e4e28 100644 --- a/RiotSwiftUI/Modules/Room/RoomSuggestion/RoomSuggestionSpaceChooser/View/RoomSuggestionSpaceChooserSelector.swift +++ b/RiotSwiftUI/Modules/Room/RoomSuggestion/RoomSuggestionSpaceChooser/View/RoomSuggestionSpaceChooserSelector.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct RoomSuggestionSpaceChooserSelector: View { // MARK: Properties diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/Coordinator/RoomUpgradeCoordinator.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/Coordinator/RoomUpgradeCoordinator.swift index 93d49dc9e..fec7cd3e0 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/Coordinator/RoomUpgradeCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/Coordinator/RoomUpgradeCoordinator.swift @@ -42,7 +42,6 @@ final class RoomUpgradeCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: RoomUpgradeCoordinatorParameters) { self.parameters = parameters let viewModel = RoomUpgradeViewModel.makeRoomUpgradeViewModel(roomUpgradeService: RoomUpgradeService(session: parameters.session, roomId: parameters.roomId, parentSpaceId: parameters.parentSpaceId, versionOverride: parameters.versionOverride)) diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/MockRoomUpgradeScreenState.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/MockRoomUpgradeScreenState.swift index 658e7d8e7..0052fd05b 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/MockRoomUpgradeScreenState.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/MockRoomUpgradeScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockRoomUpgradeScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeViewModel.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeViewModel.swift index c02a29a12..4a8b876d2 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeViewModel.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeViewModel.swift @@ -17,11 +17,9 @@ import SwiftUI import Combine -@available(iOS 14, *) typealias RoomUpgradeViewModelType = StateStoreViewModel -@available(iOS 14, *) class RoomUpgradeViewModel: RoomUpgradeViewModelType, RoomUpgradeViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeViewModelProtocol.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeViewModelProtocol.swift index 88607384e..eb6136d1d 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/RoomUpgradeViewModelProtocol.swift @@ -19,8 +19,6 @@ import Foundation protocol RoomUpgradeViewModelProtocol { var completion: ((RoomUpgradeViewModelResult) -> Void)? { get set } - @available(iOS 14, *) static func makeRoomUpgradeViewModel(roomUpgradeService: RoomUpgradeServiceProtocol) -> RoomUpgradeViewModelProtocol - @available(iOS 14, *) var context: RoomUpgradeViewModelType.Context { get } } diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/MatrixSDK/RoomUpgradeService.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/MatrixSDK/RoomUpgradeService.swift index 1e418e397..02d9b5b9f 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/MatrixSDK/RoomUpgradeService.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/MatrixSDK/RoomUpgradeService.swift @@ -18,7 +18,6 @@ import Foundation import Combine import MatrixSDK -@available(iOS 14.0, *) class RoomUpgradeService: RoomUpgradeServiceProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/Mock/MockRoomUpgradeService.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/Mock/MockRoomUpgradeService.swift index 3e102d8bf..a31619875 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/Mock/MockRoomUpgradeService.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/Mock/MockRoomUpgradeService.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class MockRoomUpgradeService: RoomUpgradeServiceProtocol { var currentRoomId: String = "!sfdlksjdflkfjds:matrix.org" diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/RoomUpgradeServiceProtocol.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/RoomUpgradeServiceProtocol.swift index 4295b5869..49cba3100 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/RoomUpgradeServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/Service/RoomUpgradeServiceProtocol.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) protocol RoomUpgradeServiceProtocol { var currentRoomId: String { get } var parentSpaceName: String? { get } diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/Test/UI/RoomUpgradeUITests.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/Test/UI/RoomUpgradeUITests.swift index e0e61b67e..e78261aea 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/Test/UI/RoomUpgradeUITests.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/Test/UI/RoomUpgradeUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class RoomUpgradeUITests: MockScreenTest { // Tests to be implemented. } diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/Test/Unit/RoomUpgradeViewModelTests.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/Test/Unit/RoomUpgradeViewModelTests.swift index da972e25c..41cf7f572 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/Test/Unit/RoomUpgradeViewModelTests.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/Test/Unit/RoomUpgradeViewModelTests.swift @@ -19,7 +19,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class RoomUpgradeViewModelTests: XCTestCase { var service: MockRoomUpgradeService! var viewModel: RoomUpgradeViewModelProtocol! diff --git a/RiotSwiftUI/Modules/Room/RoomUpgrade/View/RoomUpgrade.swift b/RiotSwiftUI/Modules/Room/RoomUpgrade/View/RoomUpgrade.swift index 33e8ffb4e..83eb51991 100644 --- a/RiotSwiftUI/Modules/Room/RoomUpgrade/View/RoomUpgrade.swift +++ b/RiotSwiftUI/Modules/Room/RoomUpgrade/View/RoomUpgrade.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct RoomUpgrade: View { // MARK: - Properties @@ -102,7 +101,6 @@ struct RoomUpgrade: View { // MARK: - Previews -@available(iOS 14.0, *) struct RoomUpgrade_Previews: PreviewProvider { static let stateRenderer = MockRoomUpgradeScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Coordinator/StaticLocationViewingCoordinator.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Coordinator/StaticLocationViewingCoordinator.swift index cf241f85a..81a376bb0 100644 --- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Coordinator/StaticLocationViewingCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Coordinator/StaticLocationViewingCoordinator.swift @@ -46,7 +46,6 @@ final class StaticLocationViewingCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: StaticLocationViewingCoordinatorParameters) { self.parameters = parameters diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/MockStaticLocationViewingScreenState.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/MockStaticLocationViewingScreenState.swift index cbdf185b6..800057980 100644 --- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/MockStaticLocationViewingScreenState.swift +++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/MockStaticLocationViewingScreenState.swift @@ -20,7 +20,6 @@ import CoreLocation /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockStaticLocationViewingScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingModels.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingModels.swift index 94607f8c9..f51c26c63 100644 --- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingModels.swift +++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingModels.swift @@ -32,7 +32,6 @@ enum StaticLocationViewingViewModelResult { // MARK: View -@available(iOS 14, *) struct StaticLocationViewingViewState: BindableState { /// Map style URL diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingViewModel.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingViewModel.swift index 508aa6631..8564596a1 100644 --- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingViewModel.swift +++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingViewModel.swift @@ -17,11 +17,9 @@ import SwiftUI import CoreLocation -@available(iOS 14, *) typealias StaticLocationViewingViewModelType = StateStoreViewModel -@available(iOS 14, *) class StaticLocationViewingViewModel: StaticLocationViewingViewModelType, StaticLocationViewingViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingViewModelProtocol.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingViewModelProtocol.swift index 143dbe38d..7835e5c4e 100644 --- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingViewModelProtocol.swift @@ -19,6 +19,5 @@ import Foundation protocol StaticLocationViewingViewModelProtocol { var completion: ((StaticLocationViewingViewModelResult) -> Void)? { get set } - @available(iOS 14, *) var context: StaticLocationViewingViewModelType.Context { get } } diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Test/UI/StaticLocationViewingUITests.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Test/UI/StaticLocationViewingUITests.swift index e2338dfbb..d459b6df3 100644 --- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Test/UI/StaticLocationViewingUITests.swift +++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Test/UI/StaticLocationViewingUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class StaticLocationViewingUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Test/Unit/StaticLocationViewingViewModelTests.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Test/Unit/StaticLocationViewingViewModelTests.swift index 478c6639a..22ce395a7 100644 --- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Test/Unit/StaticLocationViewingViewModelTests.swift +++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Test/Unit/StaticLocationViewingViewModelTests.swift @@ -20,7 +20,6 @@ import CoreLocation @testable import RiotSwiftUI -@available(iOS 14.0, *) class StaticLocationViewingViewModelTests: XCTestCase { var cancellables = Set() diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/View/StaticLocationView.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/View/StaticLocationView.swift index a217d3afc..7436aa5e8 100644 --- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/View/StaticLocationView.swift +++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/View/StaticLocationView.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct StaticLocationView: View { // MARK: - Properties @@ -89,7 +88,6 @@ struct StaticLocationView: View { // MARK: - Previews -@available(iOS 14.0, *) struct StaticLocationSharingViewer_Previews: PreviewProvider { static let stateRenderer = MockStaticLocationViewingScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift index 699cfec60..aac912d9c 100644 --- a/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift @@ -24,7 +24,6 @@ struct TimelinePollCoordinatorParameters { let pollStartEvent: MXEvent } -@available(iOS 14.0, *) final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDelegate { // MARK: - Properties @@ -45,7 +44,6 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel // MARK: - Setup - @available(iOS 14.0, *) init(parameters: TimelinePollCoordinatorParameters) throws { self.parameters = parameters diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollProvider.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollProvider.swift index 0fa488ebd..d40e86757 100644 --- a/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollProvider.swift +++ b/RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollProvider.swift @@ -16,7 +16,6 @@ import Foundation -@available(iOS 14, *) class TimelinePollProvider { static let shared = TimelinePollProvider() diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/Test/UI/TimelinePollUITests.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/Test/UI/TimelinePollUITests.swift index 9c4efe9c1..0cf4d5071 100644 --- a/RiotSwiftUI/Modules/Room/TimelinePoll/Test/UI/TimelinePollUITests.swift +++ b/RiotSwiftUI/Modules/Room/TimelinePoll/Test/UI/TimelinePollUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class TimelinePollUITests: XCTestCase { private var app: XCUIApplication! diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/Test/Unit/TimelinePollViewModelTests.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/Test/Unit/TimelinePollViewModelTests.swift index 3f3216356..247f35b0d 100644 --- a/RiotSwiftUI/Modules/Room/TimelinePoll/Test/Unit/TimelinePollViewModelTests.swift +++ b/RiotSwiftUI/Modules/Room/TimelinePoll/Test/Unit/TimelinePollViewModelTests.swift @@ -19,7 +19,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class TimelinePollViewModelTests: XCTestCase { var viewModel: TimelinePollViewModel! var context: TimelinePollViewModelType.Context! diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollScreenState.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollScreenState.swift index 3fe93f8b8..0ac107a6e 100644 --- a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollScreenState.swift +++ b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollScreenState.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) enum MockTimelinePollScreenState: MockScreenState, CaseIterable { case openDisclosed case closedDisclosed diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModel.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModel.swift index 69d7894a1..99d15980c 100644 --- a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModel.swift +++ b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModel.swift @@ -17,11 +17,9 @@ import SwiftUI import Combine -@available(iOS 14, *) typealias TimelinePollViewModelType = StateStoreViewModel -@available(iOS 14, *) class TimelinePollViewModel: TimelinePollViewModelType, TimelinePollViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModelProtocol.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModelProtocol.swift index adaf6ad15..7bd9184eb 100644 --- a/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Room/TimelinePoll/TimelinePollViewModelProtocol.swift @@ -17,7 +17,6 @@ import Foundation protocol TimelinePollViewModelProtocol { - @available(iOS 14, *) var context: TimelinePollViewModelType.Context { get } var completion: ((TimelinePollViewModelResult) -> Void)? { get set } diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollAnswerOptionButton.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollAnswerOptionButton.swift index 7cd02911d..5a3498aa9 100644 --- a/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollAnswerOptionButton.swift +++ b/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollAnswerOptionButton.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct TimelinePollAnswerOptionButton: View { // MARK: - Properties @@ -97,7 +96,6 @@ struct TimelinePollAnswerOptionButton: View { } } -@available(iOS 14.0, *) struct TimelinePollAnswerOptionButton_Previews: PreviewProvider { static let stateRenderer = MockTimelinePollScreenState.stateRenderer diff --git a/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollView.swift b/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollView.swift index afe687536..0b2cf80e8 100644 --- a/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollView.swift +++ b/RiotSwiftUI/Modules/Room/TimelinePoll/View/TimelinePollView.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct TimelinePollView: View { // MARK: - Properties @@ -94,7 +93,6 @@ struct TimelinePollView: View { // MARK: - Previews -@available(iOS 14.0, *) struct TimelinePollView_Previews: PreviewProvider { static let stateRenderer = MockTimelinePollScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/Coordinator/UserSuggestionCoordinator.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/Coordinator/UserSuggestionCoordinator.swift index 2c08b20a9..9b861df59 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/Coordinator/UserSuggestionCoordinator.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/Coordinator/UserSuggestionCoordinator.swift @@ -18,7 +18,6 @@ import Foundation import UIKit import SwiftUI -@available(iOS 14.0, *) protocol UserSuggestionCoordinatorDelegate: AnyObject { func userSuggestionCoordinator(_ coordinator: UserSuggestionCoordinator, didRequestMentionForMember member: MXRoomMember, textTrigger: String?) } @@ -28,7 +27,6 @@ struct UserSuggestionCoordinatorParameters { let room: MXRoom } -@available(iOS 14.0, *) final class UserSuggestionCoordinator: Coordinator, Presentable { // MARK: - Properties @@ -52,7 +50,6 @@ final class UserSuggestionCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: UserSuggestionCoordinatorParameters) { self.parameters = parameters diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/Coordinator/UserSuggestionCoordinatorBridge.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/Coordinator/UserSuggestionCoordinatorBridge.swift index 0760670a3..04b78e69c 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/Coordinator/UserSuggestionCoordinatorBridge.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/Coordinator/UserSuggestionCoordinatorBridge.swift @@ -25,7 +25,6 @@ protocol UserSuggestionCoordinatorBridgeDelegate: AnyObject { final class UserSuggestionCoordinatorBridge: NSObject { private var _userSuggestionCoordinator: Any? = nil - @available(iOS 14.0, *) fileprivate var userSuggestionCoordinator: UserSuggestionCoordinator { return _userSuggestionCoordinator as! UserSuggestionCoordinator } @@ -61,7 +60,6 @@ final class UserSuggestionCoordinatorBridge: NSObject { } } -@available(iOS 14.0, *) extension UserSuggestionCoordinatorBridge: UserSuggestionCoordinatorDelegate { func userSuggestionCoordinator(_ coordinator: UserSuggestionCoordinator, didRequestMentionForMember member: MXRoomMember, textTrigger: String?) { delegate?.userSuggestionCoordinatorBridge(self, didRequestMentionForMember: member, textTrigger: textTrigger) diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionService.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionService.swift index 5ac56294f..cb135532f 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionService.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionService.swift @@ -33,7 +33,6 @@ struct UserSuggestionServiceItem: UserSuggestionItemProtocol { let avatarUrl: String? } -@available(iOS 14.0, *) class UserSuggestionService: UserSuggestionServiceProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionServiceProtocol.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionServiceProtocol.swift index d7be97eb4..e1ee70a9c 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/Service/UserSuggestionServiceProtocol.swift @@ -23,7 +23,6 @@ protocol UserSuggestionItemProtocol: Avatarable { var avatarUrl: String? { get } } -@available(iOS 14.0, *) protocol UserSuggestionServiceProtocol { var items: CurrentValueSubject<[UserSuggestionItemProtocol], Never> { get } diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/Test/UI/UserSuggestionUITests.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/Test/UI/UserSuggestionUITests.swift index af864f6a7..8b5af53c0 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/Test/UI/UserSuggestionUITests.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/Test/UI/UserSuggestionUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class UserSuggestionUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/Test/Unit/UserSuggestionServiceTests.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/Test/Unit/UserSuggestionServiceTests.swift index a8eaf6e45..552eb4939 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/Test/Unit/UserSuggestionServiceTests.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/Test/Unit/UserSuggestionServiceTests.swift @@ -19,7 +19,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class UserSuggestionServiceTests: XCTestCase { var service: UserSuggestionService? @@ -106,7 +105,6 @@ class UserSuggestionServiceTests: XCTestCase { } } -@available(iOS 14.0, *) extension UserSuggestionServiceTests: RoomMembersProviderProtocol { func fetchMembers(_ members: @escaping ([RoomMembersProviderMember]) -> Void) { diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/UserSuggestionScreenState.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/UserSuggestionScreenState.swift index 9c290f6ae..f1b6999f3 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/UserSuggestionScreenState.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/UserSuggestionScreenState.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) enum MockUserSuggestionScreenState: MockScreenState, CaseIterable { case multipleResults @@ -43,7 +42,6 @@ enum MockUserSuggestionScreenState: MockScreenState, CaseIterable { } } -@available(iOS 14.0, *) extension MockUserSuggestionScreenState: RoomMembersProviderProtocol { func fetchMembers(_ members: ([RoomMembersProviderMember]) -> Void) { if Self.members == nil { diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/UserSuggestionViewModel.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/UserSuggestionViewModel.swift index da4e3fbad..8e4e6202e 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/UserSuggestionViewModel.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/UserSuggestionViewModel.swift @@ -17,12 +17,10 @@ import SwiftUI import Combine -@available(iOS 14.0, *) typealias UserSuggestionViewModelType = StateStoreViewModel -@available(iOS 14.0, *) class UserSuggestionViewModel: UserSuggestionViewModelType, UserSuggestionViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionList.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionList.swift index 4063e75a9..9fc137833 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionList.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionList.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct UserSuggestionList: View { private struct Constants { static let topPadding: CGFloat = 8.0 @@ -76,7 +75,6 @@ struct UserSuggestionList: View { } } -@available(iOS 14.0, *) private struct BackgroundView: View { var content: () -> Content @@ -100,7 +98,6 @@ private struct BackgroundView: View { // MARK: - Previews -@available(iOS 14.0, *) struct UserSuggestion_Previews: PreviewProvider { static let stateRenderer = MockUserSuggestionScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionListItem.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionListItem.swift index dd9068fdc..c5ade662b 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionListItem.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionListItem.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct UserSuggestionListItem: View { // MARK: - Properties @@ -52,7 +51,6 @@ struct UserSuggestionListItem: View { // MARK: - Previews -@available(iOS 14.0, *) struct UserSuggestionHeader_Previews: PreviewProvider { static var previews: some View { UserSuggestionListItem(avatar: MockAvatarInput.example, displayName: "Alice", userId: "@alice:matrix.org") diff --git a/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionListWithInput.swift b/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionListWithInput.swift index 6f26c19ee..cba0fae13 100644 --- a/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionListWithInput.swift +++ b/RiotSwiftUI/Modules/Room/UserSuggestion/View/UserSuggestionListWithInput.swift @@ -16,13 +16,11 @@ import SwiftUI -@available(iOS 14.0, *) struct UserSuggestionListWithInputViewModel { let listViewModel: UserSuggestionViewModel let callback: (String)->() } -@available(iOS 14.0, *) struct UserSuggestionListWithInput: View { // MARK: - Properties @@ -51,7 +49,6 @@ struct UserSuggestionListWithInput: View { // MARK: - Previews -@available(iOS 14.0, *) struct UserSuggestionListWithInput_Previews: PreviewProvider { static let stateRenderer = MockUserSuggestionScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Settings/ChangePassword/MockChangePasswordScreenState.swift b/RiotSwiftUI/Modules/Settings/ChangePassword/MockChangePasswordScreenState.swift index 2e28720aa..e4d109f23 100644 --- a/RiotSwiftUI/Modules/Settings/ChangePassword/MockChangePasswordScreenState.swift +++ b/RiotSwiftUI/Modules/Settings/ChangePassword/MockChangePasswordScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockChangePasswordScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsBridgePresenter.swift b/RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsBridgePresenter.swift index 76d83ebcb..f8a008b90 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsBridgePresenter.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsBridgePresenter.swift @@ -15,7 +15,6 @@ // import Foundation -@available(iOS 14.0, *) @objc protocol NotificationSettingsCoordinatorBridgePresenterDelegate { func notificationSettingsCoordinatorBridgePresenterDelegateDidComplete(_ coordinatorBridgePresenter: NotificationSettingsCoordinatorBridgePresenter) } @@ -24,7 +23,6 @@ import Foundation /// This bridge is used while waiting for global usage of coordinator pattern. /// It breaks the Coordinator abstraction and it has been introduced for Objective-C compatibility (mainly for integration in legacy view controllers). /// Each bridge should be removed once the underlying Coordinator has been integrated by another Coordinator. -@available(iOS 14.0, *) @objcMembers final class NotificationSettingsCoordinatorBridgePresenter: NSObject { @@ -82,7 +80,6 @@ final class NotificationSettingsCoordinatorBridgePresenter: NSObject { } // MARK: - NotificationSettingsCoordinatorDelegate -@available(iOS 14.0, *) extension NotificationSettingsCoordinatorBridgePresenter: NotificationSettingsCoordinatorDelegate { func notificationSettingsCoordinatorDidComplete(_ coordinator: NotificationSettingsCoordinatorType) { self.delegate?.notificationSettingsCoordinatorBridgePresenterDelegateDidComplete(self) @@ -91,7 +88,6 @@ extension NotificationSettingsCoordinatorBridgePresenter: NotificationSettingsCo // MARK: - UIAdaptivePresentationControllerDelegate -@available(iOS 14.0, *) extension NotificationSettingsCoordinatorBridgePresenter: UIAdaptivePresentationControllerDelegate { func notificationSettingsCoordinatorDidComplete(_ presentationController: UIPresentationController) { diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsCoordinator.swift b/RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsCoordinator.swift index eeb9e0b00..b903bb103 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsCoordinator.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/Coordinator/NotificationSettingsCoordinator.swift @@ -17,7 +17,6 @@ import Foundation import SwiftUI -@available(iOS 14.0, *) final class NotificationSettingsCoordinator: NotificationSettingsCoordinatorType { // MARK: - Properties @@ -66,7 +65,6 @@ final class NotificationSettingsCoordinator: NotificationSettingsCoordinatorType } // MARK: - NotificationSettingsViewModelCoordinatorDelegate -@available(iOS 14.0, *) extension NotificationSettingsCoordinator: NotificationSettingsViewModelCoordinatorDelegate { func notificationSettingsViewModelDidComplete(_ viewModel: NotificationSettingsViewModelType) { self.delegate?.notificationSettingsCoordinatorDidComplete(self) diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Service/MatrixSDK/MXNotificationSettingsService.swift b/RiotSwiftUI/Modules/Settings/Notifications/Service/MatrixSDK/MXNotificationSettingsService.swift index a1269c9e8..e7ac7a191 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/Service/MatrixSDK/MXNotificationSettingsService.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/Service/MatrixSDK/MXNotificationSettingsService.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class MXNotificationSettingsService: NotificationSettingsServiceType { private let session: MXSession diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Service/Mock/MockNotificationSettingsService.swift b/RiotSwiftUI/Modules/Settings/Notifications/Service/Mock/MockNotificationSettingsService.swift index e4ed43036..a7faceb52 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/Service/Mock/MockNotificationSettingsService.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/Service/Mock/MockNotificationSettingsService.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class MockNotificationSettingsService: NotificationSettingsServiceType, ObservableObject { static let example = MockNotificationSettingsService() diff --git a/RiotSwiftUI/Modules/Settings/Notifications/Service/NotificationSettingsServiceType.swift b/RiotSwiftUI/Modules/Settings/Notifications/Service/NotificationSettingsServiceType.swift index 317cc8253..6b0565ea6 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/Service/NotificationSettingsServiceType.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/Service/NotificationSettingsServiceType.swift @@ -18,7 +18,6 @@ import Foundation import Combine /// A service for changing notification settings and keywords -@available(iOS 14.0, *) protocol NotificationSettingsServiceType { /// Publisher of all push rules. var rulesPublisher: AnyPublisher<[NotificationPushRuleType], Never> { get } diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/Chip.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/Chip.swift index 458293f6c..0c9bfd088 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/View/Chip.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/View/Chip.swift @@ -18,7 +18,6 @@ import SwiftUI /// A single rounded rect chip to be rendered within `Chips` collection -@available(iOS 14.0, *) struct Chip: View { @Environment(\.isEnabled) var isEnabled @@ -62,7 +61,6 @@ struct Chip: View { } } -@available(iOS 14.0, *) struct Chip_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/Chips.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/Chips.swift index 0c3c8bfe7..9b66584d1 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/View/Chips.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/View/Chips.swift @@ -17,7 +17,6 @@ import SwiftUI /// Renders multiple chips in a flow layout. -@available(iOS 14.0, *) struct Chips: View { @State private var frame: CGRect = CGRect.zero @@ -75,7 +74,6 @@ struct Chips: View { } } -@available(iOS 14.0, *) struct Chips_Previews: PreviewProvider { static var chips: [String] = ["Chip1", "Chip2", "Chip3", "Chip4", "Chip5", "Chip6"] static var previews: some View { diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/ChipsInput.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/ChipsInput.swift index 10a82add6..5c62ddd34 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/View/ChipsInput.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/View/ChipsInput.swift @@ -17,7 +17,6 @@ import SwiftUI /// Renders an input field and a collection of chips. -@available(iOS 14.0, *) struct ChipsInput: View { @Environment(\.theme) var theme: ThemeSwiftUI @@ -47,7 +46,6 @@ struct ChipsInput: View { } } -@available(iOS 14.0, *) struct ChipsInput_Previews: PreviewProvider { static var chips = Set(["Website", "Element", "Design", "Matrix/Element"]) static var previews: some View { diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/DefaultNotificationSettings.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/DefaultNotificationSettings.swift index 6973421af..8dd937614 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/View/DefaultNotificationSettings.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/View/DefaultNotificationSettings.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct DefaultNotificationSettings: View { @ObservedObject var viewModel: NotificationSettingsViewModel @@ -28,7 +27,6 @@ struct DefaultNotificationSettings: View { } } -@available(iOS 14.0, *) struct DefaultNotifications_Previews: PreviewProvider { static var previews: some View { NavigationView { diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/FormInputFieldStyle.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/FormInputFieldStyle.swift index 9f7ccf7ff..3b35cd396 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/View/FormInputFieldStyle.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/View/FormInputFieldStyle.swift @@ -18,7 +18,6 @@ import Foundation import SwiftUI /// An input field style for forms. -@available(iOS 14.0, *) struct FormInputFieldStyle: TextFieldStyle { @Environment(\.theme) var theme: ThemeSwiftUI @@ -49,7 +48,6 @@ struct FormInputFieldStyle: TextFieldStyle { } -@available(iOS 14.0, *) struct FormInputFieldStyle_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/MentionsAndKeywordNotificationSettings.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/MentionsAndKeywordNotificationSettings.swift index 82bae5b1d..78a4d733c 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/View/MentionsAndKeywordNotificationSettings.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/View/MentionsAndKeywordNotificationSettings.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct MentionsAndKeywordNotificationSettings: View { @ObservedObject var viewModel: NotificationSettingsViewModel @@ -39,7 +38,6 @@ struct MentionsAndKeywordNotificationSettings: View { } } -@available(iOS 14.0, *) struct MentionsAndKeywords_Previews: PreviewProvider { static var previews: some View { NavigationView { diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettings.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettings.swift index 8a461d07d..6943009ce 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettings.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettings.swift @@ -20,7 +20,6 @@ import SwiftUI /// /// Also renders an optional bottom section. /// Used in the case of keywords, for the keyword chips and input. -@available(iOS 14.0, *) struct NotificationSettings: View { @ObservedObject var viewModel: NotificationSettingsViewModel @@ -45,14 +44,12 @@ struct NotificationSettings: View { } } -@available(iOS 14.0, *) extension NotificationSettings where BottomSection == EmptyView { init(viewModel: NotificationSettingsViewModel) { self.init(viewModel: viewModel, bottomSection: nil) } } -@available(iOS 14.0, *) struct NotificationSettings_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettingsKeywords.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettingsKeywords.swift index 460eed436..6c358f555 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettingsKeywords.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/View/NotificationSettingsKeywords.swift @@ -17,7 +17,6 @@ import SwiftUI /// Renders the keywords input, driven by 'NotificationSettingsViewModel'. -@available(iOS 14.0, *) struct NotificationSettingsKeywords: View { @ObservedObject var viewModel: NotificationSettingsViewModel var body: some View { @@ -32,7 +31,6 @@ struct NotificationSettingsKeywords: View { } } -@available(iOS 14.0, *) struct Keywords_Previews: PreviewProvider { static let viewModel = NotificationSettingsViewModel( notificationSettingsService: MockNotificationSettingsService.example, diff --git a/RiotSwiftUI/Modules/Settings/Notifications/View/OtherNotificationSettings.swift b/RiotSwiftUI/Modules/Settings/Notifications/View/OtherNotificationSettings.swift index e0205b83a..5536a662b 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/View/OtherNotificationSettings.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/View/OtherNotificationSettings.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct OtherNotificationSettings: View { @ObservedObject var viewModel: NotificationSettingsViewModel @@ -27,7 +26,6 @@ struct OtherNotificationSettings: View { } } -@available(iOS 14.0, *) struct OtherNotifications_Previews: PreviewProvider { static var previews: some View { NavigationView { diff --git a/RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift b/RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift index 90b8ac38f..ad1af1014 100644 --- a/RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift +++ b/RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift @@ -20,7 +20,6 @@ import Foundation import Combine import SwiftUI -@available(iOS 14.0, *) final class NotificationSettingsViewModel: NotificationSettingsViewModelType, ObservableObject { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/AddRoomSelector/Coordinator/AddRoomSelectorViewProvider.swift b/RiotSwiftUI/Modules/Spaces/AddRoomSelector/Coordinator/AddRoomSelectorViewProvider.swift index ed0ac3456..c24d5b6ed 100644 --- a/RiotSwiftUI/Modules/Spaces/AddRoomSelector/Coordinator/AddRoomSelectorViewProvider.swift +++ b/RiotSwiftUI/Modules/Spaces/AddRoomSelector/Coordinator/AddRoomSelectorViewProvider.swift @@ -17,7 +17,6 @@ import SwiftUI class AddRoomSelectorViewProvider: MatrixItemChooserCoordinatorViewProvider { - @available(iOS 14, *) func view(with viewModel: MatrixItemChooserViewModelType.Context) -> AnyView { return AnyView(AddRoomSelector(viewModel: viewModel)) } diff --git a/RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift b/RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift index f4468e6c3..adfc48471 100644 --- a/RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift +++ b/RiotSwiftUI/Modules/Spaces/AddRoomSelector/View/AddRoomSelector.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct AddRoomSelector: View { // MARK: Properties diff --git a/RiotSwiftUI/Modules/Spaces/LeaveSpace/Coordinator/LeaveSpaceViewProvider.swift b/RiotSwiftUI/Modules/Spaces/LeaveSpace/Coordinator/LeaveSpaceViewProvider.swift index 63276111c..e1e5df850 100644 --- a/RiotSwiftUI/Modules/Spaces/LeaveSpace/Coordinator/LeaveSpaceViewProvider.swift +++ b/RiotSwiftUI/Modules/Spaces/LeaveSpace/Coordinator/LeaveSpaceViewProvider.swift @@ -24,7 +24,6 @@ class LeaveSpaceViewProvider: MatrixItemChooserCoordinatorViewProvider { self.navTitle = navTitle } - @available(iOS 14, *) func view(with viewModel: MatrixItemChooserViewModelType.Context) -> AnyView { return AnyView(LeaveSpace(viewModel: viewModel, navTitle: navTitle)) } diff --git a/RiotSwiftUI/Modules/Spaces/LeaveSpace/View/LeaveSpace.swift b/RiotSwiftUI/Modules/Spaces/LeaveSpace/View/LeaveSpace.swift index 1cb7bce66..9e3f10f95 100644 --- a/RiotSwiftUI/Modules/Spaces/LeaveSpace/View/LeaveSpace.swift +++ b/RiotSwiftUI/Modules/Spaces/LeaveSpace/View/LeaveSpace.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct LeaveSpace: View { // MARK: Properties diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Coordinator/MatrixItemChooserCoordinator.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Coordinator/MatrixItemChooserCoordinator.swift index 920dc8b66..c8a632ada 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Coordinator/MatrixItemChooserCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Coordinator/MatrixItemChooserCoordinator.swift @@ -18,12 +18,10 @@ import Foundation import UIKit import SwiftUI -@available(iOS 14.0, *) internal protocol MatrixItemChooserCoordinatorViewProvider { func view(with viewModel: MatrixItemChooserViewModelType.Context) -> AnyView } -@available(iOS 14.0, *) struct MatrixItemChooserCoordinatorParameters { let session: MXSession let title: String? @@ -50,7 +48,6 @@ struct MatrixItemChooserCoordinatorParameters { } } -@available(iOS 14.0.0, *) final class MatrixItemChooserCoordinator: Coordinator, Presentable { // MARK: - Properties @@ -69,7 +66,6 @@ final class MatrixItemChooserCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: MatrixItemChooserCoordinatorParameters) { self.parameters = parameters let viewModel = MatrixItemChooserViewModel.makeMatrixItemChooserViewModel(matrixItemChooserService: MatrixItemChooserService(session: parameters.session, selectedItemIds: parameters.selectedItemsIds, itemsProcessor: parameters.itemsProcessor), title: parameters.title, detail: parameters.detail, selectionHeader: parameters.selectionHeader) diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MatrixItemChooserViewModel.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MatrixItemChooserViewModel.swift index e29f81d51..9aa6786c8 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MatrixItemChooserViewModel.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MatrixItemChooserViewModel.swift @@ -17,11 +17,9 @@ import SwiftUI import Combine -@available(iOS 14, *) typealias MatrixItemChooserViewModelType = StateStoreViewModel -@available(iOS 14, *) class MatrixItemChooserViewModel: MatrixItemChooserViewModelType, MatrixItemChooserViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MatrixItemChooserViewModelProtocol.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MatrixItemChooserViewModelProtocol.swift index d6fd3d363..3bf385f7f 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MatrixItemChooserViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MatrixItemChooserViewModelProtocol.swift @@ -19,8 +19,6 @@ import Foundation protocol MatrixItemChooserViewModelProtocol { var completion: ((MatrixItemChooserViewModelResult) -> Void)? { get set } - @available(iOS 14, *) static func makeMatrixItemChooserViewModel(matrixItemChooserService: MatrixItemChooserServiceProtocol, title: String?, detail: String?, selectionHeader: MatrixItemChooserSelectionHeader?) -> MatrixItemChooserViewModelProtocol - @available(iOS 14, *) var context: MatrixItemChooserViewModelType.Context { get } } diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MockMatrixItemChooserScreenState.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MockMatrixItemChooserScreenState.swift index d26ac330b..8b32c9fb5 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MockMatrixItemChooserScreenState.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/MockMatrixItemChooserScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockMatrixItemChooserScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/MatrixItemChooserServiceProtocol.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/MatrixItemChooserServiceProtocol.swift index 4aac468d3..88218ff79 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/MatrixItemChooserServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/MatrixItemChooserServiceProtocol.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) protocol MatrixItemChooserServiceProtocol { var sectionsSubject: CurrentValueSubject<[MatrixListItemSectionData], Never> { get } var selectedItemIdsSubject: CurrentValueSubject, Never> { get } diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/MatrixSDK/MatrixItemChooserService.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/MatrixSDK/MatrixItemChooserService.swift index cc74171b2..22a624413 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/MatrixSDK/MatrixItemChooserService.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/MatrixSDK/MatrixItemChooserService.swift @@ -29,7 +29,6 @@ protocol MatrixItemChooserProcessorProtocol { func isItemIncluded(_ item: (MatrixListItemData)) -> Bool } -@available(iOS 14.0, *) class MatrixItemChooserService: MatrixItemChooserServiceProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/Mock/MockMatrixItemChooserService.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/Mock/MockMatrixItemChooserService.swift index 18891c742..b08ede2fe 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/Mock/MockMatrixItemChooserService.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Service/Mock/MockMatrixItemChooserService.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class MockMatrixItemChooserService: MatrixItemChooserServiceProtocol { static let mockSections = [ diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Test/UI/MatrixItemChooserUITests.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Test/UI/MatrixItemChooserUITests.swift index 6a0918694..c5e8f305b 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Test/UI/MatrixItemChooserUITests.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Test/UI/MatrixItemChooserUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class MatrixItemChooserUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Test/Unit/MatrixItemChooserViewModelTests.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Test/Unit/MatrixItemChooserViewModelTests.swift index 1e256775f..604674ce4 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Test/Unit/MatrixItemChooserViewModelTests.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/Test/Unit/MatrixItemChooserViewModelTests.swift @@ -19,7 +19,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class MatrixItemChooserViewModelTests: XCTestCase { var creationParameters = SpaceCreationParameters() var service: MockMatrixItemChooserService! diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift index 1c2808261..eeb7743d3 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooser.swift @@ -18,7 +18,6 @@ import SwiftUI -@available(iOS 14.0, *) struct MatrixItemChooser: View { // MARK: Properties @@ -151,7 +150,6 @@ struct MatrixItemChooser: View { // MARK: - Previews -@available(iOS 14.0, *) struct MatrixItemChooser_Previews: PreviewProvider { static let stateRenderer = MockMatrixItemChooserScreenState.stateRenderer diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooserListRow.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooserListRow.swift index 86fb62723..f5d6db9c8 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooserListRow.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooserListRow.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct MatrixItemChooserListRow: View { // MARK: - Properties @@ -69,7 +68,6 @@ struct MatrixItemChooserListRow: View { // MARK: - Previews -@available(iOS 14.0, *) struct MatrixItemChooserListRow_Previews: PreviewProvider { static var previews: some View { TemplateRoomListRow(avatar: MockAvatarInput.example, displayName: "Alice") diff --git a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooserSectionHeader.swift b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooserSectionHeader.swift index ac0f337a2..632403587 100644 --- a/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooserSectionHeader.swift +++ b/RiotSwiftUI/Modules/Spaces/MatrixItemChooser/View/MatrixItemChooserSectionHeader.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct MatrixItemChooserSectionHeader: View { // MARK: - Properties @@ -63,7 +62,6 @@ struct MatrixItemChooserSectionHeader: View { // MARK: - Previews -@available(iOS 14.0, *) struct MatrixItemChooserSectionHeader_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Spaces/RoomAncestorSelector/Coordinator/RoomAncestorSelectorViewProvider.swift b/RiotSwiftUI/Modules/Spaces/RoomAncestorSelector/Coordinator/RoomAncestorSelectorViewProvider.swift index 578e1d4f3..070a31967 100644 --- a/RiotSwiftUI/Modules/Spaces/RoomAncestorSelector/Coordinator/RoomAncestorSelectorViewProvider.swift +++ b/RiotSwiftUI/Modules/Spaces/RoomAncestorSelector/Coordinator/RoomAncestorSelectorViewProvider.swift @@ -24,7 +24,6 @@ class RoomAncestorSelectorViewProvider: MatrixItemChooserCoordinatorViewProvider self.navTitle = navTitle } - @available(iOS 14, *) func view(with viewModel: MatrixItemChooserViewModelType.Context) -> AnyView { return AnyView(RoomAncestorSelector(viewModel: viewModel, navTitle: navTitle)) } diff --git a/RiotSwiftUI/Modules/Spaces/RoomAncestorSelector/View/RoomAncestorSelector.swift b/RiotSwiftUI/Modules/Spaces/RoomAncestorSelector/View/RoomAncestorSelector.swift index 4056b0a36..91ac64a40 100644 --- a/RiotSwiftUI/Modules/Spaces/RoomAncestorSelector/View/RoomAncestorSelector.swift +++ b/RiotSwiftUI/Modules/Spaces/RoomAncestorSelector/View/RoomAncestorSelector.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct RoomAncestorSelector: View { // MARK: Properties diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/Coordinator/SpaceCreationCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/Coordinator/SpaceCreationCoordinator.swift index 543a990d0..24612bf2e 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/Coordinator/SpaceCreationCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/Coordinator/SpaceCreationCoordinator.swift @@ -105,7 +105,6 @@ final class SpaceCreationCoordinator: Coordinator { // MARK: - Private - @available(iOS 14.0, *) func pushScreen(with coordinator: Coordinator & Presentable) { add(childCoordinator: coordinator) @@ -116,7 +115,6 @@ final class SpaceCreationCoordinator: Coordinator { coordinator.start() } - @available(iOS 14.0, *) private func createMenuCoordinator(with parameters: SpaceCreationMenuCoordinatorParameters) -> SpaceCreationMenuCoordinator { let coordinator: SpaceCreationMenuCoordinator = SpaceCreationMenuCoordinator(parameters: parameters) @@ -142,7 +140,6 @@ final class SpaceCreationCoordinator: Coordinator { return coordinator } - @available(iOS 14.0, *) private func createSettingsCoordinator() -> SpaceCreationSettingsCoordinator { let coordinator = SpaceCreationSettingsCoordinator(parameters: SpaceCreationSettingsCoordinatorParameters(session: parameters.session, creationParameters: parameters.creationParameters)) coordinator.callback = { [weak self] result in @@ -163,7 +160,6 @@ final class SpaceCreationCoordinator: Coordinator { return coordinator } - @available(iOS 14.0, *) private func createRoomsCoordinator() -> SpaceCreationRoomsCoordinator { let coordinator = SpaceCreationRoomsCoordinator(parameters: SpaceCreationRoomsCoordinatorParameters(session: parameters.session, creationParams: parameters.creationParameters)) coordinator.callback = { [weak self] result in @@ -186,7 +182,6 @@ final class SpaceCreationCoordinator: Coordinator { return coordinator } - @available(iOS 14.0, *) private func createEmailInvitesCoordinator() -> SpaceCreationEmailInvitesCoordinator { let coordinator = SpaceCreationEmailInvitesCoordinator(parameters: SpaceCreationEmailInvitesCoordinatorParameters(session: parameters.session, creationParams: parameters.creationParameters)) coordinator.callback = { [weak self] result in @@ -205,7 +200,6 @@ final class SpaceCreationCoordinator: Coordinator { return coordinator } - @available(iOS 14.0, *) private func createPeopleChooserCoordinator() -> MatrixItemChooserCoordinator { let parameters = MatrixItemChooserCoordinatorParameters( session: parameters.session, @@ -229,7 +223,6 @@ final class SpaceCreationCoordinator: Coordinator { return coordinator } - @available(iOS 14.0, *) private func createRoomChooserCoordinator() -> MatrixItemChooserCoordinator { let parameters = MatrixItemChooserCoordinatorParameters( session: parameters.session, @@ -253,7 +246,6 @@ final class SpaceCreationCoordinator: Coordinator { return coordinator } - @available(iOS 14.0, *) private func createPostProcessCoordinator() -> SpaceCreationPostProcessCoordinator { let coordinator = SpaceCreationPostProcessCoordinator(parameters: SpaceCreationPostProcessCoordinatorParameters(session: parameters.session, creationParams: parameters.creationParameters)) coordinator.callback = { [weak self] result in diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Coordinator/SpaceCreationEmailInvitesCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Coordinator/SpaceCreationEmailInvitesCoordinator.swift index 90a06ad01..986f03b35 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Coordinator/SpaceCreationEmailInvitesCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Coordinator/SpaceCreationEmailInvitesCoordinator.swift @@ -38,7 +38,6 @@ final class SpaceCreationEmailInvitesCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: SpaceCreationEmailInvitesCoordinatorParameters) { self.parameters = parameters let service = SpaceCreationEmailInvitesService(session: parameters.session) diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/MatrixSDK/SpaceCreationEmailInvitesService.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/MatrixSDK/SpaceCreationEmailInvitesService.swift index 45833bf09..e011cbc59 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/MatrixSDK/SpaceCreationEmailInvitesService.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/MatrixSDK/SpaceCreationEmailInvitesService.swift @@ -19,7 +19,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class SpaceCreationEmailInvitesService: SpaceCreationEmailInvitesServiceProtocol { private let session: MXSession diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/Mock/MockSpaceCreationEmailInvitesScreenState.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/Mock/MockSpaceCreationEmailInvitesScreenState.swift index 2019deb0c..09a3d4b82 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/Mock/MockSpaceCreationEmailInvitesScreenState.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/Mock/MockSpaceCreationEmailInvitesScreenState.swift @@ -21,7 +21,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockSpaceCreationEmailInvitesScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/Mock/MockSpaceCreationEmailInvitesService.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/Mock/MockSpaceCreationEmailInvitesService.swift index a9ecbe15b..a34a9b801 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/Mock/MockSpaceCreationEmailInvitesService.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/Mock/MockSpaceCreationEmailInvitesService.swift @@ -19,7 +19,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class MockSpaceCreationEmailInvitesService: SpaceCreationEmailInvitesServiceProtocol { var isLoadingSubject: CurrentValueSubject diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/SpaceCreationEmailInvitesServiceProtocol.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/SpaceCreationEmailInvitesServiceProtocol.swift index b460da054..c92a2cd8d 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/SpaceCreationEmailInvitesServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Service/SpaceCreationEmailInvitesServiceProtocol.swift @@ -19,7 +19,6 @@ import Foundation import Combine -@available(iOS 14.0, *) protocol SpaceCreationEmailInvitesServiceProtocol { var isIdentityServiceReady: Bool { get } var isLoadingSubject: CurrentValueSubject { get } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Test/UI/SpaceCreationEmailInvitesUITests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Test/UI/SpaceCreationEmailInvitesUITests.swift index c6f1f8426..2b680e2aa 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Test/UI/SpaceCreationEmailInvitesUITests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Test/UI/SpaceCreationEmailInvitesUITests.swift @@ -19,7 +19,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationEmailInvitesUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Test/Unit/SpaceCreationEmailInvitesViewModelTests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Test/Unit/SpaceCreationEmailInvitesViewModelTests.swift index 8a53ff89a..bbea5e3e2 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Test/Unit/SpaceCreationEmailInvitesViewModelTests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/Test/Unit/SpaceCreationEmailInvitesViewModelTests.swift @@ -21,7 +21,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationEmailInvitesViewModelTests: XCTestCase { var creationParameters = SpaceCreationParameters() var service: MockSpaceCreationEmailInvitesService! diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/View/SpaceCreationEmailInvites.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/View/SpaceCreationEmailInvites.swift index 3c8b963ca..80f9abe87 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/View/SpaceCreationEmailInvites.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/View/SpaceCreationEmailInvites.swift @@ -18,7 +18,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SpaceCreationEmailInvites: View { // MARK: - Properties @@ -114,7 +113,6 @@ struct SpaceCreationEmailInvites: View { // MARK: - Previews -@available(iOS 14.0, *) struct SpaceCreationEmailInvites_Previews: PreviewProvider { static let stateRenderer = MockSpaceCreationEmailInvitesScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/ViewModel/SpaceCreationEmailInvitesViewModel.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/ViewModel/SpaceCreationEmailInvitesViewModel.swift index a6ab659bc..55a2c6750 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/ViewModel/SpaceCreationEmailInvitesViewModel.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/ViewModel/SpaceCreationEmailInvitesViewModel.swift @@ -19,11 +19,9 @@ import SwiftUI import Combine -@available(iOS 14, *) typealias SpaceCreationEmailInvitesViewModelType = StateStoreViewModel -@available(iOS 14, *) class SpaceCreationEmailInvitesViewModel: SpaceCreationEmailInvitesViewModelType, SpaceCreationEmailInvitesViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/ViewModel/SpaceCreationEmailInvitesViewModelProtocol.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/ViewModel/SpaceCreationEmailInvitesViewModelProtocol.swift index a34305d9b..88c154805 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/ViewModel/SpaceCreationEmailInvitesViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/ViewModel/SpaceCreationEmailInvitesViewModelProtocol.swift @@ -21,6 +21,5 @@ import Foundation protocol SpaceCreationEmailInvitesViewModelProtocol { var completion: ((SpaceCreationEmailInvitesViewModelResult) -> Void)? { get set } - @available(iOS 14, *) var context: SpaceCreationEmailInvitesViewModelType.Context { get } } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixItemChooser/Coordinator/SpaceCreationMatrixItemChooserViewProvider.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixItemChooser/Coordinator/SpaceCreationMatrixItemChooserViewProvider.swift index e81c4fe46..a4e80561f 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixItemChooser/Coordinator/SpaceCreationMatrixItemChooserViewProvider.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixItemChooser/Coordinator/SpaceCreationMatrixItemChooserViewProvider.swift @@ -17,7 +17,6 @@ import SwiftUI class SpaceCreationMatrixItemChooserViewProvider: MatrixItemChooserCoordinatorViewProvider { - @available(iOS 14, *) func view(with viewModel: MatrixItemChooserViewModelType.Context) -> AnyView { return AnyView(SpaceCreationMatrixItemChooser(viewModel: viewModel)) } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixItemChooser/View/SpaceCreationMatrixItemChooser.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixItemChooser/View/SpaceCreationMatrixItemChooser.swift index c8c9b5042..856b5c6c1 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixItemChooser/View/SpaceCreationMatrixItemChooser.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMatrixItemChooser/View/SpaceCreationMatrixItemChooser.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SpaceCreationMatrixItemChooser: View { // MARK: Properties diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Coordinator/SpaceCreationMenuCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Coordinator/SpaceCreationMenuCoordinator.swift index 32e7031b7..286f9b2e2 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Coordinator/SpaceCreationMenuCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Coordinator/SpaceCreationMenuCoordinator.swift @@ -38,7 +38,6 @@ final class SpaceCreationMenuCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: SpaceCreationMenuCoordinatorParameters) { self.parameters = parameters let viewModel = SpaceCreationMenuViewModel(navTitle: parameters.navTitle, creationParams: parameters.creationParams, title: parameters.title, detail: parameters.detail, options: parameters.options) diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Test/UI/SpaceCreationMenuUITests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Test/UI/SpaceCreationMenuUITests.swift index 77e6826d5..c2f457f79 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Test/UI/SpaceCreationMenuUITests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Test/UI/SpaceCreationMenuUITests.swift @@ -19,7 +19,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationMenuUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Test/Unit/SpaceCreationMenuViewModelTests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Test/Unit/SpaceCreationMenuViewModelTests.swift index 50f4b099b..72c694556 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Test/Unit/SpaceCreationMenuViewModelTests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/Test/Unit/SpaceCreationMenuViewModelTests.swift @@ -21,7 +21,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationMenuViewModelTests: XCTestCase { private enum Constants { } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/View/SpaceCreationMenu.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/View/SpaceCreationMenu.swift index ff05feb6e..fc1c80593 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/View/SpaceCreationMenu.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/View/SpaceCreationMenu.swift @@ -18,7 +18,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SpaceCreationMenu: View { // MARK: - Properties @@ -100,7 +99,6 @@ struct SpaceCreationMenu: View { // MARK: - Previews -@available(iOS 14.0, *) struct SpaceCreationMenu_Previews: PreviewProvider { static let stateRenderer = MockSpaceCreationMenuScreenState.stateRenderer @@ -117,7 +115,6 @@ struct SpaceCreationMenu_Previews: PreviewProvider { /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockSpaceCreationMenuScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/ViewModel/SpaceCreationMenuViewModel.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/ViewModel/SpaceCreationMenuViewModel.swift index 0d315e0f7..62b48d3a7 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/ViewModel/SpaceCreationMenuViewModel.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/ViewModel/SpaceCreationMenuViewModel.swift @@ -19,11 +19,9 @@ import SwiftUI import Combine -@available(iOS 14, *) typealias SpaceCreationMenuViewModelType = StateStoreViewModel -@available(iOS 14.0, *) class SpaceCreationMenuViewModel: SpaceCreationMenuViewModelType, SpaceCreationMenuViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/ViewModel/SpaceCreationMenuViewModelProtocol.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/ViewModel/SpaceCreationMenuViewModelProtocol.swift index 4012e8d57..f3660dd08 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/ViewModel/SpaceCreationMenuViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationMenu/ViewModel/SpaceCreationMenuViewModelProtocol.swift @@ -20,6 +20,5 @@ import Foundation protocol SpaceCreationMenuViewModelProtocol { var callback: ((SpaceCreationMenuViewModelAction) -> Void)? { get set } - @available(iOS 14, *) var context: SpaceCreationMenuViewModelType.Context { get } } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Coordinator/SpaceCreationPostProcessCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Coordinator/SpaceCreationPostProcessCoordinator.swift index bbcc56a13..92848c116 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Coordinator/SpaceCreationPostProcessCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Coordinator/SpaceCreationPostProcessCoordinator.swift @@ -38,7 +38,6 @@ final class SpaceCreationPostProcessCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: SpaceCreationPostProcessCoordinatorParameters) { self.parameters = parameters let viewModel = SpaceCreationPostProcessViewModel.makeSpaceCreationPostProcessViewModel(spaceCreationPostProcessService: SpaceCreationPostProcessService(session: parameters.session, creationParams: parameters.creationParams)) diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/MatrixSDK/SpaceCreationPostProcessService.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/MatrixSDK/SpaceCreationPostProcessService.swift index 2c455bcf6..0dae6f360 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/MatrixSDK/SpaceCreationPostProcessService.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/MatrixSDK/SpaceCreationPostProcessService.swift @@ -20,7 +20,6 @@ import Foundation import Combine import MatrixSDK -@available(iOS 14.0, *) class SpaceCreationPostProcessService: SpaceCreationPostProcessServiceProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/Mock/MockSpaceCreationPostProcessScreenState.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/Mock/MockSpaceCreationPostProcessScreenState.swift index 785f4cf90..a8220d8cc 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/Mock/MockSpaceCreationPostProcessScreenState.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/Mock/MockSpaceCreationPostProcessScreenState.swift @@ -21,7 +21,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockSpaceCreationPostProcessScreenState: MockScreenState { static var screenStates: [MockScreenState] = [MockSpaceCreationPostProcessScreenState.running, MockSpaceCreationPostProcessScreenState.done, MockSpaceCreationPostProcessScreenState.doneWithError] diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/Mock/MockSpaceCreationPostProcessService.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/Mock/MockSpaceCreationPostProcessService.swift index 949ff78ea..4e10a9abd 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/Mock/MockSpaceCreationPostProcessService.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/Mock/MockSpaceCreationPostProcessService.swift @@ -20,7 +20,6 @@ import Foundation import Combine import UIKit -@available(iOS 14.0, *) class MockSpaceCreationPostProcessService: SpaceCreationPostProcessServiceProtocol { static let defaultTasks: [SpaceCreationPostProcessTask] = [ diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/SpaceCreationPostProcessServiceProtocol.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/SpaceCreationPostProcessServiceProtocol.swift index 49c81d3d8..7ff9e73cf 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/SpaceCreationPostProcessServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Service/SpaceCreationPostProcessServiceProtocol.swift @@ -20,7 +20,6 @@ import Foundation import Combine import UIKit -@available(iOS 14.0, *) protocol SpaceCreationPostProcessServiceProtocol: AnyObject { var tasksSubject: CurrentValueSubject<[SpaceCreationPostProcessTask], Never> { get } var createdSpaceId: String? { get } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Test/UI/SpaceCreationPostProcessUITests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Test/UI/SpaceCreationPostProcessUITests.swift index 2f42eacf2..e453d6436 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Test/UI/SpaceCreationPostProcessUITests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Test/UI/SpaceCreationPostProcessUITests.swift @@ -19,7 +19,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationPostProcessUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Test/Unit/SpaceCreationPostProcessViewModelTests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Test/Unit/SpaceCreationPostProcessViewModelTests.swift index 76c1a53f4..cb274b1ba 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Test/Unit/SpaceCreationPostProcessViewModelTests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/Test/Unit/SpaceCreationPostProcessViewModelTests.swift @@ -21,7 +21,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationPostProcessViewModelTests: XCTestCase { var service: MockSpaceCreationPostProcessService! diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/View/SpaceCreationPostProcess.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/View/SpaceCreationPostProcess.swift index a5583b0af..3c5ad177e 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/View/SpaceCreationPostProcess.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/View/SpaceCreationPostProcess.swift @@ -18,7 +18,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SpaceCreationPostProcess: View { // MARK: - Properties @@ -101,7 +100,6 @@ struct SpaceCreationPostProcess: View { // MARK: - Previews -@available(iOS 14.0, *) struct SpaceCreationPostProcess_Previews: PreviewProvider { static let stateRenderer = MockSpaceCreationPostProcessScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/View/SpaceCreationPostProcessItem.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/View/SpaceCreationPostProcessItem.swift index c14d95696..8fe554b10 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/View/SpaceCreationPostProcessItem.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/View/SpaceCreationPostProcessItem.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SpaceCreationPostProcessItem: View { // MARK: - Properties @@ -65,7 +64,6 @@ struct SpaceCreationPostProcessItem: View { // MARK: - Previews -@available(iOS 14.0, *) struct SpaceCreationPostProcessItem_Previews: PreviewProvider { static var previews: some View { Group { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/ViewModel/SpaceCreationPostProcessViewModel.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/ViewModel/SpaceCreationPostProcessViewModel.swift index d17c5c93b..57a736b09 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/ViewModel/SpaceCreationPostProcessViewModel.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/ViewModel/SpaceCreationPostProcessViewModel.swift @@ -21,11 +21,9 @@ import Combine -@available(iOS 14, *) typealias SpaceCreationPostProcessViewModelType = StateStoreViewModel -@available(iOS 14, *) class SpaceCreationPostProcessViewModel: SpaceCreationPostProcessViewModelType, SpaceCreationPostProcessViewModelProtocol { // MARK: - Properties @@ -133,7 +131,6 @@ class SpaceCreationPostProcessViewModel: SpaceCreationPostProcessViewModelType, } // MARK: - MXSpaceService notification constants -@available(iOS 14, *) extension SpaceCreationPostProcessViewModel { /// Posted once the process is finished public static let didUpdate = Notification.Name("SpaceCreationPostProcessViewModelDidUpdate") diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/ViewModel/SpaceCreationPostProcessViewModelProtocol.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/ViewModel/SpaceCreationPostProcessViewModelProtocol.swift index 13420e655..f71785b35 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/ViewModel/SpaceCreationPostProcessViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationPostProcess/ViewModel/SpaceCreationPostProcessViewModelProtocol.swift @@ -21,8 +21,6 @@ import Foundation protocol SpaceCreationPostProcessViewModelProtocol { var completion: ((SpaceCreationPostProcessViewModelResult) -> Void)? { get set } - @available(iOS 14, *) static func makeSpaceCreationPostProcessViewModel(spaceCreationPostProcessService: SpaceCreationPostProcessServiceProtocol) -> SpaceCreationPostProcessViewModelProtocol - @available(iOS 14, *) var context: SpaceCreationPostProcessViewModelType.Context { get } } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Coordinator/SpaceCreationRoomsCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Coordinator/SpaceCreationRoomsCoordinator.swift index 6826dd2bc..e3da21122 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Coordinator/SpaceCreationRoomsCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Coordinator/SpaceCreationRoomsCoordinator.swift @@ -38,7 +38,6 @@ final class SpaceCreationRoomsCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: SpaceCreationRoomsCoordinatorParameters) { self.parameters = parameters let viewModel = SpaceCreationRoomsViewModel(creationParameters: parameters.creationParams) diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Service/Mock/MockSpaceCreationRoomsScreenState.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Service/Mock/MockSpaceCreationRoomsScreenState.swift index 110e4a6f0..fd5919029 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Service/Mock/MockSpaceCreationRoomsScreenState.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Service/Mock/MockSpaceCreationRoomsScreenState.swift @@ -21,7 +21,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockSpaceCreationRoomsScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Test/UI/SpaceCreationRoomsUITests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Test/UI/SpaceCreationRoomsUITests.swift index 7cb20666e..2d9d633c1 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Test/UI/SpaceCreationRoomsUITests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Test/UI/SpaceCreationRoomsUITests.swift @@ -19,7 +19,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationRoomsUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Test/Unit/SpaceCreationRoomsViewModelTests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Test/Unit/SpaceCreationRoomsViewModelTests.swift index 2c53401ec..c09e85826 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Test/Unit/SpaceCreationRoomsViewModelTests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/Test/Unit/SpaceCreationRoomsViewModelTests.swift @@ -21,7 +21,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationRoomsViewModelTests: XCTestCase { var creationParameters = SpaceCreationParameters() var viewModel: SpaceCreationRoomsViewModelProtocol! diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/View/SpaceCreationRooms.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/View/SpaceCreationRooms.swift index f24c23594..8137dce9f 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/View/SpaceCreationRooms.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/View/SpaceCreationRooms.swift @@ -18,7 +18,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SpaceCreationRooms: View { // MARK: - Properties @@ -84,7 +83,6 @@ struct SpaceCreationRooms: View { // MARK: - Previews -@available(iOS 14.0, *) struct SpaceCreationRooms_Previews: PreviewProvider { static let stateRenderer = MockSpaceCreationRoomsScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/ViewModel/SpaceCreationRoomsViewModel.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/ViewModel/SpaceCreationRoomsViewModel.swift index 269e12a28..dfb989a80 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/ViewModel/SpaceCreationRoomsViewModel.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/ViewModel/SpaceCreationRoomsViewModel.swift @@ -21,11 +21,9 @@ import Combine -@available(iOS 14, *) typealias SpaceCreationRoomsViewModelType = StateStoreViewModel -@available(iOS 14, *) class SpaceCreationRoomsViewModel: SpaceCreationRoomsViewModelType, SpaceCreationRoomsViewModelProtocol { // MARK: - Setup diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/ViewModel/SpaceCreationRoomsViewModelProtocol.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/ViewModel/SpaceCreationRoomsViewModelProtocol.swift index 8406bd68e..f7bbd263b 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/ViewModel/SpaceCreationRoomsViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationRooms/ViewModel/SpaceCreationRoomsViewModelProtocol.swift @@ -21,6 +21,5 @@ import Foundation protocol SpaceCreationRoomsViewModelProtocol { var callback: ((SpaceCreationRoomsViewModelResult) -> Void)? { get set } - @available(iOS 14, *) var context: SpaceCreationRoomsViewModelType.Context { get } } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Coordinator/SpaceCreationSettingsCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Coordinator/SpaceCreationSettingsCoordinator.swift index ab620514e..9461faaae 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Coordinator/SpaceCreationSettingsCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Coordinator/SpaceCreationSettingsCoordinator.swift @@ -44,7 +44,6 @@ final class SpaceCreationSettingsCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: SpaceCreationSettingsCoordinatorParameters) { self.parameters = parameters let service = SpaceCreationSettingsService(roomName: parameters.creationParameters.name ?? "", userDefinedAddress: parameters.creationParameters.userDefinedAddress, session: parameters.session) diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/MatrixSDK/SpaceCreationSettingsService.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/MatrixSDK/SpaceCreationSettingsService.swift index 0b6e69450..bf5835b62 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/MatrixSDK/SpaceCreationSettingsService.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/MatrixSDK/SpaceCreationSettingsService.swift @@ -20,7 +20,6 @@ import Foundation import Combine import MatrixSDK -@available(iOS 14.0, *) class SpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsScreenState.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsScreenState.swift index 7a4ec66be..cf18234d6 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsScreenState.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsScreenState.swift @@ -22,7 +22,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockSpaceCreationSettingsScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsService.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsService.swift index 0590f95ca..5e9fa46d4 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsService.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/Mock/MockSpaceCreationSettingsService.swift @@ -19,7 +19,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class MockSpaceCreationSettingsService: SpaceCreationSettingsServiceProtocol { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/SpaceCreationSettingsServiceProtocol.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/SpaceCreationSettingsServiceProtocol.swift index bbc47c10d..7b594fecc 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/SpaceCreationSettingsServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Service/SpaceCreationSettingsServiceProtocol.swift @@ -19,7 +19,6 @@ import Foundation import Combine -@available(iOS 14.0, *) protocol SpaceCreationSettingsServiceProtocol: AnyObject { var defaultAddressSubject: CurrentValueSubject { get } var addressValidationSubject: CurrentValueSubject { get } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Test/UI/SpaceCreationSettingsUITests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Test/UI/SpaceCreationSettingsUITests.swift index 66e5cc3bd..9d6dfc4c7 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Test/UI/SpaceCreationSettingsUITests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Test/UI/SpaceCreationSettingsUITests.swift @@ -19,7 +19,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationSettingsUITests: MockScreenTest { override class var screenType: MockScreenState.Type { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Test/Unit/SpaceCreationSettingsViewModelTests.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Test/Unit/SpaceCreationSettingsViewModelTests.swift index 135ac6fd0..dcefa9fb7 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Test/Unit/SpaceCreationSettingsViewModelTests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/Test/Unit/SpaceCreationSettingsViewModelTests.swift @@ -21,7 +21,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class SpaceCreationSettingsViewModelTests: XCTestCase { let creationParameters = SpaceCreationParameters() diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/View/SpaceCreationSettings.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/View/SpaceCreationSettings.swift index 1fe699c3c..d8e697dcd 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/View/SpaceCreationSettings.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/View/SpaceCreationSettings.swift @@ -19,7 +19,6 @@ import SwiftUI import Combine -@available(iOS 14.0, *) struct SpaceCreationSettings: View { // MARK: - Properties @@ -159,7 +158,6 @@ struct SpaceCreationSettings: View { // MARK: - Previews -@available(iOS 14.0, *) struct SpaceCreationSettings_Previews: PreviewProvider { static let stateRenderer = MockSpaceCreationSettingsScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/ViewModel/SpaceCreationSettingsViewModel.swift b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/ViewModel/SpaceCreationSettingsViewModel.swift index de335ae45..742504b41 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/ViewModel/SpaceCreationSettingsViewModel.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/ViewModel/SpaceCreationSettingsViewModel.swift @@ -19,12 +19,10 @@ import SwiftUI import Combine -@available(iOS 14, *) typealias SpaceCreationSettingsViewModelType = StateStoreViewModel -@available(iOS 14, *) class SpaceCreationSettingsViewModel: SpaceCreationSettingsViewModelType, SpaceCreationSettingsViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinator.swift index be95b0506..b2d10971c 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinator.swift @@ -23,7 +23,6 @@ enum SpaceSettingsModalCoordinatorAction { } @objcMembers -@available(iOS 14.0, *) final class SpaceSettingsModalCoordinator: Coordinator { // MARK: - Properties @@ -80,7 +79,6 @@ final class SpaceSettingsModalCoordinator: Coordinator { // MARK: - Private - @available(iOS 14.0, *) func pushScreen(with coordinator: Coordinator & Presentable) { add(childCoordinator: coordinator) @@ -165,7 +163,6 @@ final class SpaceSettingsModalCoordinator: Coordinator { } // MARK: - ExploreRoomCoordinatorDelegate -@available(iOS 14.0, *) extension SpaceSettingsModalCoordinator: ExploreRoomCoordinatorDelegate { func exploreRoomCoordinatorDidComplete(_ coordinator: ExploreRoomCoordinatorType) { self.navigationRouter.dismissModule(animated: true, completion: { @@ -175,7 +172,6 @@ extension SpaceSettingsModalCoordinator: ExploreRoomCoordinatorDelegate { } // MARK: - SpaceMembersCoordinatorDelegate -@available(iOS 14.0, *) extension SpaceSettingsModalCoordinator: SpaceMembersCoordinatorDelegate { func spaceMembersCoordinatorDidCancel(_ coordinator: SpaceMembersCoordinatorType) { self.navigationRouter.dismissModule(animated: true, completion: { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinatorBridgePresenter.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinatorBridgePresenter.swift index 07e956b89..5614f2d08 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinatorBridgePresenter.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/Coordinator/SpaceSettingsModalCoordinatorBridgePresenter.swift @@ -16,7 +16,6 @@ import UIKit -@available(iOS 14.0, *) @objc protocol SpaceSettingsModalCoordinatorBridgePresenterDelegate { func spaceSettingsModalCoordinatorBridgePresenterDelegateDidCancel(_ coordinatorBridgePresenter: SpaceSettingsModalCoordinatorBridgePresenter) func spaceSettingsModalCoordinatorBridgePresenterDelegateDidFinish(_ coordinatorBridgePresenter: SpaceSettingsModalCoordinatorBridgePresenter) @@ -27,7 +26,6 @@ import UIKit /// It breaks the Coordinator abstraction and it has been introduced for Objective-C compatibility (mainly for integration in legacy view controllers). /// Each bridge should be removed once the underlying Coordinator has been integrated by another Coordinator. @objcMembers -@available(iOS 14.0, *) final class SpaceSettingsModalCoordinatorBridgePresenter: NSObject { // MARK: - Properties @@ -92,7 +90,6 @@ final class SpaceSettingsModalCoordinatorBridgePresenter: NSObject { // MARK: - UIAdaptivePresentationControllerDelegate -@available(iOS 14.0, *) extension SpaceSettingsModalCoordinatorBridgePresenter: UIAdaptivePresentationControllerDelegate { func roomNotificationSettingsCoordinatorDidComplete(_ presentationController: UIPresentationController) { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Coordinator/SpaceSettingsCoordinator.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Coordinator/SpaceSettingsCoordinator.swift index d0f4c6790..74d88ad09 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Coordinator/SpaceSettingsCoordinator.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Coordinator/SpaceSettingsCoordinator.swift @@ -45,7 +45,6 @@ final class SpaceSettingsCoordinator: Coordinator, Presentable { // MARK: - Setup - @available(iOS 14.0, *) init(parameters: SpaceSettingsCoordinatorParameters) { self.parameters = parameters let viewModel = SpaceSettingsViewModel.makeSpaceSettingsViewModel(service: SpaceSettingsService(session: parameters.session, spaceId: parameters.spaceId)) diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/MockSpaceSettingsScreenState.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/MockSpaceSettingsScreenState.swift index 977ef8d81..3a28e7f65 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/MockSpaceSettingsScreenState.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/MockSpaceSettingsScreenState.swift @@ -19,7 +19,6 @@ import SwiftUI /// Using an enum for the screen allows you define the different state cases with /// the relevant associated data for each case. -@available(iOS 14.0, *) enum MockSpaceSettingsScreenState: MockScreenState, CaseIterable { // A case for each state you want to represent // with specific, minimal associated data that will allow you diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/MatrixSDK/SpaceSettingsService.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/MatrixSDK/SpaceSettingsService.swift index 429f2e5a5..51028a11c 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/MatrixSDK/SpaceSettingsService.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/MatrixSDK/SpaceSettingsService.swift @@ -18,7 +18,6 @@ import Foundation import Combine import MatrixSDK -@available(iOS 14.0, *) class SpaceSettingsService: SpaceSettingsServiceProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/Mock/MockSpaceSettingsService.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/Mock/MockSpaceSettingsService.swift index d58e980ad..96bc1f503 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/Mock/MockSpaceSettingsService.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/Mock/MockSpaceSettingsService.swift @@ -17,7 +17,6 @@ import Foundation import Combine -@available(iOS 14.0, *) class MockSpaceSettingsService: SpaceSettingsServiceProtocol { var spaceId: String diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/SpaceSettingsServiceProtocol.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/SpaceSettingsServiceProtocol.swift index 3d0666047..4788c8e75 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/SpaceSettingsServiceProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Service/SpaceSettingsServiceProtocol.swift @@ -22,7 +22,6 @@ enum SpaceSettingsServiceCompletionResult { case failure(Error) } -@available(iOS 14.0, *) protocol SpaceSettingsServiceProtocol: Avatarable { var spaceId: String { get } var roomProperties: SpaceSettingsRoomProperties? { get } @@ -39,7 +38,6 @@ protocol SpaceSettingsServiceProtocol: Avatarable { // MARK: Avatarable -@available(iOS 14.0, *) extension SpaceSettingsServiceProtocol { var mxContentUri: String? { roomProperties?.avatarUrl diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/SpaceSettingsViewModel.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/SpaceSettingsViewModel.swift index f2969bb86..e98257b3f 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/SpaceSettingsViewModel.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/SpaceSettingsViewModel.swift @@ -17,11 +17,9 @@ import SwiftUI import Combine -@available(iOS 14, *) typealias SpaceSettingsViewModelType = StateStoreViewModel -@available(iOS 14, *) class SpaceSettingsViewModel: SpaceSettingsViewModelType, SpaceSettingsViewModelProtocol { // MARK: - Properties diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/SpaceSettingsViewModelProtocol.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/SpaceSettingsViewModelProtocol.swift index 8c55ae90c..a2859c8a4 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/SpaceSettingsViewModelProtocol.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/SpaceSettingsViewModelProtocol.swift @@ -19,9 +19,7 @@ import Foundation protocol SpaceSettingsViewModelProtocol { var completion: ((SpaceSettingsViewModelResult) -> Void)? { get set } - @available(iOS 14, *) static func makeSpaceSettingsViewModel(service: SpaceSettingsServiceProtocol) -> SpaceSettingsViewModelProtocol - @available(iOS 14, *) var context: SpaceSettingsViewModelType.Context { get } func updateAvatarImage(with image: UIImage?) } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Test/UI/SpaceSettingsUITests.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Test/UI/SpaceSettingsUITests.swift index 1449bd93d..bc5e3900d 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Test/UI/SpaceSettingsUITests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Test/UI/SpaceSettingsUITests.swift @@ -17,7 +17,6 @@ import XCTest import RiotSwiftUI -@available(iOS 14.0, *) class SpaceSettingsUITests: MockScreenTest { // Tests to be implemented. } diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Test/Unit/SpaceSettingsViewModelTests.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Test/Unit/SpaceSettingsViewModelTests.swift index 2458e3f42..1e018fb85 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Test/Unit/SpaceSettingsViewModelTests.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/Test/Unit/SpaceSettingsViewModelTests.swift @@ -19,7 +19,6 @@ import Combine @testable import RiotSwiftUI -@available(iOS 14.0, *) class SpaceSettingsViewModelTests: XCTestCase { let creationParameters = SpaceCreationParameters() var service: MockSpaceSettingsService! diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/View/SpaceSettings.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/View/SpaceSettings.swift index bcbdd8b00..42d8f71b3 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/View/SpaceSettings.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/View/SpaceSettings.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SpaceSettings: View { // MARK: - Properties @@ -199,7 +198,6 @@ struct SpaceSettings: View { // MARK: - Previews -@available(iOS 14.0, *) struct SpaceSettings_Previews: PreviewProvider { static let stateRenderer = MockSpaceSettingsScreenState.stateRenderer static var previews: some View { diff --git a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/View/SpaceSettingsOptionListItem.swift b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/View/SpaceSettingsOptionListItem.swift index 135f6f77d..6287ab24d 100644 --- a/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/View/SpaceSettingsOptionListItem.swift +++ b/RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/View/SpaceSettingsOptionListItem.swift @@ -16,7 +16,6 @@ import SwiftUI -@available(iOS 14.0, *) struct SpaceSettingsOptionListItem: View { // MARK: Private @@ -85,7 +84,6 @@ struct SpaceSettingsOptionListItem: View { // MARK: - Previews -@available(iOS 14.0, *) struct SpaceSettingsOptionListItem_Previews: PreviewProvider { static var previews: some View { diff --git a/RiotSwiftUI/RiotSwiftUIApp.swift b/RiotSwiftUI/RiotSwiftUIApp.swift index 902f7327d..21bfa5d63 100644 --- a/RiotSwiftUI/RiotSwiftUIApp.swift +++ b/RiotSwiftUI/RiotSwiftUIApp.swift @@ -15,7 +15,6 @@ // import SwiftUI -@available(iOS 14.0, *) @main /// RiotSwiftUI screens rendered for UI Tests. struct RiotSwiftUIApp: App {