Cleanup scaffolding

RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift

@@ -18,7 +18,7 @@ import CommonKit
 import SwiftUI
 
 struct PollHistoryCoordinatorParameters {
-    let promptType: PollHistoryPromptType
+    let mode: PollHistoryMode
 }
 
 final class PollHistoryCoordinator: Coordinator, Presentable {
@@ -31,12 +31,12 @@ final class PollHistoryCoordinator: Coordinator, Presentable {
 
     // Must be used only internally
     var childCoordinators: [Coordinator] = []
-    var completion: ((PollHistoryViewModelResult) -> Void)?
+    var completion: (() -> Void)?
     
     init(parameters: PollHistoryCoordinatorParameters) {
         self.parameters = parameters
         
-        let viewModel = PollHistoryViewModel(promptType: parameters.promptType)
+        let viewModel = PollHistoryViewModel(mode: parameters.mode)
         let view = PollHistory(viewModel: viewModel.context)
         pollHistoryViewModel = viewModel
         pollHistoryHostingController = VectorHostingController(rootView: view)
@@ -49,9 +49,7 @@ final class PollHistoryCoordinator: Coordinator, Presentable {
     func start() {
         MXLog.debug("[PollHistoryCoordinator] did start.")
         pollHistoryViewModel.completion = { [weak self] result in
-            guard let self = self else { return }
-            MXLog.debug("[PollHistoryCoordinator] PollHistoryViewModel did complete with result: \(result).")
-            self.completion?(result)
+            self?.completion?()
         }
     }
     

RiotSwiftUI/Modules/Room/PollHistory/MockPollHistoryScreenState.swift

@@ -23,32 +23,31 @@ enum MockPollHistoryScreenState: MockScreenState, CaseIterable {
     // A case for each state you want to represent
     // with specific, minimal associated data that will allow you
     // mock that screen.
-    case promptType(PollHistoryPromptType)
+    case active
+    case past
     
     /// The associated screen
     var screenType: Any.Type {
         PollHistory.self
     }
     
-    /// A list of screen state definitions
-    static var allCases: [MockPollHistoryScreenState] {
-        // Each of the presence statuses
-        PollHistoryPromptType.allCases.map(MockPollHistoryScreenState.promptType)
-    }
-    
     /// Generate the view struct for the screen state.
     var screenView: ([Any], AnyView) {
-        let promptType: PollHistoryPromptType
+        let pollHistoryMode: PollHistoryMode
+        
         switch self {
-        case .promptType(let type):
-            promptType = type
+        case .active:
+            pollHistoryMode = .active
+        case .past:
+            pollHistoryMode = .past
         }
-        let viewModel = PollHistoryViewModel(promptType: promptType)
+        
+        let viewModel = PollHistoryViewModel(mode: pollHistoryMode)
         
         // can simulate service and viewModel actions here if needs be.
         
         return (
-            [promptType, viewModel],
+            [pollHistoryMode, viewModel],
             AnyView(PollHistory(viewModel: viewModel.context)
                 .addDependency(MockAvatarService.example))
         )

RiotSwiftUI/Modules/Room/PollHistory/PollHistoryModels.swift

@@ -14,54 +14,31 @@
 // limitations under the License.
 //
 
-import Foundation
-
-// MARK: - Coordinator
-
-enum PollHistoryPromptType {
-    case regular
-    case upgrade
-}
-
-extension PollHistoryPromptType: Identifiable, CaseIterable {
-    var id: Self { self }
-    
-    var title: String {
-        switch self {
-        case .regular:
-            return VectorL10n.roomCreationMakePublicPromptTitle
-        case .upgrade:
-            return VectorL10n.roomDetailsHistorySectionPromptTitle
-        }
-    }
-    
-    var image: ImageAsset {
-        switch self {
-        case .regular:
-            return Asset.Images.appSymbol
-        case .upgrade:
-            return Asset.Images.keyVerificationSuccessShield
-        }
-    }
-}
-
 // MARK: View model
 
-enum PollHistoryViewModelResult {
-    case accept
-    case cancel
+enum PollHistoryViewModelResult: Equatable {
+    #warning("e.g. show poll detail")
 }
 
 // MARK: View
 
+enum PollHistoryMode {
+    case active
+    case past
+}
+
+struct PollHistoryViewBindings {
+    var mode: PollHistoryMode
+}
+
 struct PollHistoryViewState: BindableState {
-    var promptType: PollHistoryPromptType
-    var count: Int
+    init(mode: PollHistoryMode) {
+        self.bindings = .init(mode: mode)
+    }
+    
+    var bindings: PollHistoryViewBindings
 }
 
 enum PollHistoryViewAction {
-    case incrementCount
-    case decrementCount
-    case accept
-    case cancel
+    #warning("e.g. show poll detail")
 }

RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift

@@ -21,22 +21,13 @@ typealias PollHistoryViewModelType = StateStoreViewModel<PollHistoryViewState, P
 class PollHistoryViewModel: PollHistoryViewModelType, PollHistoryViewModelProtocol {
     var completion: ((PollHistoryViewModelResult) -> Void)?
 
-    init(promptType: PollHistoryPromptType, initialCount: Int = 0) {
-        super.init(initialViewState: PollHistoryViewState(promptType: promptType, count: 0))
+    init(mode: PollHistoryMode) {
+        super.init(initialViewState: PollHistoryViewState(mode: mode))
     }
 
     // MARK: - Public
 
     override func process(viewAction: PollHistoryViewAction) {
-        switch viewAction {
-        case .accept:
-            completion?(.accept)
-        case .cancel:
-            completion?(.cancel)
-        case .incrementCount:
-            state.count += 1
-        case .decrementCount:
-            state.count -= 1
-        }
+
     }
 }

RiotSwiftUI/Modules/Room/PollHistory/View/PollHistory.swift

@@ -18,77 +18,13 @@ import SwiftUI
 
 struct PollHistory: View {
     @Environment(\.theme) private var theme
-    @Environment(\.horizontalSizeClass) private var horizontalSizeClass
-    
-    private var horizontalPadding: CGFloat {
-        horizontalSizeClass == .regular ? 50 : 16
-    }
     
     @ObservedObject var viewModel: PollHistoryViewModel.Context
     
     var body: some View {
-        GeometryReader { geometry in
-            VStack {
-                ScrollView(showsIndicators: false) {
-                    mainContent
-                        .padding(.top, 50)
-                        .padding(.horizontal, horizontalPadding)
-                }
-                
-                buttons
-                    .padding(.horizontal, horizontalPadding)
-                    .padding(.bottom, geometry.safeAreaInsets.bottom > 0 ? 0 : 16)
-            }
-        }
-        .background(theme.colors.background.ignoresSafeArea())
-        .accentColor(theme.colors.accent)
-    }
-    
-    /// The main content of the view to be shown in a scroll view.
-    var mainContent: some View {
-        VStack(spacing: 36) {
-            Text(viewModel.viewState.promptType.title)
-                .font(theme.fonts.title1B)
-                .foregroundColor(theme.colors.primaryContent)
-                .accessibilityIdentifier("title")
-            
-            Image(viewModel.viewState.promptType.image.name)
-                .resizable()
-                .scaledToFit()
-                .frame(width: 100)
-                .foregroundColor(theme.colors.accent)
-            
-            HStack {
-                Text("Counter: \(viewModel.viewState.count)")
-                    .foregroundColor(theme.colors.primaryContent)
-                
-                Button("-") {
-                    viewModel.send(viewAction: .decrementCount)
-                }
-                
-                Button("+") {
-                    viewModel.send(viewAction: .incrementCount)
-                }
-            }
-            .font(theme.fonts.title3)
-        }
-    }
-    
-    /// The action buttons shown at the bottom of the view.
-    var buttons: some View {
-        VStack {
-            Button { viewModel.send(viewAction: .accept) } label: {
-                Text("Accept")
-                    .font(theme.fonts.bodySB)
-            }
-            .buttonStyle(PrimaryActionButtonStyle())
-            
-            Button { viewModel.send(viewAction: .cancel) } label: {
-                Text("Cancel")
-                    .font(theme.fonts.body)
-                    .padding(.vertical, 12)
-            }
-        }
+        Text("Hello world")
+            .background(theme.colors.background.ignoresSafeArea())
+            .accentColor(theme.colors.accent)
     }
 }