From 26ee2ce083429a1bbf1d6445a7d45ec91d56be55 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 14 Mar 2021 17:49:51 +1000
Subject: [PATCH] Android: Implement support 8 controllers (multitap)

---
 .../ControllerSettingsActivity.java           | 49 +++++++++++++++++--
 android/app/src/main/res/values/arrays.xml    | 12 +++++
 android/app/src/main/res/values/strings.xml   |  4 +-
 .../main/res/xml/controllers_preferences.xml  | 10 +++-
 4 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/ControllerSettingsActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/ControllerSettingsActivity.java
index 8eff99310..2926aefce 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/ControllerSettingsActivity.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/ControllerSettingsActivity.java
@@ -17,6 +17,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.preference.ListPreference;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
@@ -33,6 +34,7 @@ import java.util.ArrayList;
 public class ControllerSettingsActivity extends AppCompatActivity {
 
     private static final int NUM_CONTROLLER_PORTS = 2;
+    public static final String MULTITAP_MODE_SETTINGS_KEY = "ControllerPorts/MultitapMode";
 
     private ArrayList<ControllerBindingPreference> mPreferences = new ArrayList<>();
 
@@ -161,9 +163,23 @@ public class ControllerSettingsActivity extends AppCompatActivity {
     }
 
     public static class SettingsFragment extends PreferenceFragmentCompat {
+        ControllerSettingsActivity parent;
+
+        public SettingsFragment(ControllerSettingsActivity parent) {
+            this.parent = parent;
+        }
+
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             setPreferencesFromResource(R.xml.controllers_preferences, rootKey);
+
+            final Preference multitapModePreference = getPreferenceScreen().findPreference(MULTITAP_MODE_SETTINGS_KEY);
+            if (multitapModePreference != null) {
+                multitapModePreference.setOnPreferenceChangeListener((pref, newValue) -> {
+                    parent.recreate();
+                    return true;
+                });
+            }
         }
     }
 
@@ -330,10 +346,37 @@ public class ControllerSettingsActivity extends AppCompatActivity {
         private ViewPager2 viewPager;
         private String[] controllerPortNames;
 
+        private static final int NUM_MAIN_CONTROLLER_PORTS = 2;
+        private static final int NUM_SUB_CONTROLLER_PORTS = 4;
+        private static final char[] SUB_CONTROLLER_PORT_NAMES = new char[] {'A', 'B', 'C', 'D'};
+
         public SettingsCollectionFragment(ControllerSettingsActivity activity) {
             this.activity = activity;
 
-            controllerPortNames = new String[] { "Port 1", "Port 2" };
+            final String multitapMode = PreferenceManager.getDefaultSharedPreferences(activity).getString(
+                    MULTITAP_MODE_SETTINGS_KEY, "Disabled");
+
+            final ArrayList<String> portNames = new ArrayList<>();
+            for (int i = 0; i < NUM_MAIN_CONTROLLER_PORTS; i++) {
+                final boolean isMultitap = (multitapMode.equals("BothPorts") ||
+                        (i == 0 && multitapMode.equals("Port1Only")) ||
+                        (i == 1 && multitapMode.equals("Port2Only")));
+
+                if (isMultitap) {
+                    for (int j = 0; j < NUM_SUB_CONTROLLER_PORTS; j++) {
+                        portNames.add(activity.getString(
+                                R.string.controller_settings_sub_port_format,
+                                i + 1, SUB_CONTROLLER_PORT_NAMES[j]));
+                    }
+                } else {
+                    portNames.add(activity.getString(
+                            R.string.controller_settings_main_port_format,
+                            i + 1));
+                }
+            }
+
+            controllerPortNames = new String[portNames.size()];
+            portNames.toArray(controllerPortNames);
         }
 
         @Nullable
@@ -374,7 +417,7 @@ public class ControllerSettingsActivity extends AppCompatActivity {
         @Override
         public Fragment createFragment(int position) {
             if (position == 0)
-                return new SettingsFragment();
+                return new SettingsFragment(activity);
             else if (position <= controllerPorts)
                 return new ControllerPortFragment(activity, position);
             else
@@ -383,7 +426,7 @@ public class ControllerSettingsActivity extends AppCompatActivity {
 
         @Override
         public int getItemCount() {
-            return NUM_CONTROLLER_PORTS + 2;
+            return controllerPorts + 2;
         }
     }
 }
\ No newline at end of file
diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index 5e40dc8aa..f9573a275 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -472,4 +472,16 @@
         <item>false</item>
         <item>true</item>
     </string-array>
+    <string-array name="settings_multitap_mode_entries">
+        <item>Disabled</item>
+        <item>Enable on Port 1 Only</item>
+        <item>Enable on Port 2 Only</item>
+        <item>Enable on Ports 1 and 2</item>
+    </string-array>
+    <string-array name="settings_multitap_mode_values">
+        <item>Disabled</item>
+        <item>Port1Only</item>
+        <item>Port2Only</item>
+        <item>BothPorts</item>
+    </string-array>
 </resources>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 3f92b2e5f..861f7bc3e 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -273,5 +273,7 @@
     <string name="controller_settings_category_axis_bindings">Axis Bindings</string>
     <string name="controller_settings_category_settings">Settings</string>
     <string name="controller_settings_category_touchscreen_controller">Touchscreen Controller</string>
-    <string name="controller_settings_category_memory_cards">Memory Cards</string>
+    <string name="controller_settings_category_ports">Ports</string>
+    <string name="controller_settings_main_port_format">Port %d</string>
+    <string name="controller_settings_sub_port_format">Port %1$d%2$c</string>
 </resources>
diff --git a/android/app/src/main/res/xml/controllers_preferences.xml b/android/app/src/main/res/xml/controllers_preferences.xml
index c25f063f0..521f0409e 100644
--- a/android/app/src/main/res/xml/controllers_preferences.xml
+++ b/android/app/src/main/res/xml/controllers_preferences.xml
@@ -55,7 +55,15 @@
 
     <PreferenceCategory
         app:iconSpaceReserved="false"
-        app:title="@string/controller_settings_category_memory_cards">
+        app:title="@string/controller_settings_category_ports">
+        <ListPreference
+            app:defaultValue="Disabled"
+            app:entries="@array/settings_multitap_mode_entries"
+            app:entryValues="@array/settings_multitap_mode_values"
+            app:iconSpaceReserved="false"
+            app:key="ControllerPorts/MultitapMode"
+            app:title="Multitap Mode"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
             app:defaultValue="PerGameTitle"
             app:entries="@array/settings_memory_card_mode_entries"