fixup! fixup! fixup! TW-1255: Support selectable pinned events

linagora · Jan 8, 2024 · a96ecfb · a96ecfb
1 parent 594945c
commit a96ecfb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 48 deletions.
diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages.dart b/lib/pages/chat/chat_pinned_events/pinned_messages.dart
@@ -161,7 +161,7 @@ class PinnedMessagesController extends State<PinnedMessages>
       );
 
   void closeSelectionMode() {
-    selectedEvents.value.clear();
+    selectedEvents.value = [];
   }
 
   void handleContextMenuActionInMore(

diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages_screen.dart b/lib/pages/chat/chat_pinned_events/pinned_messages_screen.dart
@@ -192,48 +192,19 @@ class PinnedMessagesScreen extends StatelessWidget {
                                   ),
                         ),
                         const Spacer(),
-                        responsiveUtils.isMobile(context)
-                            ? IconButton(
-                                onPressed: () =>
-                                    controller.unpinSelectedEvents(),
-                                icon: PinnedMessagesStyle.unpinIcon(),
-                              )
-                            : TextButton.icon(
-                                onPressed: () =>
-                                    controller.unpinSelectedEvents(),
-                                icon: PinnedMessagesStyle.unpinIcon(),
-                                label: Text(
-                                  L10n.of(context)!.unpin,
-                                  style: Theme.of(context)
-                                      .textTheme
-                                      .labelLarge
-                                      ?.copyWith(
-                                        color: Theme.of(context)
-                                            .colorScheme
-                                            .primary,
-                                      ),
-                                ),
-                              ),
-                        responsiveUtils.isMobile(context)
-                            ? IconButton(
-                                onPressed: () =>
-                                    controller.unpinSelectedEvents(),
-                                icon: PinnedMessagesStyle.deleteIcon(context),
-                              )
-                            : TextButton.icon(
-                                onPressed: () => {},
-                                icon: PinnedMessagesStyle.deleteIcon(context),
-                                label: Text(
-                                  L10n.of(context)!.delete,
-                                  style: Theme.of(context)
-                                      .textTheme
-                                      .labelLarge
-                                      ?.copyWith(
-                                        color:
-                                            Theme.of(context).colorScheme.error,
-                                      ),
+                        TextButton.icon(
+                          onPressed: () => controller.unpinSelectedEvents(),
+                          icon: PinnedMessagesStyle.unpinIcon(),
+                          label: Text(
+                            L10n.of(context)!.unpin,
+                            style: Theme.of(context)
+                                .textTheme
+                                .labelLarge
+                                ?.copyWith(
+                                  color: Theme.of(context).colorScheme.primary,
                                 ),
-                              ),
+                          ),
+                        ),
                       ],
                     ),
                   ),

diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages_style.dart b/lib/pages/chat/chat_pinned_events/pinned_messages_style.dart
@@ -22,12 +22,6 @@ class PinnedMessagesStyle {
   );
   static const double actionBarBorderRadius = 16.0;
 
-  static Icon deleteIcon(BuildContext context) => Icon(
-        Icons.delete,
-        size: 18,
-        color: Theme.of(context).colorScheme.error,
-      );
-
   static Widget unpinIcon() => SvgPicture.asset(ImagePaths.icUnpin, height: 18);
 
   static const double paddingAllContextMenuItem = 12;