Merge pull request #3301 from pangeachat/3293-busy-screen-and-buttons-overlap

chore: simplify space invite page

lib/pages/invitation_selection/invitation_selection.dart

@@ -35,35 +35,6 @@ class InvitationSelectionController extends State<InvitationSelection> {
   String? get roomId => widget.roomId;
 
   // #Pangea
-  final viewportKey = GlobalKey();
-
-  final participantListItemHeight = 72.0;
-  final goToChatButtonHeight = 50.0;
-  final shareButtonsHeight = 150.0;
-  final padding = 16.0 * 2;
-  final fixedParticipantHeight = 72.0;
-
-  double? viewportHeight;
-  double get availableHeight =>
-      (viewportHeight ?? 0) -
-      goToChatButtonHeight -
-      shareButtonsHeight -
-      padding;
-
-  bool showShareButtons(int numParticipants) =>
-      (fixedParticipantHeight * numParticipants) < availableHeight;
-
-  @override
-  initState() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      final context = viewportKey.currentContext;
-      if (context == null) return;
-      final renderBox = context.findRenderObject() as RenderBox;
-      final size = renderBox.size;
-      setState(() => viewportHeight = size.height);
-    });
-    super.initState();
-  }
 
   List<User>? get participants {
     final room = Matrix.of(context).client.getRoomById(roomId!);

lib/pages/invitation_selection/invitation_selection_view.dart

@@ -8,12 +8,10 @@ import 'package:matrix/matrix.dart';
 import 'package:universal_html/html.dart' as html;
 
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart';
 import 'package:fluffychat/pangea/analytics_misc/level_display_name.dart';
 import 'package:fluffychat/pangea/chat_settings/constants/room_settings_constants.dart';
-import 'package:fluffychat/pangea/chat_settings/widgets/space_invite_buttons.dart';
 import 'package:fluffychat/pangea/common/config/environment.dart';
 import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/spaces/constants/space_constants.dart';
@@ -107,24 +105,7 @@ class InvitationSelectionView extends StatelessWidget {
         // #Pangea
         withScrolling: false,
         // Pangea#
-        child: Stack(
+        child: Column(
-          alignment: Alignment.bottomCenter,
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(16.0),
-              child: SizedBox(
-                width: 450,
-                child: CachedNetworkImage(
-                  imageUrl:
-                      "${AppConfig.assetsBaseURL}/${RoomSettingsConstants.referFriendAsset}",
-                  errorWidget: (context, url, error) => const SizedBox(),
-                  placeholder: (context, url) => const Center(
-                    child: CircularProgressIndicator.adaptive(),
-                  ),
-                ),
-              ),
-            ),
-            Column(
           children: [
             Padding(
               // #Pangea
@@ -173,7 +154,6 @@ class InvitationSelectionView extends StatelessWidget {
             // #Pangea
             // StreamBuilder<Object>(
             Expanded(
-                  key: controller.viewportKey,
               child: StreamBuilder<Object>(
                 // stream: room.client.onRoomState.stream
                 //     .where((update) => update.roomId == room.id),
@@ -228,16 +208,24 @@ class InvitationSelectionView extends StatelessWidget {
                               itemCount: contacts.length + 1,
                               itemBuilder: (BuildContext context, int i) {
                                 if (i == contacts.length) {
-                                      final showButtons = controller
+                                  return Padding(
-                                          .showShareButtons(contacts.length);
+                                    padding: const EdgeInsets.all(16.0),
-                                      return AnimatedOpacity(
+                                    child: SizedBox(
-                                        duration:
+                                      width: 450,
-                                            FluffyThemes.animationDuration,
+                                      child: CachedNetworkImage(
-                                        opacity: showButtons ? 1.0 : 0.0,
+                                        imageUrl:
-                                        child: SpaceInviteButtons(room: room),
+                                            "${AppConfig.assetsBaseURL}/${RoomSettingsConstants.referFriendAsset}",
+                                        errorWidget: (context, url, error) =>
+                                            const SizedBox(),
+                                        placeholder: (context, url) =>
+                                            const Center(
+                                          child: CircularProgressIndicator
+                                              .adaptive(),
+                                        ),
+                                      ),
+                                    ),
                                   );
                                 }
-
                                 return _InviteContactListTile(
                                   // Pangea#
                                   user: contacts[i],
@@ -265,8 +253,6 @@ class InvitationSelectionView extends StatelessWidget {
                 },
               ),
             ),
-              ],
-            ),
             Padding(
               padding: const EdgeInsets.all(16.0),
               child: ElevatedButton(
@@ -355,6 +341,8 @@ class _InviteContactListTile extends StatelessWidget {
             style: const TextStyle(
               fontSize: 12.0,
             ),
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
           ),
           LevelDisplayName(userId: profile.userId),
         ],

lib/pangea/chat_settings/widgets/space_invite_buttons.dart

@@ -1,137 +0,0 @@
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-import 'package:matrix/matrix.dart';
-import 'package:universal_html/html.dart' as html;
-
-import 'package:fluffychat/l10n/l10n.dart';
-import 'package:fluffychat/pangea/common/config/environment.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
-import 'package:fluffychat/pangea/spaces/constants/space_constants.dart';
-
-class SpaceInviteButtons extends StatefulWidget {
-  final Room room;
-  // final ScrollController scrollController;
-  const SpaceInviteButtons({
-    super.key,
-    required this.room,
-    // required this.scrollController,
-  });
-
-  @override
-  SpaceInviteButtonsController createState() => SpaceInviteButtonsController();
-}
-
-class SpaceInviteButtonsController extends State<SpaceInviteButtons> {
-  // bool get isVisible {
-  //   final context = (widget.key as GlobalKey).currentContext;
-  //   if (context == null) return false;
-
-  //   final renderBox = context.findRenderObject() as RenderBox;
-  //   final position = renderBox.localToGlobal(Offset.zero);
-
-  //   final size = renderBox.size;
-  //   final screenHeight = MediaQuery.of(context).size.height;
-
-  //   debugPrint("position: $position, size: $size, screenHeight: $screenHeight");
-
-  //   // Check if any part of the widget is within the visible range
-  //   return position.dy + size.height > 0 && position.dy < screenHeight;
-  // }
-
-  @override
-  void initState() {
-    // WidgetsBinding.instance.addPostFrameCallback(
-    //   (_) => debugPrint("isVisible: $isVisible"),
-    // );
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final spaceCode = widget.room.classCode;
-    if (!widget.room.isSpace || spaceCode == null) {
-      return const SizedBox.shrink();
-    }
-
-    return SizedBox(
-      height: 150.0,
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(
-              top: 16.0,
-              right: 16.0,
-              left: 16.0,
-            ),
-            child: ElevatedButton(
-              child: Row(
-                spacing: 8.0,
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  const Icon(
-                    Icons.share_outlined,
-                  ),
-                  Text(L10n.of(context).shareSpaceLink),
-                ],
-              ),
-              onPressed: () async {
-                final String initialUrl =
-                    kIsWeb ? html.window.origin! : Environment.frontendURL;
-                final link =
-                    "$initialUrl/#/join_with_link?${SpaceConstants.classCode}=$spaceCode";
-                await Clipboard.setData(
-                  ClipboardData(
-                    text: link,
-                  ),
-                );
-                ScaffoldMessenger.of(
-                  context,
-                ).showSnackBar(
-                  SnackBar(
-                    content: Text(
-                      L10n.of(context).copiedToClipboard,
-                    ),
-                  ),
-                );
-              },
-            ),
-          ),
-          Padding(
-            padding: const EdgeInsets.only(
-              top: 16.0,
-              right: 16.0,
-              left: 16.0,
-            ),
-            child: ElevatedButton(
-              child: Row(
-                spacing: 8.0,
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  const Icon(
-                    Icons.share_outlined,
-                  ),
-                  Text(L10n.of(context).shareInviteCode(spaceCode)),
-                ],
-              ),
-              onPressed: () async {
-                await Clipboard.setData(ClipboardData(text: spaceCode));
-                ScaffoldMessenger.of(
-                  context,
-                ).showSnackBar(
-                  SnackBar(
-                    content: Text(
-                      L10n.of(context).copiedToClipboard,
-                    ),
-                  ),
-                );
-              },
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}