Apply 1 suggestion(s) to 1 file(s)

lib/pages/chat/chat.dart

@@ -834,16 +834,22 @@ class ChatController extends State<Chat> {
     if (response == OkCancelResult.ok) {
       final events = room!.pinnedEventIds
         ..removeWhere((oldEvent) => oldEvent == eventId);
-      room!.setPinnedEvents(events);
+      showFutureLoadingDialog(
+        context: context,
+        future: () => room!.setPinnedEvents(events),
+      );
     }
   }
 
   void pinEvent() {
-    room!.setPinnedEvents(
-      <String>{
-        ...room!.pinnedEventIds,
-        ...selectedEvents.map((e) => e.eventId),
-      }.toList(),
+    showFutureLoadingDialog(
+      context: context,
+      future: () => room!.setPinnedEvents(
+        <String>{
+          ...room!.pinnedEventIds,
+          ...selectedEvents.map((e) => e.eventId),
+        }.toList(),
+      ),
     );
   }
 

lib/pages/chat/pinned_events.dart

@@ -2,17 +2,42 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 
+import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';
+import 'package:matrix_link_text/link_text.dart';
 
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
-import 'package:fluffychat/pages/chat/events/message_content.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
+import 'package:fluffychat/utils/url_launcher.dart';
 
 class PinnedEvents extends StatelessWidget {
   final ChatController controller;
 
   const PinnedEvents(this.controller, {Key? key}) : super(key: key);
 
+  Future<void> _displayPinnedEventsDialog(
+      BuildContext context, List<Event?> events) async {
+    final eventId = events.length == 1
+        ? events.single?.eventId
+        : await showModalActionSheet<String>(
+            context: context,
+            actions: events
+                .map((event) => SheetAction(
+                      key: event?.eventId ?? '',
+                      label: event?.getLocalizedBody(
+                            MatrixLocals(L10n.of(context)!),
+                            withSenderNamePrefix: true,
+                            hideReply: true,
+                          ) ??
+                          'UNKNOWN',
+                    ))
+                .toList());
+
+    if (eventId != null) controller.scrollToEventId(eventId);
+  }
+
   @override
   Widget build(BuildContext context) {
     final pinnedEventIds = controller.room!.pinnedEventIds;
@@ -30,39 +55,51 @@ class PinnedEvents extends StatelessWidget {
     return FutureBuilder<List<Event?>>(
         future: Future.wait(completers.map((e) => e.future).toList()),
         builder: (context, snapshot) {
-          if (snapshot.hasData &&
-              snapshot.data != null &&
-              snapshot.data!.isNotEmpty &&
-              snapshot.data!.first != null) {
+          final pinnedEvents = snapshot.data;
+          final event = (pinnedEvents != null && pinnedEvents.isNotEmpty)
+              ? snapshot.data?.last
+              : null;
+
+          if (event != null && pinnedEvents != null) {
+            final fontSize =
+                AppConfig.messageFontSize * AppConfig.fontSizeFactor;
             return Material(
-              color: Theme.of(context).secondaryHeaderColor,
-              child: ConstrainedBox(
-                constraints: const BoxConstraints(
-                  maxHeight: 96,
+              color: Theme.of(context).appBarTheme.backgroundColor,
+              elevation: Theme.of(context).appBarTheme.elevation ?? 10,
+              shadowColor: Theme.of(context).appBarTheme.shadowColor,
+              child: ListTile(
+                tileColor: Colors.transparent,
+                onTap: () => _displayPinnedEventsDialog(
+                  context,
+                  pinnedEvents,
                 ),
-                child: ListView.builder(
-                  shrinkWrap: true,
-                  reverse: true,
-                  itemBuilder: (c, i) {
-                    final event = snapshot.data![i]!;
-                    return ListTile(
-                      tileColor: Colors.transparent,
-                      onTap: () => controller.scrollToEventId(event.eventId),
-                      leading: IconButton(
-                        icon: const Icon(Icons.push_pin_outlined),
-                        tooltip: L10n.of(context)!.unpin,
-                        onPressed: () => controller.unpinEvent(event.eventId),
-                      ),
-                      title: MessageContent(
-                        snapshot.data![i]!,
-                        textColor:
-                            Theme.of(context).brightness == Brightness.dark
-                                ? Colors.white
-                                : Colors.black,
-                      ),
-                    );
-                  },
-                  itemCount: snapshot.data!.length,
+                leading: IconButton(
+                  icon: const Icon(Icons.close),
+                  tooltip: L10n.of(context)!.unpin,
+                  onPressed: () => controller.unpinEvent(event.eventId),
+                ),
+                title: LinkText(
+                  text: event.getLocalizedBody(
+                    MatrixLocals(L10n.of(context)!),
+                    withSenderNamePrefix: true,
+                    hideReply: true,
+                  ),
+                  maxLines: 3,
+                  textStyle: TextStyle(
+                    fontSize: fontSize,
+                    decoration:
+                        event.redacted ? TextDecoration.lineThrough : null,
+                  ),
+                  linkStyle: TextStyle(
+                    color: Theme.of(context)
+                        .textTheme
+                        .bodyText1
+                        ?.color
+                        ?.withAlpha(150),
+                    fontSize: fontSize,
+                    decoration: TextDecoration.underline,
+                  ),
+                  onLinkTap: (url) => UrlLauncher(context, url).launchUrl(),
                 ),
               ),
             );

lib/pages/homeserver_picker/homeserver_picker.dart

@@ -98,10 +98,10 @@ class HomeserverPickerController extends State<HomeserverPicker> {
     });
 
     try {
-      final wellKnown =
+      final summary =
           await Matrix.of(context).getLoginClient().checkHomeserver(homeserver);
 
-      var jitsi = wellKnown?.additionalProperties
+      var jitsi = summary.discoveryInformation?.additionalProperties
           .tryGet<Map<String, dynamic>>('im.vector.riot.jitsi')
           ?.tryGet<String>('preferredDomain');
       if (jitsi != null) {

lib/pages/login/login.dart

@@ -119,7 +119,7 @@ class LoginController extends State<Login> {
           future: () => Matrix.of(context)
               .getLoginClient()
               .checkHomeserver(newDomain)
-              .catchError((e) => null),
+              .catchError((e) {}),
         );
         if (Matrix.of(context).getLoginClient().homeserver == null) {
           Matrix.of(context).getLoginClient().homeserver = oldHomeserver;