Android: make the on-screen controls toggle persistent

Hydr8gon · Jul 25, 2024 · ebc8912 · ebc8912
1 parent dff44ce
commit ebc8912
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/src/android/java/com/hydra/noods/NooActivity.java b/src/android/java/com/hydra/noods/NooActivity.java
@@ -22,11 +22,13 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
+import androidx.preference.PreferenceManager;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
@@ -49,22 +51,27 @@ public class NooActivity extends AppCompatActivity
     private NooRenderer renderer;
     private NooButton buttons[];
     private TextView fpsCounter;
+
+    private SharedPreferences prefs;
     private int fpsLimiterBackup = 0;
     private boolean initButtons = true;
-    private boolean showingButtons = true;
+    private boolean showingButtons;
     private boolean showingFps;
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-
         layout = new ConstraintLayout(this);
         view = new GLSurfaceView(this);
         renderer = new NooRenderer(this);
         buttons = new NooButton[9];
         fpsCounter = new TextView(this);
 
+        // Load the previous on-screen button state
+        prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        showingButtons = prefs.getBoolean("show_buttons", true);
+
         // Prepare the GL renderer
         view.setEGLContextClientVersion(2);
         view.setRenderer(renderer);
@@ -150,17 +157,18 @@ public boolean onOptionsItemSelected(MenuItem item)
         switch (item.getItemId())
         {
             case R.id.controls_action:
-                // Toggle hiding the on-screen buttons
-                if (showingButtons = !showingButtons)
-                {
+                // Toggle the on-screen button state
+                SharedPreferences.Editor editor = prefs.edit();
+                editor.putBoolean("show_buttons", showingButtons = !showingButtons);
+                editor.commit();
+
+                // Show or hide the on-screen buttons
+                if (showingButtons)
                     for (int i = 0; i < 6; i++)
                         layout.addView(buttons[i]);
-                }
                 else
-                {
                     for (int i = 0; i < 6; i++)
                         layout.removeView(buttons[i]);
-                }
                 return true;
 
             case R.id.restart_action:
@@ -279,11 +287,6 @@ public void onClick(DialogInterface dialog, int id)
                 builder3.create().show();
                 return true;
 
-            case R.id.bindings_action:
-                // Open the input bindings menu
-                startActivity(new Intent(this, BindingsMenu.class));
-                return true;
-
             case R.id.settings_action:
                 // Open the settings menu
                 startActivity(new Intent(this, SettingsMenu.class));
@@ -400,10 +403,8 @@ public void updateButtons()
     {
         // Remove old buttons from the layout if visible
         if (!initButtons && showingButtons)
-        {
             for (int i = 0; i < 6; i++)
                 layout.removeView(buttons[i]);
-        }
 
         // Set layout parameters based on display and settings
         DisplayMetrics metrics = new DisplayMetrics();
@@ -434,12 +435,10 @@ public void updateButtons()
             new int[] {2}, z, h - (int)(d * 38), (int)(d * 33), (int)(d * 33));
 
         // Add new buttons to the layout if visible
-        if (initButtons || showingButtons)
-        {
+        if (showingButtons)
             for (int i = 0; i < 6; i++)
                 layout.addView(buttons[i]);
-            initButtons = false;
-        }
+        initButtons = false;
     }
 
     private boolean canEnableMic()

diff --git a/src/android/res/menu/noo_menu.xml b/src/android/res/menu/noo_menu.xml
@@ -17,9 +17,6 @@
     <item android:id="@+id/save_type_action"
         android:title="Change Save Type" />
 
-    <item android:id="@+id/bindings_action"
-        android:title="Input Bindings" />
-
     <item android:id="@+id/settings_action"
         android:title="Settings" />