ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11894 from t895/interface-fix 

android: Fix compilation error from Kotlin changes
This commit is contained in:
JosJuice 2023-06-06 19:07:08 +02:00 committed by GitHub
parent afc97ec20f 05b1aa3775
commit 5d40871dd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
View File

@ -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"