feat: add "or invite a user" to "share link" screen

tom-anders · tom-anders · commit 12a2d5730038 · 2026-03-31T22:39:31.000+02:00
diff --git a/lib/src/model/lobby/create_game_service.dart b/lib/src/model/lobby/create_game_service.dart
@@ -196,10 +196,13 @@ class CreateGameService {
 
   /// Create a new correspondence challenge.
   ///
-  /// It will wait a little bit in case of an immediate decline (e.g. bots), in that case a
+  /// If [waitForImmediateDecline] is true, will wait a little bit in case of an immediate decline (e.g. bots), in that case a
   /// [ChallengeDeclineReason] will be returned.
   /// Otherwise, it means the challenge was created successfully.
-  Future<ChallengeDeclineReason?> newCorrespondenceChallenge(ChallengeRequest challengeReq) async {
+  Future<ChallengeDeclineReason?> newCorrespondenceChallenge(
+    ChallengeRequest challengeReq, {
+    bool waitForImmediateDecline = true,
+  }) async {
     assert(
       challengeReq.timeControl == ChallengeTimeControlType.correspondence ||
           challengeReq.timeControl == ChallengeTimeControlType.unlimited,
diff --git a/lib/src/view/board_editor/board_editor_screen.dart b/lib/src/view/board_editor/board_editor_screen.dart
@@ -22,7 +22,7 @@ import 'package:lichess_mobile/src/view/board_editor/board_editor_positions.dart
 import 'package:lichess_mobile/src/view/offline_computer/offline_computer_game_screen.dart';
 import 'package:lichess_mobile/src/view/over_the_board/over_the_board_screen.dart';
 import 'package:lichess_mobile/src/view/play/create_challenge_bottom_sheet.dart';
-import 'package:lichess_mobile/src/view/user/search_screen.dart';
+import 'package:lichess_mobile/src/view/user/pick_player_screen.dart';
 import 'package:lichess_mobile/src/widgets/adaptive_action_sheet.dart';
 import 'package:lichess_mobile/src/widgets/adaptive_choice_picker.dart';
 import 'package:lichess_mobile/src/widgets/bottom_bar.dart';
@@ -332,7 +332,7 @@ class _BottomBar extends ConsumerWidget {
                       return;
                     }
                     Navigator.of(context).push(
-                      SearchScreen.buildRoute(
+                      PickPlayerScreen.buildRoute(
                         context,
                         onUserTap: (user) {
                           if (user.id == authUser.user.id) {
diff --git a/lib/src/view/game/game_loading_board.dart b/lib/src/view/game/game_loading_board.dart
@@ -4,8 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:lichess_mobile/src/constants.dart';
+import 'package:lichess_mobile/src/model/auth/auth_controller.dart';
 import 'package:lichess_mobile/src/model/challenge/challenge.dart';
+import 'package:lichess_mobile/src/model/challenge/challenge_repository.dart';
 import 'package:lichess_mobile/src/model/common/chess.dart';
+import 'package:lichess_mobile/src/model/common/id.dart';
 import 'package:lichess_mobile/src/model/game/game_board_params.dart';
 import 'package:lichess_mobile/src/model/lobby/game_seek.dart';
 import 'package:lichess_mobile/src/model/lobby/lobby_numbers.dart';
@@ -15,6 +18,9 @@ import 'package:lichess_mobile/src/utils/share.dart';
 import 'package:lichess_mobile/src/utils/string.dart';
 import 'package:lichess_mobile/src/view/account/rating_pref_aware.dart';
 import 'package:lichess_mobile/src/view/game/game_body.dart';
+import 'package:lichess_mobile/src/view/game/game_screen.dart';
+import 'package:lichess_mobile/src/view/game/game_screen_providers.dart';
+import 'package:lichess_mobile/src/view/user/pick_player_screen.dart';
 import 'package:lichess_mobile/src/widgets/bottom_bar.dart';
 import 'package:lichess_mobile/src/widgets/feedback.dart';
 import 'package:lichess_mobile/src/widgets/game_layout.dart';
@@ -211,9 +217,14 @@ class _UserChallengeLoadingContentState extends State<UserChallengeLoadingConten
 }
 
 class OpenChallengeLoadingContent extends ConsumerStatefulWidget {
-  const OpenChallengeLoadingContent(this.challenge, this.cancelChallenge);
-
-  final Challenge challenge;
+  const OpenChallengeLoadingContent({
+    required this.id,
+    required this.challengeRequest,
+    required this.cancelChallenge,
+  });
+
+  final ChallengeId id;
+  final ChallengeRequest challengeRequest;
   final Future<void> Function() cancelChallenge;
 
   @override
@@ -225,7 +236,8 @@ class _OpenChallengeLoadingContentState extends ConsumerState<OpenChallengeLoadi
 
   @override
   Widget build(BuildContext context) {
-    final challengeLink = 'https://$kLichessHost/${widget.challenge.id}';
+    final challengeLink = 'https://$kLichessHost/${widget.id}';
+    final authUser = ref.watch(authControllerProvider);
 
     final qrColor = ref.watch(currentBrightnessProvider) == Brightness.dark
         ? Colors.white
@@ -252,13 +264,13 @@ class _OpenChallengeLoadingContentState extends ConsumerState<OpenChallengeLoadi
                       mainAxisSize: MainAxisSize.min,
                       children: [
                         Icon(
-                          widget.challenge.perf.icon,
+                          widget.challengeRequest.perf.icon,
                           color: DefaultTextStyle.of(context).style.color,
                         ),
                         const SizedBox(width: 8.0),
                         Text(
-                          widget.challenge.timeIncrement?.display ??
-                              '${context.l10n.daysPerTurn}: ${widget.challenge.days}',
+                          widget.challengeRequest.timeIncrement?.display ??
+                              '${context.l10n.daysPerTurn}: ${widget.challengeRequest.days}',
                           style: TextTheme.of(context).titleLarge,
                         ),
                       ],
@@ -295,6 +307,47 @@ class _OpenChallengeLoadingContentState extends ConsumerState<OpenChallengeLoadi
 
                     Text(context.l10n.theFirstPersonToComeOnThisUrlWillPlayWithYou),
 
+                    if (authUser != null)
+                      FilledButton.tonalIcon(
+                        onPressed: () => Navigator.of(context).push(
+                          PickPlayerScreen.buildRoute(
+                            context,
+                            title: Text(context.l10n.challengeAFriend),
+                            onUserTap: (user) async {
+                              Navigator.of(context).pop();
+
+                              widget.cancelChallenge();
+
+                              final directedChallengeReq = widget.challengeRequest.copyWith(
+                                destUser: user,
+                              );
+                              await ref
+                                  .read(challengeRepositoryProvider)
+                                  .create(directedChallengeReq);
+                              if (!context.mounted) return;
+
+                              if (widget.challengeRequest.timeControl ==
+                                  ChallengeTimeControlType.clock) {
+                                Navigator.of(context, rootNavigator: true).pushReplacement(
+                                  GameScreen.buildRoute(
+                                    context,
+                                    source: UserChallengeSource(directedChallengeReq),
+                                  ),
+                                );
+                              } else {
+                                if (!context.mounted) return;
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(content: Text(context.l10n.mobileChallengeCreated)),
+                                );
+                                Navigator.of(context).pop();
+                              }
+                            },
+                          ),
+                        ),
+                        label: Text(context.l10n.challengeInviteLichessUser.replaceFirst(':', '')),
+                        icon: const Icon(Icons.person_search),
+                      ),
+
                     Container(
                       padding: const EdgeInsets.all(4.0),
                       decoration: BoxDecoration(
diff --git a/lib/src/view/game/game_screen.dart b/lib/src/view/game/game_screen.dart
@@ -231,8 +231,9 @@ class _GameScreenState extends ConsumerState<GameScreen> {
           body: PopScope(
             canPop: false,
             child: OpenChallengeLoadingContent(
-              challenge,
-              ref.read(createGameServiceProvider).cancelChallenge,
+              id: challenge.id,
+              challengeRequest: (widget.source as UserChallengeSource).challengeRequest,
+              cancelChallenge: ref.read(createGameServiceProvider).cancelChallenge,
             ),
           ),
         );
diff --git a/lib/src/view/play/create_challenge_bottom_sheet.dart b/lib/src/view/play/create_challenge_bottom_sheet.dart
@@ -403,7 +403,7 @@ class _CreateChallengeBottomSheetState extends ConsumerState<CreateChallengeBott
                         : null,
                     child: Text(
                       widget.user != null
-                          ? context.l10n.challengeChallengeToPlay
+                          ? context.l10n.challengeX(widget.user!.name)
                           : context.l10n.challengeAFriend,
                       style: Styles.bold,
                     ),
diff --git a/lib/src/view/user/pick_player_screen.dart b/lib/src/view/user/pick_player_screen.dart
@@ -0,0 +1,145 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:lichess_mobile/src/model/user/user.dart';
+import 'package:lichess_mobile/src/utils/l10n_context.dart';
+import 'package:lichess_mobile/src/utils/navigation.dart';
+import 'package:lichess_mobile/src/view/relation/friend_screen.dart';
+import 'package:lichess_mobile/src/view/user/search_screen.dart';
+import 'package:lichess_mobile/src/widgets/list.dart';
+import 'package:lichess_mobile/src/widgets/platform.dart';
+import 'package:lichess_mobile/src/widgets/platform_search_bar.dart';
+import 'package:lichess_mobile/src/widgets/shimmer.dart';
+import 'package:lichess_mobile/src/widgets/user.dart';
+
+class PickPlayerScreen extends ConsumerWidget {
+  const PickPlayerScreen({required this.onUserTap, required this.title, super.key});
+
+  final void Function(LightUser) onUserTap;
+  final Widget title;
+
+  static Route<dynamic> buildRoute(
+    BuildContext context, {
+    required void Function(LightUser) onUserTap,
+    required Widget title,
+  }) {
+    return buildScreenRoute(
+      context,
+      screen: PickPlayerScreen(onUserTap: onUserTap, title: title),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return PlatformScaffold(
+      appBar: PlatformAppBar(title: title),
+      body: _Body(onUserTap: onUserTap),
+    );
+  }
+}
+
+class _Body extends ConsumerWidget {
+  const _Body({required this.onUserTap});
+
+  final void Function(LightUser) onUserTap;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    switch (ref.watch(followingStatusesProvider)) {
+      case AsyncData(value: (final following, final statuses)):
+        final online = <User>[];
+        final offline = <User>[];
+        for (final (user, status) in following.zip(statuses)) {
+          if (status.online == true) {
+            online.add(user);
+          } else {
+            offline.add(user);
+          }
+        }
+        return _PlayersList(
+          onUserTap: onUserTap,
+          children: [
+            if (online.isNotEmpty)
+              ListSection(
+                header: Text(context.l10n.nbFriendsOnline(online.length)),
+                children: [
+                  for (final user in online)
+                    _FriendTile(friend: user.lightUser, onUserTap: onUserTap),
+                ],
+              ),
+            if (offline.isNotEmpty)
+              ListSection(
+                header: Text(context.l10n.following),
+                children: [
+                  for (final user in offline)
+                    _FriendTile(friend: user.lightUser, onUserTap: onUserTap),
+                ],
+              ),
+          ],
+        );
+      case _:
+        return _PlayersList(
+          onUserTap: onUserTap,
+          children: [
+            Shimmer(
+              child: ShimmerLoading(isLoading: true, child: ListSection.loading(itemsNumber: 5)),
+            ),
+            Shimmer(
+              child: ShimmerLoading(isLoading: true, child: ListSection.loading(itemsNumber: 5)),
+            ),
+          ],
+        );
+    }
+  }
+}
+
+class _PlayersList extends StatelessWidget {
+  const _PlayersList({required this.onUserTap, required this.children});
+
+  final void Function(LightUser) onUserTap;
+  final List<Widget> children;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView(
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
+          child: PlatformSearchBar(
+            hintText: context.l10n.searchSearch,
+            focusNode: _AlwaysDisabledFocusNode(),
+            onTap: () => Navigator.of(context).push(
+              SearchScreen.buildRoute(
+                context,
+                onUserTap: (user) {
+                  Navigator.of(context).pop();
+                  onUserTap(user);
+                },
+              ),
+            ),
+          ),
+        ),
+        ...children,
+      ],
+    );
+  }
+}
+
+class _AlwaysDisabledFocusNode extends FocusNode {
+  @override
+  bool get hasFocus => false;
+}
+
+class _FriendTile extends StatelessWidget {
+  const _FriendTile({required this.friend, required this.onUserTap});
+
+  final LightUser friend;
+  final void Function(LightUser) onUserTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      title: UserFullNameWidget(user: friend),
+      onTap: () => onUserTap(friend),
+    );
+  }
+}
diff --git a/lib/src/view/user/search_screen.dart b/lib/src/view/user/search_screen.dart
@@ -66,6 +66,7 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
         _term = term;
       });
       saveHistoryDebouncer.call(() {
+        if (!mounted) return;
         ref.read(searchHistoryProvider.notifier).saveTerm(term);
       });
     } else {
diff --git a/test/view/game/game_screen_test.dart b/test/view/game/game_screen_test.dart
