mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
Replace a debugging visibility check with the real condition. (#4982)
This commit is contained in:
@@ -18,6 +18,7 @@ struct ClientProxyMockConfiguration {
|
|||||||
var roomSummaryProvider: RoomSummaryProviderProtocol = RoomSummaryProviderMock(.init())
|
var roomSummaryProvider: RoomSummaryProviderProtocol = RoomSummaryProviderMock(.init())
|
||||||
var spaceServiceConfiguration: SpaceServiceProxyMock.Configuration = .init()
|
var spaceServiceConfiguration: SpaceServiceProxyMock.Configuration = .init()
|
||||||
var roomPreviews: [RoomPreviewProxyProtocol]?
|
var roomPreviews: [RoomPreviewProxyProtocol]?
|
||||||
|
var defaultRoomMembers: [RoomMemberProxyMock] = .allMembers
|
||||||
var roomDirectorySearchProxy: RoomDirectorySearchProxyProtocol?
|
var roomDirectorySearchProxy: RoomDirectorySearchProxyProtocol?
|
||||||
var overrides = Overrides()
|
var overrides = Overrides()
|
||||||
|
|
||||||
@@ -119,12 +120,12 @@ extension ClientProxyMock {
|
|||||||
let roomProxy = await KnockedRoomProxyMock(.init(id: room.id, name: room.name))
|
let roomProxy = await KnockedRoomProxyMock(.init(id: room.id, name: room.name))
|
||||||
return .knocked(roomProxy)
|
return .knocked(roomProxy)
|
||||||
default:
|
default:
|
||||||
let roomProxy = await JoinedRoomProxyMock(.init(id: room.id, name: room.name, isSpace: room.isSpace))
|
let roomProxy = await JoinedRoomProxyMock(.init(id: room.id, name: room.name, isSpace: room.isSpace, members: configuration.defaultRoomMembers))
|
||||||
roomProxy.loadOrFetchEventDetailsForReturnValue = .success(TimelineEventSDKMock())
|
roomProxy.loadOrFetchEventDetailsForReturnValue = .success(TimelineEventSDKMock())
|
||||||
return .joined(roomProxy)
|
return .joined(roomProxy)
|
||||||
}
|
}
|
||||||
} else if let spaceServiceRoom = configuration.spaceServiceConfiguration.topLevelSpaces.first(where: { $0.id == identifier }) {
|
} else if let spaceServiceRoom = configuration.spaceServiceConfiguration.topLevelSpaces.first(where: { $0.id == identifier }) {
|
||||||
let roomProxy = await JoinedRoomProxyMock(.init(id: spaceServiceRoom.id, name: spaceServiceRoom.name, isSpace: spaceServiceRoom.isSpace))
|
let roomProxy = await JoinedRoomProxyMock(.init(id: spaceServiceRoom.id, name: spaceServiceRoom.name, isSpace: spaceServiceRoom.isSpace, members: configuration.defaultRoomMembers))
|
||||||
roomProxy.loadOrFetchEventDetailsForReturnValue = .success(TimelineEventSDKMock())
|
roomProxy.loadOrFetchEventDetailsForReturnValue = .success(TimelineEventSDKMock())
|
||||||
return .joined(roomProxy)
|
return .joined(roomProxy)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ struct SpaceScreen: View {
|
|||||||
// controller attempts to anchor itself to the button that is no longer visible.
|
// controller attempts to anchor itself to the button that is no longer visible.
|
||||||
ToolbarItem(placement: .primaryAction) {
|
ToolbarItem(placement: .primaryAction) {
|
||||||
Menu {
|
Menu {
|
||||||
if true {
|
if context.viewState.canEditChildren {
|
||||||
Section {
|
Section {
|
||||||
Button { context.send(viewAction: .addExistingRooms) } label: {
|
Button { context.send(viewAction: .addExistingRooms) } label: {
|
||||||
Label(L10n.actionAddExistingRooms, icon: \.room)
|
Label(L10n.actionAddExistingRooms, icon: \.room)
|
||||||
|
|||||||
@@ -587,6 +587,7 @@ class MockScreen: Identifiable {
|
|||||||
appSettings.hasRunNotificationPermissionsOnboarding = true
|
appSettings.hasRunNotificationPermissionsOnboarding = true
|
||||||
appSettings.analyticsConsentState = .optedOut
|
appSettings.analyticsConsentState = .optedOut
|
||||||
appSettings.hasSeenSpacesAnnouncement = true
|
appSettings.hasSeenSpacesAnnouncement = true
|
||||||
|
appSettings.spaceSettingsEnabled = true
|
||||||
|
|
||||||
let roomSummaries: [RoomSummary] = if id == .userSessionSpacesFlow {
|
let roomSummaries: [RoomSummary] = if id == .userSessionSpacesFlow {
|
||||||
[[RoomSummary].mockSpaceInvites[0]] + .mockRooms
|
[[RoomSummary].mockSpaceInvites[0]] + .mockRooms
|
||||||
@@ -597,7 +598,8 @@ class MockScreen: Identifiable {
|
|||||||
deviceID: "MOCKCLIENT",
|
deviceID: "MOCKCLIENT",
|
||||||
roomSummaryProvider: RoomSummaryProviderMock(.init(state: .loaded(roomSummaries))),
|
roomSummaryProvider: RoomSummaryProviderMock(.init(state: .loaded(roomSummaries))),
|
||||||
spaceServiceConfiguration: .init(topLevelSpaces: .mockSpaceList.filter(\.isSpace) + .mockSingleRoom),
|
spaceServiceConfiguration: .init(topLevelSpaces: .mockSpaceList.filter(\.isSpace) + .mockSingleRoom),
|
||||||
roomPreviews: [SpaceServiceRoomProtocol].mockSpaceList.map(RoomPreviewProxyMock.init)))
|
roomPreviews: [SpaceServiceRoomProtocol].mockSpaceList.map(RoomPreviewProxyMock.init),
|
||||||
|
defaultRoomMembers: .allMembersAsAdmin))
|
||||||
clientProxy.recentlyVisitedRoomsFilterReturnValue = .mockRooms
|
clientProxy.recentlyVisitedRoomsFilterReturnValue = .mockRooms
|
||||||
|
|
||||||
// The tab bar remains hidden for the non-spaces tests as we don't supply any mock spaces.
|
// The tab bar remains hidden for the non-spaces tests as we don't supply any mock spaces.
|
||||||
|
|||||||
Reference in New Issue
Block a user