Add chips to waypoint dialog

Author: CodeDoctorDE

app/lib/l10n/app_en.arb

@@ -285,5 +285,6 @@
   "addWaypoint": "Add waypoint",
   "editWaypoint": "Edit waypoint",
   "team": "Team",
-  "public": "Public"
+  "public": "Public",
+  "noWaypoints": "There are no waypoints available"
 }

app/lib/pages/game/drawer.dart

@@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:setonix/board/game.dart';
 import 'package:setonix/pages/game/multiplayer/dialog.dart';
+import 'package:setonix/pages/game/waypoint.dart';
 import 'package:setonix/src/generated/i18n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
 import 'package:material_leap/material_leap.dart';
@@ -197,66 +198,7 @@ class GameDrawer extends StatelessWidget {
                     onChanged: (value) => context.read<WorldBloc>().process(
                       WaypointVisibilityChanged(value),
                     ),
-                    onTap: () {
-                      final bloc = context.read<WorldBloc>();
-                      final state = bloc.state;
-                      Widget buildWaypointTile(
-                        Waypoint waypoint, {
-                        String? team,
-                      }) => ContextRegion(
-                        builder: (ctx, button, controller) => ListTile(
-                          title: Text(waypoint.name),
-                          leading: Icon(
-                            team != null
-                                ? PhosphorIconsLight.users
-                                : PhosphorIconsLight.mapPin,
-                          ),
-                          trailing: button,
-                          onTap: () {
-                            Navigator.of(ctx).pop();
-                            game.teleport(waypoint.position);
-                            Scaffold.of(context).closeDrawer();
-                          },
-                        ),
-                        menuChildren: [
-                          MenuItemButton(
-                            leadingIcon: const Icon(PhosphorIconsLight.pencil),
-                            child: Text(AppLocalizations.of(context).edit),
-                            onPressed: () {},
-                          ),
-                          MenuItemButton(
-                            leadingIcon: const Icon(PhosphorIconsLight.trash),
-                            child: Text(AppLocalizations.of(context).delete),
-                            onPressed: () {
-                              bloc.add(
-                                WaypointRemoved(
-                                  name: waypoint.name,
-                                  team: team,
-                                ),
-                              );
-                            },
-                          ),
-                        ],
-                      );
-                      showLeapBottomSheet(
-                        context: context,
-                        titleBuilder: (context) =>
-                            Text(AppLocalizations.of(context).waypoints),
-                        childrenBuilder: (context) => [
-                          ...state.world.getTeams().expand(
-                            (e) =>
-                                state.info.teams[e]?.waypoints.map(
-                                  (waypoint) =>
-                                      buildWaypointTile(waypoint, team: e),
-                                ) ??
-                                <Widget>[],
-                          ),
-                          ...state.info.waypoints.map(
-                            (e) => buildWaypointTile(e),
-                          ),
-                        ],
-                      );
-                    },
+                    onTap: () => _showWaypointsDialog(context),
                   ),
                 );
               },
@@ -726,4 +668,121 @@ class GameDrawer extends StatelessWidget {
       ],
     );
   }
+
+  void _showWaypointsDialog(BuildContext context) {
+    final bloc = context.read<WorldBloc>();
+    Widget buildWaypointTile(Waypoint waypoint, {String? team}) {
+      final gameTeam = bloc.state.info.teams[team];
+      return ContextRegion(
+        builder: (ctx, button, controller) => ListTile(
+          title: Text(waypoint.name),
+          leading: Icon(
+            team != null ? PhosphorIconsLight.users : PhosphorIconsLight.mapPin,
+            color: gameTeam?.color?.color,
+          ),
+          trailing: button,
+          onTap: () {
+            Navigator.of(ctx).pop();
+            game.teleport(waypoint.position);
+            Scaffold.of(context).closeDrawer();
+          },
+        ),
+        menuChildren: [
+          MenuItemButton(
+            leadingIcon: const Icon(PhosphorIconsLight.pencil),
+            child: Text(AppLocalizations.of(context).edit),
+            onPressed: () => showDialog(
+              context: context,
+              builder: (context) => BlocProvider.value(
+                value: bloc,
+                child: WaypointDialog(waypoint: waypoint, team: team),
+              ),
+            ),
+          ),
+          MenuItemButton(
+            leadingIcon: const Icon(PhosphorIconsLight.trash),
+            child: Text(AppLocalizations.of(context).delete),
+            onPressed: () {
+              bloc.add(WaypointRemoved(name: waypoint.name, team: team));
+            },
+          ),
+        ],
+      );
+    }
+
+    bool showPublic = true, showTeams = true;
+
+    showLeapBottomSheet(
+      context: context,
+      titleBuilder: (context) => Text(AppLocalizations.of(context).waypoints),
+      childrenBuilder: (context) => [
+        StatefulBuilder(
+          builder: (context, setLocalState) {
+            return BlocBuilder<WorldBloc, ClientWorldState>(
+              bloc: bloc,
+              buildWhen: (previous, current) =>
+                  previous.info.waypoints != current.info.waypoints ||
+                  previous.info.teams != current.info.teams ||
+                  previous.teamMembers != current.teamMembers,
+              builder: (context, state) {
+                final List<Widget> waypointTiles = [];
+
+                if (showTeams) {
+                  waypointTiles.addAll(
+                    state.world.getTeams().expand(
+                      (e) =>
+                          state.info.teams[e]?.waypoints.map(
+                            (waypoint) => buildWaypointTile(waypoint, team: e),
+                          ) ??
+                          <Widget>[],
+                    ),
+                  );
+                }
+
+                if (showPublic) {
+                  waypointTiles.addAll(
+                    state.info.waypoints.map((e) => buildWaypointTile(e)),
+                  );
+                }
+
+                return Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    Wrap(
+                      spacing: 8,
+                      runSpacing: 4,
+                      children: [
+                        FilterChip(
+                          label: Text(AppLocalizations.of(context).teams),
+                          selected: showTeams,
+                          onSelected: (v) => setLocalState(() => showTeams = v),
+                        ),
+                        FilterChip(
+                          label: const Text('Public'),
+                          selected: showPublic,
+                          onSelected: (v) =>
+                              setLocalState(() => showPublic = v),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    if (waypointTiles.isEmpty)
+                      Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 12),
+                        child: Center(
+                          child: Text(AppLocalizations.of(context).noWaypoints),
+                        ),
+                      )
+                    else
+                      ...waypointTiles,
+                  ],
+                );
+              },
+            );
+          },
+        ),
+      ],
+    );
+  }
 }