Android: Add NumericSetting support

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingBooleanSetting.java

@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model;
+
+import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting;
+import org.dolphinemu.dolphinemu.features.settings.model.AbstractBooleanSetting;
+import org.dolphinemu.dolphinemu.features.settings.model.Settings;
+
+public class InputMappingBooleanSetting implements AbstractBooleanSetting
+{
+  private final NumericSetting mNumericSetting;
+
+  public InputMappingBooleanSetting(NumericSetting numericSetting)
+  {
+    mNumericSetting = numericSetting;
+  }
+
+  @Override
+  public boolean getBoolean(Settings settings)
+  {
+    return mNumericSetting.getBooleanValue();
+  }
+
+  @Override
+  public void setBoolean(Settings settings, boolean newValue)
+  {
+    mNumericSetting.setBooleanValue(newValue);
+  }
+
+  @Override
+  public boolean isOverridden(Settings settings)
+  {
+    return false;
+  }
+
+  @Override
+  public boolean isRuntimeEditable()
+  {
+    return true;
+  }
+
+  @Override
+  public boolean delete(Settings settings)
+  {
+    mNumericSetting.setBooleanValue(mNumericSetting.getBooleanDefaultValue());
+    return true;
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingDoubleSetting.java

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model;
+
+import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting;
+import org.dolphinemu.dolphinemu.features.settings.model.AbstractFloatSetting;
+import org.dolphinemu.dolphinemu.features.settings.model.Settings;
+
+// Yes, floats are not the same thing as doubles... They're close enough, though
+public class InputMappingDoubleSetting implements AbstractFloatSetting
+{
+  private final NumericSetting mNumericSetting;
+
+  public InputMappingDoubleSetting(NumericSetting numericSetting)
+  {
+    mNumericSetting = numericSetting;
+  }
+
+  @Override
+  public float getFloat(Settings settings)
+  {
+    return (float) mNumericSetting.getDoubleValue();
+  }
+
+  @Override
+  public void setFloat(Settings settings, float newValue)
+  {
+    mNumericSetting.setDoubleValue(newValue);
+  }
+
+  @Override
+  public boolean isOverridden(Settings settings)
+  {
+    return false;
+  }
+
+  @Override
+  public boolean isRuntimeEditable()
+  {
+    return true;
+  }
+
+  @Override
+  public boolean delete(Settings settings)
+  {
+    mNumericSetting.setDoubleValue(mNumericSetting.getDoubleDefaultValue());
+    return true;
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlGroup.java

@@ -26,4 +26,8 @@ public class ControlGroup
   public native int getControlCount();
 
   public native Control getControl(int i);
+
+  public native int getNumericSettingCount();
+
+  public native NumericSetting getNumericSetting(int i);
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/NumericSetting.java

@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.input.model.controlleremu;
+
+import androidx.annotation.Keep;
+
+/**
+ * Represents a C++ ControllerEmu::NumericSetting.
+ *
+ * The lifetime of this class is managed by C++ code. Calling methods on it after it's destroyed
+ * in C++ is undefined behavior!
+ */
+public class NumericSetting
+{
+  public static final int TYPE_INT = 0;
+  public static final int TYPE_DOUBLE = 1;
+  public static final int TYPE_BOOLEAN = 2;
+
+  @Keep
+  private final long mPointer;
+
+  @Keep
+  private NumericSetting(long pointer)
+  {
+    mPointer = pointer;
+  }
+
+  /**
+   * @return The name used in the UI.
+   */
+  public native String getUiName();
+
+  /**
+   * @return A string applied to the number in the UI (unit of measure).
+   */
+  public native String getUiSuffix();
+
+  /**
+   * @return Detailed description of the setting.
+   */
+  public native String getUiDescription();
+
+  /**
+   * @return TYPE_INT, TYPE_DOUBLE or TYPE_BOOLEAN
+   */
+  public native int getType();
+
+  public native ControlReference getControlReference();
+
+  /**
+   * If the type is TYPE_DOUBLE, gets the current value. Otherwise, undefined behavior!
+   */
+  public native double getDoubleValue();
+
+  /**
+   * If the type is TYPE_DOUBLE, sets the current value. Otherwise, undefined behavior!
+   */
+  public native void setDoubleValue(double value);
+
+  /**
+   * If the type is TYPE_DOUBLE, gets the default value. Otherwise, undefined behavior!
+   */
+  public native double getDoubleDefaultValue();
+
+  /**
+   * If the type is TYPE_DOUBLE, returns the minimum valid value. Otherwise, undefined behavior!
+   */
+  public native double getDoubleMin();
+
+  /**
+   * If the type is TYPE_DOUBLE, returns the maximum valid value. Otherwise, undefined behavior!
+   */
+  public native double getDoubleMax();
+
+  /**
+   * If the type is TYPE_BOOLEAN, gets the current value. Otherwise, undefined behavior!
+   */
+  public native boolean getBooleanValue();
+
+  /**
+   * If the type is TYPE_BOOLEAN, sets the current value. Otherwise, undefined behavior!
+   */
+  public native void setBooleanValue(boolean value);
+
+  /**
+   * If the type is TYPE_BOOLEAN, gets the default value. Otherwise, undefined behavior!
+   */
+  public native boolean getBooleanDefaultValue();
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.java

@@ -19,6 +19,13 @@ public class FloatSliderSetting extends SliderSetting
     mSetting = setting;
   }
 
+  public FloatSliderSetting(AbstractFloatSetting setting, CharSequence name,
+          CharSequence description, int min, int max, String units)
+  {
+    super(name, description, min, max, units);
+    mSetting = setting;
+  }
+
   public int getSelectedValue(Settings settings)
   {
     return Math.round(mSetting.getFloat(settings));

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java

@@ -23,6 +23,14 @@ public abstract class SliderSetting extends SettingsItem
     mStepSize = stepSize;
   }
 
+  public SliderSetting(CharSequence name, CharSequence description, int min, int max, String units)
+  {
+    super(name, description);
+    mMin = min;
+    mMax = max;
+    mUnits = units;
+  }
+
   public abstract int getSelectedValue(Settings settings);
 
   public int getMin()

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java

@@ -14,8 +14,11 @@ import androidx.appcompat.app.AppCompatActivity;
 import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.activities.UserDataActivity;
+import org.dolphinemu.dolphinemu.features.input.model.InputMappingBooleanSetting;
+import org.dolphinemu.dolphinemu.features.input.model.InputMappingDoubleSetting;
 import org.dolphinemu.dolphinemu.features.input.model.controlleremu.ControlGroup;
 import org.dolphinemu.dolphinemu.features.input.model.controlleremu.EmulatedController;
+import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting;
 import org.dolphinemu.dolphinemu.features.input.model.view.InputMappingControlSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.AbstractBooleanSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.AbstractIntSetting;
@@ -30,6 +33,7 @@ import org.dolphinemu.dolphinemu.features.settings.model.StringSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.view.DateTimeChoiceSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.view.SwitchSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.view.FilePicker;
+import org.dolphinemu.dolphinemu.features.settings.model.view.FloatSliderSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.view.HeaderSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.view.HyperLinkHeaderSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.view.InputStringSetting;
@@ -1112,6 +1116,28 @@ public final class SettingsFragmentPresenter
       {
         sl.add(new InputMappingControlSetting(group.getControl(j), controller));
       }
+
+      int numericSettingCount = group.getNumericSettingCount();
+      for (int j = 0; j < numericSettingCount; j++)
+      {
+        addNumericSetting(sl, group.getNumericSetting(j));
+      }
+    }
+  }
+
+  private void addNumericSetting(ArrayList<SettingsItem> sl, NumericSetting setting)
+  {
+    switch (setting.getType())
+    {
+      case NumericSetting.TYPE_DOUBLE:
+        sl.add(new FloatSliderSetting(new InputMappingDoubleSetting(setting), setting.getUiName(),
+                "", (int) Math.ceil(setting.getDoubleMin()),
+                (int) Math.floor(setting.getDoubleMax()), setting.getUiSuffix()));
+        break;
+      case NumericSetting.TYPE_BOOLEAN:
+        sl.add(new SwitchSetting(new InputMappingBooleanSetting(setting), setting.getUiName(),
+                setting.getUiDescription()));
+        break;
     }
   }
 

Source/Android/jni/AndroidCommon/IDCache.cpp

@@ -87,6 +87,10 @@ static jclass s_control_class;
 static jfieldID s_control_pointer;
 static jmethodID s_control_constructor;
 
+static jclass s_numeric_setting_class;
+static jfieldID s_numeric_setting_pointer;
+static jmethodID s_numeric_setting_constructor;
+
 static jclass s_control_group_class;
 static jfieldID s_control_group_pointer;
 static jmethodID s_control_group_constructor;
@@ -459,6 +463,21 @@ jmethodID GetEmulatedControllerConstructor()
   return s_emulated_controller_constructor;
 }
 
+jclass GetNumericSettingClass()
+{
+  return s_numeric_setting_class;
+}
+
+jfieldID GetNumericSettingPointer()
+{
+  return s_numeric_setting_pointer;
+}
+
+jmethodID GetNumericSettingConstructor()
+{
+  return s_numeric_setting_constructor;
+}
+
 }  // namespace IDCache
 
 extern "C" {
@@ -646,6 +665,13 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
   s_emulated_controller_constructor = env->GetMethodID(emulated_controller_class, "<init>", "(J)V");
   env->DeleteLocalRef(emulated_controller_class);
 
+  const jclass numeric_setting_class =
+      env->FindClass("org/dolphinemu/dolphinemu/features/input/model/controlleremu/NumericSetting");
+  s_numeric_setting_class = reinterpret_cast<jclass>(env->NewGlobalRef(numeric_setting_class));
+  s_numeric_setting_pointer = env->GetFieldID(numeric_setting_class, "mPointer", "J");
+  s_numeric_setting_constructor = env->GetMethodID(numeric_setting_class, "<init>", "(J)V");
+  env->DeleteLocalRef(numeric_setting_class);
+
   return JNI_VERSION;
 }
 
