Add Screen suffix to all screens.

element-hq · Jun 30, 2022 · 1e1bf46 · 1e1bf46
1 parent 83a25d5
commit 1e1bf46
Show file tree

Hide file tree

Showing 19 changed files with 137 additions and 133 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -59,7 +59,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/matrix-org/matrix-rust-components-swift.git",
       "state" : {
-        "revision" : "4605577f5604b4f2bb1938eb06d69d996eb32a28",
+        "revision" : "7d5bdf05ff97e2229cb504982162fc02c37c58e5",
         "version" : "1.0.11-alpha"
       }
     },

diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1200"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"

diff --git a/ElementX/Sources/Screens/BugReport/BugReportCoordinator.swift b/ElementX/Sources/Screens/BugReport/BugReportCoordinator.swift
@@ -48,7 +48,7 @@ final class BugReportCoordinator: Coordinator, Presentable {
 
         let viewModel = BugReportViewModel(bugReportService: parameters.bugReportService,
                                            screenshot: parameters.screenshot)
-        let view = BugReport(context: viewModel.context)
+        let view = BugReportScreen(context: viewModel.context)
         bugReportViewModel = viewModel
         bugReportHostingController = UIHostingController(rootView: view)
 

diff --git a/...es/Screens/BugReport/View/BugReport.swift → ...eens/BugReport/View/BugReportScreen.swift b/...es/Screens/BugReport/View/BugReport.swift → ...eens/BugReport/View/BugReportScreen.swift
@@ -16,7 +16,7 @@
 
 import SwiftUI
 
-struct BugReport: View {
+struct BugReportScreen: View {
 
     // MARK: Private
 
@@ -139,7 +139,7 @@ struct BugReport_Previews: PreviewProvider {
     @ViewBuilder
     static var body: some View {
         let viewModel = BugReportViewModel(bugReportService: MockBugReportService(), screenshot: Asset.Images.appLogo.image)
-        BugReport(context: viewModel.context)
+        BugReportScreen(context: viewModel.context)
             .previewInterfaceOrientation(.portrait)
     }
 }
diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
@@ -159,22 +159,18 @@ struct MessageComposerTextField_Previews: PreviewProvider {
     @ViewBuilder
     static var body: some View {
         VStack {
-            PreviewWrapper()
-            PlaceholderPreviewWrapper()
+            PreviewWrapper(text: "123")
+            PreviewWrapper(text: "")
         }
     }
 
     struct PreviewWrapper: View {
-        @State(initialValue: "123") var text: String
-
-        var body: some View {
-            MessageComposerTextField(placeholder: "Placeholder", text: $text, maxHeight: 300)
+        @State var text: String
+        
+        init(text: String) {
+            _text = .init(initialValue: text)
         }
-    }
-
-    struct PlaceholderPreviewWrapper: View {
-        @State(initialValue: "") var text: String
-
+
         var body: some View {
             MessageComposerTextField(placeholder: "Placeholder", text: $text, maxHeight: 300)
         }

diff --git a/ElementX/Sources/Screens/Settings/SettingsCoordinator.swift b/ElementX/Sources/Screens/Settings/SettingsCoordinator.swift
@@ -51,7 +51,7 @@ final class SettingsCoordinator: Coordinator, Presentable {
         self.parameters = parameters
 
         let viewModel = SettingsViewModel()
-        let view = Settings(context: viewModel.context)
+        let view = SettingsScreen(context: viewModel.context)
         settingsViewModel = viewModel
         settingsHostingController = UIHostingController(rootView: view)
 

diff --git a/...rces/Screens/Settings/View/Settings.swift → ...creens/Settings/View/SettingsScreen.swift b/...rces/Screens/Settings/View/Settings.swift → ...creens/Settings/View/SettingsScreen.swift
@@ -16,7 +16,7 @@
 
 import SwiftUI
 
-struct Settings: View {
+struct SettingsScreen: View {
 
     // MARK: Private
 
@@ -128,7 +128,7 @@ struct Settings_Previews: PreviewProvider {
     @ViewBuilder
     static var body: some View {
         let viewModel = SettingsViewModel()
-        Settings(context: viewModel.context)
+        SettingsScreen(context: viewModel.context)
             .previewInterfaceOrientation(.portrait)
     }
 }
diff --git a/ElementX/Sources/Screens/SplashScreen/View/SplashScreen.swift b/ElementX/Sources/Screens/SplashScreen/View/SplashScreen.swift
@@ -49,12 +49,12 @@ struct SplashScreen: View {
                 HStack(alignment: .top, spacing: 0) {
 
                     // Add a hidden page at the start of the carousel duplicating the content of the last page
-                    SplashScreenPage(content: context.viewState.content[pageCount - 1])
+                    SplashScreenPageView(content: context.viewState.content[pageCount - 1])
                         .frame(width: geometry.size.width)
                         .accessibilityIdentifier("hiddenPage")
 
                     ForEach(0..<pageCount, id: \.self) { index in
-                        SplashScreenPage(content: context.viewState.content[index])
+                        SplashScreenPageView(content: context.viewState.content[index])
                             .frame(width: geometry.size.width)
                     }
 

diff --git a/.../SplashScreen/View/SplashScreenPage.swift → ...ashScreen/View/SplashScreenPageView.swift b/.../SplashScreen/View/SplashScreenPage.swift → ...ashScreen/View/SplashScreenPageView.swift
@@ -16,7 +16,7 @@
 
 import SwiftUI
 
-struct SplashScreenPage: View {
+struct SplashScreenPageView: View {
 
     // MARK: - Properties
 
@@ -59,7 +59,7 @@ struct SplashScreenPage_Previews: PreviewProvider {
     static let content = SplashScreenViewState().content
     static var previews: some View {
         ForEach(0..<content.count, id: \.self) { index in
-            SplashScreenPage(content: content[index])
+            SplashScreenPageView(content: content[index])
         }
     }
 }
diff --git a/ElementX/Sources/UITestsAppCoordinator.swift b/ElementX/Sources/UITestsAppCoordinator.swift
@@ -62,9 +62,9 @@ struct MockScreen: Identifiable {
             return LoginCoordinator(parameters: .init(navigationRouter: router,
                                                       homeserver: .mockUnsupported))
         case .simpleRegular:
-            return TemplateSimpleScreenCoordinator(parameters: .init(promptType: .regular))
+            return TemplateCoordinator(parameters: .init(promptType: .regular))
         case .simpleUpgrade:
-            return TemplateSimpleScreenCoordinator(parameters: .init(promptType: .upgrade))
+            return TemplateCoordinator(parameters: .init(promptType: .upgrade))
         case .settings:
             let router = NavigationRouter(navigationController: ElementNavigationController())
             return SettingsCoordinator(parameters: .init(navigationRouter: router,

diff --git a/...ntX/TemplateSimpleScreenCoordinator.swift → ...xample/ElementX/TemplateCoordinator.swift b/...ntX/TemplateSimpleScreenCoordinator.swift → ...xample/ElementX/TemplateCoordinator.swift
@@ -16,24 +16,24 @@
 
 import SwiftUI
 
-struct TemplateSimpleScreenCoordinatorParameters {
-    let promptType: TemplateSimpleScreenPromptType
+struct TemplateCoordinatorParameters {
+    let promptType: TemplatePromptType
 }
 
-enum TemplateSimpleScreenCoordinatorAction {
+enum TemplateCoordinatorAction {
     case accept
     case cancel
 }
 
-final class TemplateSimpleScreenCoordinator: Coordinator, Presentable {
+final class TemplateCoordinator: Coordinator, Presentable {
 
     // MARK: - Properties
 
     // MARK: Private
 
-    private let parameters: TemplateSimpleScreenCoordinatorParameters
-    private let templateSimpleScreenHostingController: UIViewController
-    private var templateSimpleScreenViewModel: TemplateSimpleScreenViewModelProtocol
+    private let parameters: TemplateCoordinatorParameters
+    private let templateHostingController: UIViewController
+    private var templateViewModel: TemplateViewModelProtocol
 
     private var indicatorPresenter: UserIndicatorTypePresenterProtocol
     private var loadingIndicator: UserIndicator?
@@ -42,28 +42,28 @@ final class TemplateSimpleScreenCoordinator: Coordinator, Presentable {
 
     // Must be used only internally
     var childCoordinators: [Coordinator] = []
-    var callback: ((TemplateSimpleScreenCoordinatorAction) -> Void)?
+    var callback: ((TemplateCoordinatorAction) -> Void)?
 
     // MARK: - Setup
 
-    init(parameters: TemplateSimpleScreenCoordinatorParameters) {
+    init(parameters: TemplateCoordinatorParameters) {
         self.parameters = parameters
 
-        let viewModel = TemplateSimpleScreenViewModel(promptType: parameters.promptType)
-        let view = TemplateSimpleScreen(context: viewModel.context)
-        templateSimpleScreenViewModel = viewModel
-        templateSimpleScreenHostingController = UIHostingController(rootView: view)
+        let viewModel = TemplateViewModel(promptType: parameters.promptType)
+        let view = TemplateScreen(context: viewModel.context)
+        templateViewModel = viewModel
+        templateHostingController = UIHostingController(rootView: view)
 
-        indicatorPresenter = UserIndicatorTypePresenter(presentingViewController: templateSimpleScreenHostingController)
+        indicatorPresenter = UserIndicatorTypePresenter(presentingViewController: templateHostingController)
     }
 
     // MARK: - Public
 
     func start() {
-        MXLog.debug("[TemplateSimpleScreenCoordinator] did start.")
-        templateSimpleScreenViewModel.callback = { [weak self] action in
+        MXLog.debug("[TemplateCoordinator] did start.")
+        templateViewModel.callback = { [weak self] action in
             guard let self = self else { return }
-            MXLog.debug("[TemplateSimpleScreenCoordinator] TemplateSimpleScreenViewModel did complete with result: \(action).")
+            MXLog.debug("[TemplateCoordinator] TemplateViewModel did complete with result: \(action).")
             switch action {
             case .accept:
                 self.callback?(.accept)
@@ -74,7 +74,7 @@ final class TemplateSimpleScreenCoordinator: Coordinator, Presentable {
     }
 
     func toPresentable() -> UIViewController {
-        templateSimpleScreenHostingController
+        templateHostingController
     }
 
     // MARK: - Private

diff --git a/...ElementX/TemplateSimpleScreenModels.swift → ...reenExample/ElementX/TemplateModels.swift b/...ElementX/TemplateSimpleScreenModels.swift → ...reenExample/ElementX/TemplateModels.swift
@@ -18,12 +18,12 @@ import Foundation
 
 // MARK: - Coordinator
 
-enum TemplateSimpleScreenPromptType {
+enum TemplatePromptType {
     case regular
     case upgrade
 }
 
-extension TemplateSimpleScreenPromptType: Identifiable, CaseIterable {
+extension TemplatePromptType: Identifiable, CaseIterable {
     var id: Self { self }
 
     var title: String {
@@ -47,19 +47,19 @@ extension TemplateSimpleScreenPromptType: Identifiable, CaseIterable {
 
 // MARK: View model
 
-enum TemplateSimpleScreenViewModelAction {
+enum TemplateViewModelAction {
     case accept
     case cancel
 }
 
 // MARK: View
 
-struct TemplateSimpleScreenViewState: BindableState {
-    var promptType: TemplateSimpleScreenPromptType
+struct TemplateViewState: BindableState {
+    var promptType: TemplatePromptType
     var count: Int
 }
 
-enum TemplateSimpleScreenViewAction {
+enum TemplateViewAction {
     case incrementCount
     case decrementCount
     case accept

diff --git a/...mentX/TemplateSimpleScreenViewModel.swift → ...nExample/ElementX/TemplateViewModel.swift b/...mentX/TemplateSimpleScreenViewModel.swift → ...nExample/ElementX/TemplateViewModel.swift
@@ -16,27 +16,27 @@
 
 import SwiftUI
 
-typealias TemplateSimpleScreenViewModelType = StateStoreViewModel<TemplateSimpleScreenViewState, TemplateSimpleScreenViewAction>
+typealias TemplateViewModelType = StateStoreViewModel<TemplateViewState, TemplateViewAction>
 
-class TemplateSimpleScreenViewModel: TemplateSimpleScreenViewModelType, TemplateSimpleScreenViewModelProtocol {
+class TemplateViewModel: TemplateViewModelType, TemplateViewModelProtocol {
 
     // MARK: - Properties
 
     // MARK: Private
 
     // MARK: Public
 
-    var callback: ((TemplateSimpleScreenViewModelAction) -> Void)?
+    var callback: ((TemplateViewModelAction) -> Void)?
 
     // MARK: - Setup
 
-    init(promptType: TemplateSimpleScreenPromptType, initialCount: Int = 0) {
-        super.init(initialViewState: TemplateSimpleScreenViewState(promptType: promptType, count: 0))
+    init(promptType: TemplatePromptType, initialCount: Int = 0) {
+        super.init(initialViewState: TemplateViewState(promptType: promptType, count: 0))
     }
 
     // MARK: - Public
 
-    override func process(viewAction: TemplateSimpleScreenViewAction) async {
+    override func process(viewAction: TemplateViewAction) async {
         switch viewAction {
         case .accept:
             callback?(.accept)

diff --git a/...mplateSimpleScreenViewModelProtocol.swift → .../ElementX/TemplateViewModelProtocol.swift b/...mplateSimpleScreenViewModelProtocol.swift → .../ElementX/TemplateViewModelProtocol.swift
@@ -17,7 +17,7 @@
 import Foundation
 
 @MainActor
-protocol TemplateSimpleScreenViewModelProtocol {
-    var callback: ((TemplateSimpleScreenViewModelAction) -> Void)? { get set }
-    var context: TemplateSimpleScreenViewModelType.Context { get }
+protocol TemplateViewModelProtocol {
+    var callback: ((TemplateViewModelAction) -> Void)? { get set }
+    var context: TemplateViewModelType.Context { get }
 }