felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-26 11:30:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces

Browse Source 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
This commit is contained in:
Gil Eluard
2022-01-17 20:40:12 +01:00
parent cfd00fea40 3ea9de7c53
commit 044367bda5
394 changed files with 9646 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
+5 -3
View File
@@ -20,9 +20,8 @@ import Foundation
@available(iOS 14.0, *)
enum MockAppScreens {
static let appScreens: [MockScreenState.Type] = [
MockTemplateUserProfileScreenState.self,
MockTemplateRoomListScreenState.self,
MockTemplateRoomChatScreenState.self,
MockLocationSharingScreenState.self,
MockAnalyticsPromptScreenState.self,
MockUserSuggestionScreenState.self,
MockPollEditFormScreenState.self,
MockPollTimelineScreenState.self,
@@ -32,6 +31,9 @@ enum MockAppScreens {
MockSpaceCreationRoomsScreenState.self,
MockSpaceCreationSettingsScreenState.self,
MockSpaceCreationPostProcessScreenState.self,
MockTemplateUserProfileScreenState.self,
MockTemplateRoomListScreenState.self,
MockTemplateRoomChatScreenState.self
]
}