Address comments, show unencrypted rooms,

retain viewModel and services in ScreenSates so you can interact with Previews after the first state.

RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift

@@ -21,7 +21,7 @@ import SwiftUI
 protocol MockScreenState {
     static var screenStates: [MockScreenState] { get }
     var screenType: Any.Type { get }
-    var screenView: AnyView { get }
+    var screenView: ([Any], AnyView) { get }
     var stateTitle: String { get }
 }
 
@@ -29,8 +29,24 @@ protocol MockScreenState {
 extension MockScreenState {
     
     /// Get a list of the screens for every screen state.
-    static var screensViews: [AnyView] {
-        screenStates.map(\.screenView)
+    static var stateRenderer: StateRenderer {
+        let depsAndViews  = screenStates.map(\.screenView)
+        let deps = depsAndViews.map({ $0.0 })
+        let views = depsAndViews.map({ $0.1 })
+        let stateTitles = screenStates.map(\.stateTitle)
+        let fullScreenTitles = screenStates.map(\.fullScreenTitle)
+        
+        var states = [ScreenStateInfo]()
+        for i in 0..<deps.count {
+            let dep = deps[i]
+            let view = views[i]
+            let stateTitle = stateTitles[i]
+            let stateKey = screenStateKeys[i]
+            let fullScreenTitle = fullScreenTitles[i]
+            states.append(ScreenStateInfo(dependencies: dep, view: view, stateTitle: stateTitle, fullScreenTitle:fullScreenTitle, stateKey: stateKey))
+        }
+        
+        return StateRenderer(states: states)
     }
     
     /// A unique key to identify each screen state.
@@ -40,42 +56,6 @@ extension MockScreenState {
         }
     }
     
-    /// Render each of the screen states in a group applying
-    /// any optional environment variables.
-    /// - Parameters:
-    ///   - themeId: id of theme to render the screens with.
-    ///   - locale: Locale to render the screens with.
-    ///   - sizeCategory: type sizeCategory to render the screens with.
-    ///   - addNavigation: Wether to wrap the screens in a navigation view.
-    /// - Returns: The group of screens
-    static func screenGroup(
-        themeId: ThemeIdentifier = .light,
-        locale: Locale = Locale.current,
-        sizeCategory: ContentSizeCategory = ContentSizeCategory.medium,
-        addNavigation: Bool = false
-    ) -> some View {
-        Group {
-            ForEach(0..<screensViews.count) { i in
-                wrapWithNavigation(addNavigation, view: screensViews[i])
-                    .previewDisplayName(screenStates[i].stateTitle)
-            }
-        }
-        .theme(themeId)
-        .environment(\.locale, locale)
-        .environment(\.sizeCategory, sizeCategory)
-    }
-    
-    @ViewBuilder
-    static func wrapWithNavigation<V: View>(_ wrap: Bool, view: V) -> some View {
-        if wrap {
-            NavigationView{
-                view
-            }
-        } else {
-            view
-        }
-    }
-
     /// A title to represent the screen and it's screen state
     var screenName: String {
         "\(String(describing: screenType.self))"
@@ -90,7 +70,6 @@ extension MockScreenState {
     var fullScreenTitle: String {
         "\(screenName): \(stateTitle)"
     }
-    
 
 }