lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart

@@ -47,7 +47,17 @@ class _ChooseGameViewState extends State<ChooseGameView> {
         ),
         centerTitle: true,
       ),
-      body: Column(
+      body: PopScope(
+        // This fixes that the Android Back Gesture didn't return the
+        // selectedGameIndex and therefore the selected Game wasn't saved
+        canPop: false,
+        onPopInvokedWithResult: (bool didPop, Object? result) {
+          if (didPop) {
+            return;
+          }
+          Navigator.of(context).pop(selectedGameIndex);
+        },
+        child: Column(
           children: [
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 10),
@@ -81,6 +91,7 @@ class _ChooseGameViewState extends State<ChooseGameView> {
             ),
           ],
         ),
+      ),
     );
   }
 }

lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart

@@ -57,7 +57,23 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
         ),
         centerTitle: true,
       ),
-      body: Column(
+      body: PopScope(
+        // This fixes that the Android Back Gesture didn't return the
+        // selectedGroupId and therefore the selected Group wasn't saved
+        canPop: false,
+        onPopInvokedWithResult: (bool didPop, Object? result) {
+          if (didPop) {
+            return;
+          }
+          Navigator.of(context).pop(
+            selectedGroupId == ''
+                ? null
+                : widget.groups.firstWhere(
+                    (group) => group.id == selectedGroupId,
+                  ),
+          );
+        },
+        child: Column(
           children: [
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 10),
@@ -113,6 +129,7 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
             ),
           ],
         ),
+      ),
     );
   }
 

lib/presentation/views/main_menu/match_view/create_match/choose_ruleset_view.dart

@@ -52,7 +52,21 @@ class _ChooseRulesetViewState extends State<ChooseRulesetView> {
           ),
           centerTitle: true,
         ),
-        body: ListView.builder(
+        body: PopScope(
+          // This fixes that the Android Back Gesture didn't return the
+          // selectedRulesetIndex and therefore the selected Ruleset wasn't saved
+          canPop: false,
+          onPopInvokedWithResult: (bool didPop, Object? result) {
+            if (didPop) {
+              return;
+            }
+            Navigator.of(context).pop(
+              selectedRulesetIndex == -1
+                  ? null
+                  : widget.rulesets[selectedRulesetIndex].$1,
+            );
+          },
+          child: ListView.builder(
             padding: const EdgeInsets.only(bottom: 85),
             itemCount: widget.rulesets.length,
             itemBuilder: (BuildContext context, int index) {
@@ -73,6 +87,7 @@ class _ChooseRulesetViewState extends State<ChooseRulesetView> {
             },
           ),
         ),
+      ),
     );
   }
 }