Merge branch 'main' into email-late-notice
This commit is contained in:
commit
4b2d68d180
5 changed files with 11 additions and 24 deletions
|
|
@ -2123,7 +2123,7 @@
|
|||
"placeholders": {}
|
||||
},
|
||||
"writeAMessage": "Write a message…",
|
||||
"writeAMessageFlag": "Write a message in {l1flag} or {l2flag}…",
|
||||
"writeAMessageFlag": "Write a message in {l1flag} or {l2flag}",
|
||||
"@writeAMessageFlag": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
|
|
|
|||
|
|
@ -4590,7 +4590,7 @@
|
|||
"autoPlayDesc": "Cuando está activado, el audio de texto a voz de los mensajes se reproducirá automáticamente cuando se seleccione.",
|
||||
"presenceStyle": "Presencia:",
|
||||
"presencesToggle": "Mostrar mensajes de estado de otros usuarios",
|
||||
"writeAMessageFlag": "Escribe un mensaje en {l1flag} o {l2flag}...",
|
||||
"writeAMessageFlag": "Escribe un mensaje en {l1flag} o {l2flag}",
|
||||
"@writeAMessageFlag": {
|
||||
"type": "text",
|
||||
"placeholders": {
|
||||
|
|
|
|||
|
|
@ -176,22 +176,6 @@ class InvitationSelectionController extends State<InvitationSelection> {
|
|||
Future<void> inviteTeacherAction(Room room, String id) async {
|
||||
await room.invite(id);
|
||||
await room.setPower(id, ClassDefaultValues.powerLevelOfAdmin);
|
||||
if (room.isSpace) {
|
||||
for (final spaceChild in room.spaceChildren) {
|
||||
if (spaceChild.roomId == null) continue;
|
||||
final spaceChildRoom =
|
||||
Matrix.of(context).client.getRoomById(spaceChild.roomId!);
|
||||
if (spaceChildRoom != null &&
|
||||
!(await spaceChildRoom.isBotDM) &&
|
||||
!spaceChildRoom.isDirectChat) {
|
||||
await spaceChildRoom.invite(id);
|
||||
await spaceChildRoom.setPower(
|
||||
id,
|
||||
ClassDefaultValues.powerLevelOfAdmin,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Pangea#
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import 'package:fluffychat/widgets/layouts/max_width_body.dart';
|
|||
import 'package:fluffychat/widgets/matrix.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:matrix/matrix.dart';
|
||||
|
||||
class InvitationSelectionView extends StatelessWidget {
|
||||
|
|
@ -31,7 +32,14 @@ class InvitationSelectionView extends StatelessWidget {
|
|||
// Pangea#
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
leading: const Center(child: BackButton()),
|
||||
// #Pangea
|
||||
// leading: const Center(child: BackButton()),
|
||||
leading: Center(
|
||||
child: BackButton(
|
||||
onPressed: () => context.go("/rooms/${controller.roomId}/details"),
|
||||
),
|
||||
),
|
||||
// Pangea#
|
||||
titleSpacing: 0,
|
||||
title: Text(L10n.of(context)!.inviteContact),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -75,11 +75,6 @@ void chatListHandleSpaceTap(
|
|||
duration: const Duration(seconds: 3),
|
||||
),
|
||||
);
|
||||
if (space.isExchange) {
|
||||
context.go(
|
||||
'/rooms/join_exchange/${controller.activeSpaceId}',
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue