[circuit] fix custom button with popups

BrightDV · May 7, 2024 · b9746d9 · b9746d9
1 parent c3ed4f7
commit b9746d9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/lib/Screens/circuit.dart b/lib/Screens/circuit.dart
@@ -127,6 +127,7 @@ class CircuitScreen extends StatelessWidget {
  CircuitMapScreen(
  race.circuitId,
  ),
+ isDialog: true,
  ),
  snapshot.data!['raceResults'] != null &&
  snapshot.data!['raceResults'].isNotEmpty
@@ -245,6 +246,7 @@ class CircuitScreen extends StatelessWidget {
  CircuitMapScreen(
  race.circuitId,
  ),
+ isDialog: false,
  ),
  snapshot.data!['raceResults'] != null &&
  snapshot.data!['raceResults']

diff --git a/lib/helpers/buttons.dart b/lib/helpers/buttons.dart
@@ -23,10 +23,12 @@ class BoxBoxButton extends StatelessWidget {
  final String title;
  final Icon icon;
  final Widget destination;
+ final bool isDialog;
  const BoxBoxButton(
  this.title,
  this.icon,
  this.destination, {
+ this.isDialog = false,
  super.key,
  });
 
@@ -60,12 +62,17 @@ class BoxBoxButton extends StatelessWidget {
  ),
  ),
  ),
- onTap: () => Navigator.push(
- context,
- MaterialPageRoute(
- builder: (context) => destination,
- ),
- ),
+ onTap: () => isDialog
+ ? showDialog(
+ context: context,
+ builder: (BuildContext context) => destination,
+ )
+ : Navigator.push(
+ context,
+ MaterialPageRoute(
+ builder: (context) => destination,
+ ),
+ ),
  ),
  );
  }