Merge branch 'develop' into gil/143_create_public_space

# Conflicts:
#	Common/Mock/MockAppScreens.swift

RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift

@@ -20,9 +20,7 @@ import Foundation
 @available(iOS 14.0, *)
 enum MockAppScreens {
     static let appScreens: [MockScreenState.Type] = [
-        MockTemplateUserProfileScreenState.self,
-        MockTemplateRoomListScreenState.self,
-        MockTemplateRoomChatScreenState.self,
+        MockAnalyticsPromptScreenState.self,
         MockUserSuggestionScreenState.self,
         MockPollEditFormScreenState.self,
         MockPollTimelineScreenState.self,
@@ -32,6 +30,9 @@ enum MockAppScreens {
         MockSpaceCreationRoomsScreenState.self,
         MockSpaceCreationSettingsScreenState.self,
         MockSpaceCreationPostProcessScreenState.self,
+        MockTemplateUserProfileScreenState.self,
+        MockTemplateRoomListScreenState.self,
+        MockTemplateRoomChatScreenState.self
     ]
 }
 

RiotSwiftUI/Modules/Common/Mock/MockScreenState.swift

@@ -22,7 +22,6 @@ protocol MockScreenState {
     static var screenStates: [MockScreenState] { get }
     var screenType: Any.Type { get }
     var screenView: ([Any], AnyView) { get }
-    var stateTitle: String { get }
 }
 
 @available(iOS 14.0, *)
@@ -33,44 +32,32 @@ extension MockScreenState {
         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)
+        let titles = screenStates.map(\.title)
         
         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))
+            let screenTitle = titles[i]
+            states.append(ScreenStateInfo(dependencies: dep, view: view, screenTitle: screenTitle))
         }
         
         return StateRenderer(states: states)
     }
     
-    /// A unique key to identify each screen state.
-    static var screenStateKeys: [String] {
-        return screenStates.enumerated().map { (index, state) in
-            state.screenName + String(index)
-        }
+    /// All available screen state keys
+    static var screenNames: [String] {
+        screenStates.map { $0.title }
     }
     
     /// A title to represent the screen and it's screen state
-    var screenName: String {
-        "\(String(describing: screenType.self))"
+    var title: String {
+        "\(simpleTypeName(screenType.self)): \(simpleTypeName(self))"
     }
     
-    /// A title to represent this screen state
-    var stateTitle: String {
-        String(describing: self)
+    private func simpleTypeName(_ type: Any) -> String {
+        String(describing: type).components(separatedBy: .punctuationCharacters).filter { $0.count > 0}.last!
     }
-    
-    /// A title to represent the screen and it's screen state
-    var fullScreenTitle: String {
-        "\(screenName): \(stateTitle)"
-    }
-
 }
 
 @available(iOS 14.0, *)

RiotSwiftUI/Modules/Common/Mock/ScreenList.swift

@@ -33,8 +33,7 @@ struct ScreenList: View {
                 ForEach(0..<allStates.count) { i in
                     let state = allStates[i]
                     NavigationLink(destination: state.view) {
-                        Text(state.fullScreenTitle)
-                            .accessibilityIdentifier(state.stateKey)
+                        Text(state.screenTitle)
                     }
                 }
             }

RiotSwiftUI/Modules/Common/Mock/ScreenStateInfo.swift

@@ -21,7 +21,5 @@ import SwiftUI
 struct ScreenStateInfo {
     var dependencies: [Any]
     var view: AnyView
-    var stateTitle: String
-    var fullScreenTitle: String
-    var stateKey: String
+    var screenTitle: String
 }

RiotSwiftUI/Modules/Common/Mock/StateRenderer.swift

@@ -39,7 +39,7 @@ class StateRenderer {
             ForEach(0..<states.count) { i in
                 let state = self.states[i]
                 Self.wrapWithNavigation(addNavigation, view: state.view)
-                    .previewDisplayName(state.stateTitle)
+                    .previewDisplayName(state.screenTitle)
             }
         }
     }