diff options
| author | JosJuice <josjuice@gmail.com> | 2023-06-06 19:07:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 19:07:08 +0200 |
| commit | 5d40871dd458ccb289beabeb35a2eff4c4c5625e (patch) | |
| tree | 23bd3464a57cb90bbc3b126c41771a02dd6f69bb /Source/Android | |
| parent | afc97ec20f26b7aded4552a9cf9dba7807046ef8 (diff) | |
| parent | 05b1aa377555904ef9ba457f0812b0eebc66fa7b (diff) | |
Merge pull request #11894 from t895/interface-fix
android: Fix compilation error from Kotlin changes
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt | 8 |
1 files changed, 3 insertions, 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 index dbe900be39..9d189eac32 100644 --- 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" |