fixup! fixup! fixup! fixup! fixup! TW-403: refactor chat_list and for…

…ward screen
linagora · Aug 29, 2023 · dc23b7d · dc23b7d
1 parent bc308da
commit dc23b7d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
@@ -61,8 +61,12 @@ class Chat extends StatefulWidget {
   final Widget? sideView;
   final MatrixFile? shareFile;
 
-  const Chat({Key? key, this.sideView, required this.roomId, this.shareFile})
-      : super(key: key);
+  const Chat({
+    Key? key,
+    this.sideView,
+    required this.roomId,
+    this.shareFile,
+  }) : super(key: key);
 
   @override
   ChatController createState() => ChatController();

diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart
@@ -39,8 +39,6 @@ class ChatListItem extends StatelessWidget {
     if (onTap != null) return onTap!();
     if (activeChat) return;
     switch (room.membership) {
-      case Membership.invite:
-        context.go('/rooms/${room.id}');
       case Membership.ban:
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
@@ -50,6 +48,7 @@ class ChatListItem extends StatelessWidget {
         return;
       case Membership.leave:
         context.go('/archive/${room.id}');
+      case Membership.invite:
       case Membership.join:
         context.go('/rooms/${room.id}');
       default:

diff --git a/lib/pages/forward/forward_view.dart b/lib/pages/forward/forward_view.dart
@@ -27,7 +27,7 @@ class ForwardView extends StatelessWidget {
       appBar: PreferredSize(
         preferredSize:
             Size.fromHeight(ForwardViewStyle.preferredAppBarSize(context)),
-        child: ForwardAppBar(
+        child: _ForwardAppBar(
           isSearchBarShowNotifier: controller.isSearchBarShowNotifier,
           sendFromRoomId: controller.sendFromRoomId,
         ),
@@ -69,7 +69,7 @@ class ForwardView extends StatelessWidget {
       ),
       floatingActionButton: Align(
         alignment: const Alignment(0.5, 1.1),
-        child: ForwardButton(
+        child: _ForwardButton(
           forwardAction: controller.forwardAction,
           selectedEventsNotifier: controller.selectedEventsNotifier,
           forwardMessageNotifier: controller.forwardMessageNotifier,
@@ -79,9 +79,8 @@ class ForwardView extends StatelessWidget {
   }
 }
 
-class ForwardButton extends StatelessWidget {
-  const ForwardButton({
-    super.key,
+class _ForwardButton extends StatelessWidget {
+  const _ForwardButton({
     required this.selectedEventsNotifier,
     required this.forwardMessageNotifier,
     required this.forwardAction,
@@ -148,9 +147,8 @@ class ForwardButton extends StatelessWidget {
   }
 }
 
-class ForwardAppBar extends StatelessWidget {
-  const ForwardAppBar({
-    super.key,
+class _ForwardAppBar extends StatelessWidget {
+  const _ForwardAppBar({
     required this.isSearchBarShowNotifier,
     this.sendFromRoomId,
   });