From dcc2b95f54ae3f844a47f74dd09fd637a64a0fff Mon Sep 17 00:00:00 2001
From: alexytomi <60690056+alexytomi@users.noreply.github.com>
Date: Mon, 14 Apr 2025 05:11:27 +0800
Subject: [PATCH] Undo removal of force close button in-game (#6823)

Reverts commit 19dc51f (cleanup: remove unneeded menu entry)

Even if it closes when swiping away the app, there are cases where you
cannot swipe it away, or even bring up the navigation bar.
---
 .../main/java/net/kdt/pojavlaunch/MainActivity.java    | 10 ++++++----
 .../src/main/res/values/headings_array.xml             |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
index 42052ce20..34f88b867 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
@@ -1,6 +1,7 @@
 package net.kdt.pojavlaunch;
 
 import static net.kdt.pojavlaunch.Tools.currentDisplayMetrics;
+import static net.kdt.pojavlaunch.Tools.dialogForceClose;
 import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_ENABLE_GYRO;
 import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_SUSTAINED_PERFORMANCE;
 import static net.kdt.pojavlaunch.prefs.LauncherPreferences.PREF_USE_ALTERNATE_SURFACE;
@@ -190,10 +191,11 @@ public class MainActivity extends BaseActivity implements ControlButtonMenuListe
                     android.R.layout.simple_list_item_1, getResources().getStringArray(R.array.menu_ingame));
             gameActionClickListener = (parent, view, position, id) -> {
                 switch(position) {
-                    case 0: openLogOutput(); break;
-                    case 1: dialogSendCustomKey(); break;
-                    case 2: openQuickSettings(); break;
-                    case 3: openCustomControls(); break;
+                    case 0: dialogForceClose(MainActivity.this); break;
+                    case 1: openLogOutput(); break;
+                    case 2: dialogSendCustomKey(); break;
+                    case 3: openQuickSettings(); break;
+                    case 4: openCustomControls(); break;
                 }
                 drawerLayout.closeDrawers();
             };
diff --git a/app_pojavlauncher/src/main/res/values/headings_array.xml b/app_pojavlauncher/src/main/res/values/headings_array.xml
index c73415323..5f4bd3c91 100644
--- a/app_pojavlauncher/src/main/res/values/headings_array.xml
+++ b/app_pojavlauncher/src/main/res/values/headings_array.xml
@@ -27,6 +27,7 @@
     </string-array>
 
     <string-array name="menu_ingame">
+        <item>@string/control_forceclose</item>
         <item>@string/control_viewout</item>
         <item>@string/control_customkey</item>
         <item>@string/quick_setting_title</item>