Merge pull request #11894 from t895/interface-fix

android: Fix compilation error from Kotlin changes
dolphin-emu · Jun 6, 2023 · 5d40871 · 5d40871
2 parents afc97ec + 05b1aa3
commit 5d40871
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
@@ -65,7 +65,7 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
 
     private lateinit var settings: Settings
 
-    private var themeId = 0
+    override var themeId = 0
 
     private var menuVisible = false
 
@@ -513,7 +513,7 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
         val builder = MaterialAlertDialogBuilder(this)
             .setTitle(R.string.emulation_toggle_controls)
 
-        val currentController = InputOverlay.getConfiguredControllerType()
+        val currentController = InputOverlay.configuredControllerType
 
         if (currentController == InputOverlay.OVERLAY_GAMECUBE) {
             val gcEnabledButtons = BooleanArray(11)
@@ -577,7 +577,7 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
         val currentValue = IntSetting.MAIN_DOUBLE_TAP_BUTTON.int
 
         val buttonList =
-            if (InputOverlay.getConfiguredControllerType() == InputOverlay.OVERLAY_WIIMOTE_CLASSIC) R.array.doubleTapWithClassic else R.array.doubleTap
+            if (InputOverlay.configuredControllerType == InputOverlay.OVERLAY_WIIMOTE_CLASSIC) R.array.doubleTapWithClassic else R.array.doubleTap
 
         var checkedItem = -1
         val itemCount = resources.getStringArray(buttonList).size
@@ -898,8 +898,6 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
         this.themeId = themeId
     }
 
-    override fun getThemeId(): Int = themeId
-
     companion object {
         private const val BACKSTACK_NAME_MENU = "menu"
         private const val BACKSTACK_NAME_SUBMENU = "submenu"