Cleaned up unneccesary code, hid some warnings.

This commit is contained in:
Stefan Ceriu 2022-02-22 09:21:31 +02:00
parent b53efb4869
commit 7a4be39e7e
9 changed files with 13 additions and 63 deletions

View File

@ -7,6 +7,8 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
182BC42027BE667200A30C33 /* RoomModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 182BC41F27BE667200A30C33 /* RoomModelProtocol.swift */; };
182BC42227BE6C6900A30C33 /* MockRoomModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 182BC42127BE6C6900A30C33 /* MockRoomModel.swift */; };
1850253F27B6918D002E6B18 /* ElementXTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850253E27B6918D002E6B18 /* ElementXTests.swift */; }; 1850253F27B6918D002E6B18 /* ElementXTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850253E27B6918D002E6B18 /* ElementXTests.swift */; };
1850254927B6918D002E6B18 /* ElementXUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850254827B6918D002E6B18 /* ElementXUITests.swift */; }; 1850254927B6918D002E6B18 /* ElementXUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850254827B6918D002E6B18 /* ElementXUITests.swift */; };
1850254B27B6918D002E6B18 /* ElementXUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850254A27B6918D002E6B18 /* ElementXUITestsLaunchTests.swift */; }; 1850254B27B6918D002E6B18 /* ElementXUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1850254A27B6918D002E6B18 /* ElementXUITestsLaunchTests.swift */; };
@ -74,6 +76,9 @@
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
182BC41F27BE667200A30C33 /* RoomModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomModelProtocol.swift; sourceTree = "<group>"; };
182BC42127BE6C6900A30C33 /* MockRoomModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockRoomModel.swift; sourceTree = "<group>"; };
184230FE27BD080000033771 /* matrix-rust-components-swift */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "matrix-rust-components-swift"; path = "../matrix-rust-components-swift"; sourceTree = "<group>"; };
1850252427B6918C002E6B18 /* ElementX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ElementX.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1850252427B6918C002E6B18 /* ElementX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ElementX.app; sourceTree = BUILT_PRODUCTS_DIR; };
1850253A27B6918D002E6B18 /* ElementXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ElementXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 1850253A27B6918D002E6B18 /* ElementXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ElementXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
1850253E27B6918D002E6B18 /* ElementXTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElementXTests.swift; sourceTree = "<group>"; }; 1850253E27B6918D002E6B18 /* ElementXTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElementXTests.swift; sourceTree = "<group>"; };
@ -155,6 +160,7 @@
1850251B27B6918C002E6B18 = { 1850251B27B6918C002E6B18 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
184230FE27BD080000033771 /* matrix-rust-components-swift */,
1850252627B6918C002E6B18 /* ElementX */, 1850252627B6918C002E6B18 /* ElementX */,
1850253D27B6918D002E6B18 /* ElementXTests */, 1850253D27B6918D002E6B18 /* ElementXTests */,
1850254727B6918D002E6B18 /* ElementXUITests */, 1850254727B6918D002E6B18 /* ElementXUITests */,
@ -402,6 +408,8 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
1863A49327BAAA6700B52E4D /* RoomModel.swift */, 1863A49327BAAA6700B52E4D /* RoomModel.swift */,
182BC41F27BE667200A30C33 /* RoomModelProtocol.swift */,
182BC42127BE6C6900A30C33 /* MockRoomModel.swift */,
); );
path = Models; path = Models;
sourceTree = "<group>"; sourceTree = "<group>";
@ -585,6 +593,7 @@
1863A45727BA7A7800B52E4D /* WeakDictionaryReference.swift in Sources */, 1863A45727BA7A7800B52E4D /* WeakDictionaryReference.swift in Sources */,
1863A48927BAA8A900B52E4D /* HomeScreenModels.swift in Sources */, 1863A48927BAA8A900B52E4D /* HomeScreenModels.swift in Sources */,
1863A45027BA79FF00B52E4D /* NavigationRouterType.swift in Sources */, 1863A45027BA79FF00B52E4D /* NavigationRouterType.swift in Sources */,
182BC42027BE667200A30C33 /* RoomModelProtocol.swift in Sources */,
1863A45627BA7A7800B52E4D /* WeakDictionaryKeyReference.swift in Sources */, 1863A45627BA7A7800B52E4D /* WeakDictionaryKeyReference.swift in Sources */,
1863A49427BAAA6700B52E4D /* RoomModel.swift in Sources */, 1863A49427BAAA6700B52E4D /* RoomModel.swift in Sources */,
1850256F27B6A135002E6B18 /* AppDelegate.swift in Sources */, 1850256F27B6A135002E6B18 /* AppDelegate.swift in Sources */,
@ -597,6 +606,7 @@
1863A43F27BA790000B52E4D /* Coordinator.swift in Sources */, 1863A43F27BA790000B52E4D /* Coordinator.swift in Sources */,
1863A41C27BA76B900B52E4D /* MXLog.swift in Sources */, 1863A41C27BA76B900B52E4D /* MXLog.swift in Sources */,
1863A44E27BA79FF00B52E4D /* Presentable.swift in Sources */, 1863A44E27BA79FF00B52E4D /* Presentable.swift in Sources */,
182BC42227BE6C6900A30C33 /* MockRoomModel.swift in Sources */,
1850256C27B6A135002E6B18 /* AppCoordinator.swift in Sources */, 1850256C27B6A135002E6B18 /* AppCoordinator.swift in Sources */,
1863A43127BA784300B52E4D /* LoginScreenModels.swift in Sources */, 1863A43127BA784300B52E4D /* LoginScreenModels.swift in Sources */,
1863A44A27BA79FF00B52E4D /* NavigationRouter.swift in Sources */, 1863A44A27BA79FF00B52E4D /* NavigationRouter.swift in Sources */,