@@ -677,5 +703,6 @@ JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved)
   env->DeleteGlobalRef(s_control_group_class);
   env->DeleteGlobalRef(s_control_reference_class);
   env->DeleteGlobalRef(s_emulated_controller_class);
+  env->DeleteGlobalRef(s_numeric_setting_class);
 }
 }

Source/Android/jni/AndroidCommon/IDCache.h

@@ -98,4 +98,8 @@ jclass GetEmulatedControllerClass();
 jfieldID GetEmulatedControllerPointer();
 jmethodID GetEmulatedControllerConstructor();
 
+jclass GetNumericSettingClass();
+jfieldID GetNumericSettingPointer();
+jmethodID GetNumericSettingConstructor();
+
 }  // namespace IDCache

Source/Android/jni/CMakeLists.txt

@@ -19,6 +19,8 @@ add_library(main SHARED
   Input/EmulatedController.cpp
   Input/InputOverrider.cpp
   Input/MappingCommon.cpp
+  Input/NumericSetting.cpp
+  Input/NumericSetting.h
   IniFile.cpp
   MainAndroid.cpp
   RiivolutionPatches.cpp

Source/Android/jni/Input/ControlGroup.cpp

@@ -10,6 +10,7 @@
 #include "jni/AndroidCommon/AndroidCommon.h"
 #include "jni/AndroidCommon/IDCache.h"
 #include "jni/Input/Control.h"
+#include "jni/Input/NumericSetting.h"
 
 static ControllerEmu::ControlGroup* GetPointer(JNIEnv* env, jobject obj)
 {
@@ -48,4 +49,18 @@ Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroup_g
 {
   return ControlToJava(env, GetPointer(env, obj)->controls[i].get());
 }
+
+JNIEXPORT jint JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroup_getNumericSettingCount(
+    JNIEnv* env, jobject obj)
+{
+  return static_cast<jint>(GetPointer(env, obj)->numeric_settings.size());
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroup_getNumericSetting(
+    JNIEnv* env, jobject obj, jint i)
+{
+  return NumericSettingToJava(env, GetPointer(env, obj)->numeric_settings[i].get());
+}
 }

Source/Android/jni/Input/NumericSetting.cpp

@@ -0,0 +1,139 @@
+// Copyright 2022 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "jni/Input/NumericSetting.h"
+
+#include <string>
+
+#include <jni.h>
+
+#include "Common/Assert.h"
+#include "Common/MsgHandler.h"
+#include "InputCommon/ControlReference/ControlReference.h"
+#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
+#include "jni/AndroidCommon/AndroidCommon.h"
+#include "jni/AndroidCommon/IDCache.h"
+#include "jni/Input/ControlReference.h"
+
+static const char* NullStringToEmptyString(const char* str)
+{
+  return str ? str : "";
+}
+
+static ControllerEmu::NumericSettingBase* GetPointer(JNIEnv* env, jobject obj)
+{
+  return reinterpret_cast<ControllerEmu::NumericSettingBase*>(
+      env->GetLongField(obj, IDCache::GetNumericSettingPointer()));
+}
+
+template <typename T>
+static ControllerEmu::NumericSetting<T>* GetPointer(JNIEnv* env, jobject obj)
+{
+  return reinterpret_cast<ControllerEmu::NumericSetting<T>*>(
+      env->GetLongField(obj, IDCache::GetNumericSettingPointer()));
+}
+
+jobject NumericSettingToJava(JNIEnv* env, ControllerEmu::NumericSettingBase* numeric_setting)
+{
+  if (!numeric_setting)
+    return nullptr;
+
+  return env->NewObject(IDCache::GetNumericSettingClass(), IDCache::GetNumericSettingConstructor(),
+                        reinterpret_cast<jlong>(numeric_setting));
+}
+
+extern "C" {
+
+JNIEXPORT jstring JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getUiName(
+    JNIEnv* env, jobject obj)
+{
+  return ToJString(env, Common::GetStringT(GetPointer(env, obj)->GetUIName()));
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getUiSuffix(
+    JNIEnv* env, jobject obj)
+{
+  const char* str = NullStringToEmptyString(GetPointer(env, obj)->GetUISuffix());
+  return ToJString(env, Common::GetStringT(str));
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getUiDescription(
+    JNIEnv* env, jobject obj)
+{
+  const char* str = NullStringToEmptyString(GetPointer(env, obj)->GetUIDescription());
+  return ToJString(env, Common::GetStringT(str));
+}
+
+JNIEXPORT jint JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getType(
+    JNIEnv* env, jobject obj)
+{
+  return static_cast<int>(GetPointer(env, obj)->GetType());
+}
+
+JNIEXPORT jobject JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getControlReference(
+    JNIEnv* env, jobject obj)
+{
+  return ControlReferenceToJava(env, &GetPointer(env, obj)->GetInputReference());
+}
+
+JNIEXPORT jdouble JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getDoubleValue(
+    JNIEnv* env, jobject obj)
+{
+  return GetPointer<double>(env, obj)->GetValue();
+}
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_setDoubleValue(
+    JNIEnv* env, jobject obj, jdouble value)
+{
+  GetPointer<double>(env, obj)->SetValue(value);
+}
+
+JNIEXPORT jdouble JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getDoubleDefaultValue(
+    JNIEnv* env, jobject obj)
+{
+  return GetPointer<double>(env, obj)->GetDefaultValue();
+}
+
+JNIEXPORT jdouble JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getDoubleMin(
+    JNIEnv* env, jobject obj)
+{
+  return GetPointer<double>(env, obj)->GetMinValue();
+}
+
+JNIEXPORT jdouble JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getDoubleMax(
+    JNIEnv* env, jobject obj)
+{
+  return GetPointer<double>(env, obj)->GetMaxValue();
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getBooleanValue(
+    JNIEnv* env, jobject obj)
+{
+  return static_cast<jboolean>(GetPointer<bool>(env, obj)->GetValue());
+}
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_setBooleanValue(
+    JNIEnv* env, jobject obj, jboolean value)
+{
+  GetPointer<bool>(env, obj)->SetValue(static_cast<bool>(value));
+}
+
+JNIEXPORT jboolean JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_NumericSetting_getBooleanDefaultValue(
+    JNIEnv* env, jobject obj)
+{
+  return static_cast<jboolean>(GetPointer<bool>(env, obj)->GetDefaultValue());
+}
+}

Source/Android/jni/Input/NumericSetting.h

@@ -0,0 +1,15 @@
+// Copyright 2022 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <jni.h>
+
+namespace ControllerEmu
+{
+class NumericSettingBase;
+}
+
+class ControlReference;
+
+jobject NumericSettingToJava(JNIEnv* env, ControllerEmu::NumericSettingBase* control);