From 571e189ecd249c55e090305389039deab292960c Mon Sep 17 00:00:00 2001 From: Willi Ye Date: Fri, 5 Feb 2021 21:19:30 +0100 Subject: [PATCH] Make serialVersionUID static * Some minor cleanup --- app/src/main/java/emu/skyline/input/Controller.kt | 5 ++++- .../emu/skyline/input/onscreen/OnScreenItemDefinitions.kt | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/emu/skyline/input/Controller.kt b/app/src/main/java/emu/skyline/input/Controller.kt index b7dac017..4d4b3ba4 100644 --- a/app/src/main/java/emu/skyline/input/Controller.kt +++ b/app/src/main/java/emu/skyline/input/Controller.kt @@ -45,7 +45,10 @@ open class Controller(val id : Int, var type : ControllerType, var rumbleDeviceD /** * The current version of this class so that different versions won't be deserialized mistakenly */ - private val serialVersionUID = 0L + companion object { + @JvmStatic + private val serialVersionUID = 6529685098267757690L + } } /** diff --git a/app/src/main/java/emu/skyline/input/onscreen/OnScreenItemDefinitions.kt b/app/src/main/java/emu/skyline/input/onscreen/OnScreenItemDefinitions.kt index 6a4b3d82..1d8114a9 100644 --- a/app/src/main/java/emu/skyline/input/onscreen/OnScreenItemDefinitions.kt +++ b/app/src/main/java/emu/skyline/input/onscreen/OnScreenItemDefinitions.kt @@ -249,8 +249,8 @@ class Controls(onScreenControllerView : OnScreenControllerView) { * We can take any of the global scale variables from the buttons */ var globalScale - get() = circularButtons[0].config.globalScale + get() = circularButtons.first().config.globalScale set(value) { - circularButtons[0].config.globalScale = value + circularButtons.first().config.globalScale = value } }