View File

@ -38,7 +38,6 @@ final class LoginScreenCoordinator: Coordinator, Presentable {
// MARK: - Setup // MARK: - Setup
@available(iOS 14.0, *)
init(parameters: LoginScreenCoordinatorParameters) { init(parameters: LoginScreenCoordinatorParameters) {
self.parameters = parameters self.parameters = parameters

View File

@ -15,31 +15,3 @@
// //
import XCTest import XCTest
import RiotSwiftUI
@available(iOS 14.0, *)
class LoginScreenUITests: MockScreenTest {
override class var screenType: MockScreenState.Type {
return MockLoginScreenScreenState.self
}
override class func createTest() -> MockScreenTest {
return LoginScreenUITests(selector: #selector(verifyLoginScreenScreen))
}
func verifyLoginScreenScreen() throws {
guard let screenState = screenState as? MockLoginScreenScreenState else { fatalError("no screen") }
switch screenState {
case .promptType(let promptType):
verifyLoginScreenPromptType(promptType: promptType)
}
}
func verifyLoginScreenPromptType(promptType: LoginScreenPromptType) {
let title = app.staticTexts["title"]
XCTAssert(title.exists)
XCTAssertEqual(title.label, promptType.title)
}
}

View File

@ -18,7 +18,6 @@ import XCTest
@testable import ElementX @testable import ElementX
@available(iOS 14.0, *)
class LoginScreenViewModelTests: XCTestCase { class LoginScreenViewModelTests: XCTestCase {
override func setUpWithError() throws { override func setUpWithError() throws {

View File

@ -16,7 +16,6 @@
import SwiftUI import SwiftUI
@available(iOS 14.0, *)
struct LoginScreen: View { struct LoginScreen: View {
@ObservedObject var context: LoginScreenViewModel.Context @ObservedObject var context: LoginScreenViewModel.Context

View File

@ -15,31 +15,3 @@
// //
import XCTest import XCTest
import ElementX
@available(iOS 14.0, *)
class HomeScreenUITests: MockScreenTest {
override class var screenType: MockScreenState.Type {
return MockHomeScreenScreenState.self
}
override class func createTest() -> MockScreenTest {
return HomeScreenUITests(selector: #selector(verifyHomeScreenScreen))
}
func verifyHomeScreenScreen() throws {
guard let screenState = screenState as? MockHomeScreenScreenState else { fatalError("no screen") }
switch screenState {
case .promptType(let promptType):
verifyHomeScreenPromptType(promptType: promptType)
}
}
func verifyHomeScreenPromptType(promptType: HomeScreenPromptType) {
let title = app.staticTexts["title"]
XCTAssert(title.exists)
XCTAssertEqual(title.label, promptType.title)
}
}

View File

@ -18,7 +18,6 @@ import XCTest
@testable import ElementX @testable import ElementX
@available(iOS 14.0, *)
class HomeScreenViewModelTests: XCTestCase { class HomeScreenViewModelTests: XCTestCase {
override func setUpWithError() throws { override func setUpWithError() throws {

View File

@ -356,7 +356,7 @@ extension NavigationRouter: UINavigationControllerDelegate {
func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) { func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
// TODO: Try to post `NavigationRouter.willPopModule` notification here // Try to post `NavigationRouter.willPopModule` notification here
} }
func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) { func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {

View File

@ -25,7 +25,7 @@ class NavigationRouterStore: NavigationRouterStoreProtocol {
// MARK: - Properties // MARK: - Properties
// FIXME: WeakDictionary does not work with protocol // WeakDictionary does not work with protocol
// Find a way to use NavigationRouterType as value // Find a way to use NavigationRouterType as value
private var navigationRouters = WeakDictionary<UINavigationController, NavigationRouter>() private var navigationRouters = WeakDictionary<UINavigationController, NavigationRouter>()
@ -74,7 +74,7 @@ class NavigationRouterStore: NavigationRouterStoreProtocol {
if let existingNavigationRouter = self.findNavigationRouter(for: navigationController) { if let existingNavigationRouter = self.findNavigationRouter(for: navigationController) {
fatalError("\(existingNavigationRouter) is already tied to the same navigation controller as \(navigationRouter). We should have only one NavigationRouter per navigation controller") fatalError("\(existingNavigationRouter) is already tied to the same navigation controller as \(navigationRouter). We should have only one NavigationRouter per navigation controller")
} else { } else {
// FIXME: WeakDictionary does not work with protocol // WeakDictionary does not work with protocol
// Find a way to avoid this cast // Find a way to avoid this cast
self.navigationRouters[navigationController] = navigationRouter as? NavigationRouter self.navigationRouters[navigationController] = navigationRouter as? NavigationRouter
} }