Merge branch 'main' into save-new-space-avatar

pull/1384/head
ggurdin 1 year ago committed by GitHub
commit 56d1f853c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -436,7 +436,9 @@ class ChatDetailsView extends StatelessWidget {
onTap: () => onTap: () =>
context.go('/rooms/${room.id}/invite'), context.go('/rooms/${room.id}/invite'),
), ),
if (room.showClassEditOptions && room.isSpace) if (room.showClassEditOptions &&
room.isSpace &&
!room.isSubspace)
SpaceDetailsToggleAddStudentsTile( SpaceDetailsToggleAddStudentsTile(
controller: controller, controller: controller,
), ),

@ -1,6 +1,8 @@
part of "pangea_room_extension.dart"; part of "pangea_room_extension.dart";
extension ChildrenAndParentsRoomExtension on Room { extension ChildrenAndParentsRoomExtension on Room {
bool get _isSubspace => _pangeaSpaceParents.isNotEmpty;
//note this only will return rooms that the user has joined or been invited to //note this only will return rooms that the user has joined or been invited to
List<Room> get _joinedChildren { List<Room> get _joinedChildren {
if (!isSpace) return []; if (!isSpace) return [];
@ -91,7 +93,7 @@ extension ChildrenAndParentsRoomExtension on Room {
String _nameIncludingParents(BuildContext context) { String _nameIncludingParents(BuildContext context) {
String nameSoFar = getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)); String nameSoFar = getLocalizedDisplayname(MatrixLocals(L10n.of(context)!));
Room currentRoom = this; Room currentRoom = this;
if (currentRoom.pangeaSpaceParents.isEmpty) { if (!currentRoom._isSubspace) {
return nameSoFar; return nameSoFar;
} }
currentRoom = currentRoom.pangeaSpaceParents.first; currentRoom = currentRoom.pangeaSpaceParents.first;
@ -100,7 +102,7 @@ extension ChildrenAndParentsRoomExtension on Room {
nameToAdd = nameToAdd =
nameToAdd.length <= 10 ? nameToAdd : "${nameToAdd.substring(0, 10)}..."; nameToAdd.length <= 10 ? nameToAdd : "${nameToAdd.substring(0, 10)}...";
nameSoFar = '$nameToAdd > $nameSoFar'; nameSoFar = '$nameToAdd > $nameSoFar';
if (currentRoom.pangeaSpaceParents.isEmpty) { if (!currentRoom._isSubspace) {
return nameSoFar; return nameSoFar;
} }
return "... > $nameSoFar"; return "... > $nameSoFar";

@ -122,6 +122,9 @@ extension PangeaRoom on Room {
}) async => }) async =>
await _pangeaSetSpaceChild(roomId, suggested: suggested); await _pangeaSetSpaceChild(roomId, suggested: suggested);
/// Checks if this space has a parent space
bool get isSubspace => _isSubspace;
// class_and_exchange_settings // class_and_exchange_settings
DateTime? get rulesUpdatedAt => _rulesUpdatedAt; DateTime? get rulesUpdatedAt => _rulesUpdatedAt;

Loading…
Cancel
Save