Merge branch 'main' into optimizations
This commit is contained in:
commit
f9adab52a2
3 changed files with 4 additions and 15 deletions
|
|
@ -125,6 +125,9 @@ class _SpaceViewState extends State<SpaceView> {
|
|||
activeSpaceId,
|
||||
maxDepth: 1,
|
||||
from: prevBatch,
|
||||
// #Pangea
|
||||
limit: 100,
|
||||
// Pangea#
|
||||
);
|
||||
|
||||
if (prevBatch != null) {
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ class LoginView extends StatelessWidget {
|
|||
controller.showPassword
|
||||
? Icons.visibility_off_outlined
|
||||
: Icons.visibility_outlined,
|
||||
color: Colors.black,
|
||||
// color: Colors.black,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
|
|||
|
|
@ -198,14 +198,6 @@ class NewSpaceController extends State<NewSpace> {
|
|||
if (capacity != null && space != null) {
|
||||
space.updateRoomCapacity(capacity);
|
||||
}
|
||||
final newChatRoomId = await Matrix.of(context).client.createGroupChat(
|
||||
enableEncryption: false,
|
||||
preset: sdk.CreateRoomPreset.publicChat,
|
||||
// Welcome chat name is '[space name acronym]: Welcome Chat'
|
||||
groupName:
|
||||
'${nameController.text.trim().split(RegExp(r"\s+")).map((s) => s[0]).join()}: ${L10n.of(context)!.classWelcomeChat}',
|
||||
);
|
||||
GoogleAnalytics.createChat(newChatRoomId);
|
||||
|
||||
final Room? room = Matrix.of(context).client.getRoomById(spaceId);
|
||||
if (room == null) {
|
||||
|
|
@ -217,12 +209,6 @@ class NewSpaceController extends State<NewSpace> {
|
|||
return;
|
||||
}
|
||||
|
||||
room.setSpaceChild(newChatRoomId, suggested: true);
|
||||
GoogleAnalytics.addParent(
|
||||
newChatRoomId,
|
||||
room.classCode,
|
||||
);
|
||||
|
||||
GoogleAnalytics.createClass(room.name, room.classCode);
|
||||
try {
|
||||
await room.invite(BotName.byEnvironment);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue