diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-06-06 12:36:21 -0400 |
|---|---|---|
| committer | Charles Lombardo <clombardo169@gmail.com> | 2023-06-06 12:36:21 -0400 |
| commit | 05b1aa377555904ef9ba457f0812b0eebc66fa7b (patch) | |
| tree | c7ed6399524e008398270c3cb8d0e262ea3c79c5 /Source/Android/app/src/main/java/org | |
| parent | 38b033a476d6121c2beb46ba16d80c7a7849342c (diff) | |
android: Fix compilation error from Kotlin changes
Since the ThemeProvider interface changed `fun getThemeId()` to `var themeId`, I had to adjust how it was used in the EmulationActivity. Similar case for `fun getConfiguredControllerType()`.
Diffstat (limited to 'Source/Android/app/src/main/java/org')
| -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" |