pr suggestion rename isPrivate to isVisibilityPrivate

This commit is contained in:
Mauro Romito
2026-01-22 15:54:03 +01:00
committed by Mauro
parent 4852c88617
commit 7d47a290ee
4 changed files with 9 additions and 9 deletions
@@ -136,7 +136,7 @@ class CreateRoomScreenViewModel: CreateRoomScreenViewModelType, CreateRoomScreen
context.$viewState context.$viewState
.dropFirst() .dropFirst()
.map(\.roomAccessType) .map(\.roomAccessType)
.filter(\.isPrivate) .filter(\.isVisibilityPrivate)
.removeDuplicates() .removeDuplicates()
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] _ in .sink { [weak self] _ in
@@ -156,7 +156,7 @@ class CreateRoomScreenViewModel: CreateRoomScreenViewModelType, CreateRoomScreen
return return
} }
guard !state.roomAccessType.isPrivate, guard !state.roomAccessType.isVisibilityPrivate,
let canonicalAlias = String.makeCanonicalAlias(aliasLocalPart: aliasLocalPart, let canonicalAlias = String.makeCanonicalAlias(aliasLocalPart: aliasLocalPart,
serverName: state.serverName) else { serverName: state.serverName) else {
// While is empty or private room we don't change or display the error // While is empty or private room we don't change or display the error
@@ -209,7 +209,7 @@ class CreateRoomScreenViewModel: CreateRoomScreenViewModelType, CreateRoomScreen
showLoadingIndicator() showLoadingIndicator()
// Better to double check the errors also when trying to create the room // Better to double check the errors also when trying to create the room
if !state.roomAccessType.isPrivate { if !state.roomAccessType.isVisibilityPrivate {
guard let canonicalAlias = String.makeCanonicalAlias(aliasLocalPart: state.aliasLocalPart, guard let canonicalAlias = String.makeCanonicalAlias(aliasLocalPart: state.aliasLocalPart,
serverName: state.serverName), serverName: state.serverName),
isRoomAliasFormatValid(alias: canonicalAlias) else { isRoomAliasFormatValid(alias: canonicalAlias) else {
@@ -261,7 +261,7 @@ class CreateRoomScreenViewModel: CreateRoomScreenViewModelType, CreateRoomScreen
isSpace: state.isSpace, isSpace: state.isSpace,
userIDs: [], // The invite users screen is shown next so we don't need to invite anyone right now. userIDs: [], // The invite users screen is shown next so we don't need to invite anyone right now.
avatarURL: avatarURL, avatarURL: avatarURL,
aliasLocalPart: state.roomAccessType.isPrivate ? nil : state.aliasLocalPart) { aliasLocalPart: state.roomAccessType.isVisibilityPrivate ? nil : state.aliasLocalPart) {
case .success(let roomID): case .success(let roomID):
guard case let .joined(roomProxy) = await userSession.clientProxy.roomForIdentifier(roomID) else { guard case let .joined(roomProxy) = await userSession.clientProxy.roomForIdentifier(roomID) else {
state.bindings.alertInfo = AlertInfo(id: .failedCreatingRoom, state.bindings.alertInfo = AlertInfo(id: .failedCreatingRoom,
@@ -43,7 +43,7 @@ struct CreateRoomScreen: View {
selectSpaceSection selectSpaceSection
} }
roomAccessSection roomAccessSection
if !context.viewState.roomAccessType.isPrivate { if !context.viewState.roomAccessType.isVisibilityPrivate {
roomAliasSection roomAliasSection
} }
} }
@@ -1378,15 +1378,15 @@ private extension CreateRoomAccessType {
} }
var visibility: RoomVisibility { var visibility: RoomVisibility {
isPrivate ? .private : .public isVisibilityPrivate ? .private : .public
} }
var preset: RoomPreset { var preset: RoomPreset {
isPrivate ? .privateChat : .publicChat isVisibilityPrivate ? .privateChat : .publicChat
} }
var historyVisibilityOverride: RoomHistoryVisibility? { var historyVisibilityOverride: RoomHistoryVisibility? {
isPrivate ? .invited : nil isVisibilityPrivate ? .invited : nil
} }
var joinRuleOverride: JoinRule? { var joinRuleOverride: JoinRule? {
@@ -55,7 +55,7 @@ enum CreateRoomAccessType: Equatable {
case askToJoin case askToJoin
case `private` case `private`
var isPrivate: Bool { var isVisibilityPrivate: Bool {
switch self { switch self {
case .private, .spaceMembers, .askToJoinWithSpaceMembers: case .private, .spaceMembers, .askToJoinWithSpaceMembers:
true true