Merge branch 'master' into release

Swordfish90 · Mar 21, 2022 · d81fd6c · d81fd6c
2 parents 90588c9 + 7bde9b4
commit d81fd6c
Show file tree

Hide file tree

Showing 7 changed files with 242 additions and 152 deletions.
diff --git a/buildSrc/src/main/java/deps.kt b/buildSrc/src/main/java/deps.kt
@@ -26,7 +26,7 @@ object deps {
         const val epoxy           = "4.6.3-vinay-compose"
         const val serialization   = "1.2.2"
         const val libretrodroid   = "0.7.0"
-        const val radialgamepad   = "0.6.1"
+        const val radialgamepad   = "1.0.0"
     }
 
     object libs {

diff --git a/lemuroid-app/build.gradle.kts b/lemuroid-app/build.gradle.kts
@@ -7,8 +7,8 @@ plugins {
 
 android {
     defaultConfig {
-        versionCode = 161
-        versionName = "1.13.0" // Always remember to update Cores Tag!
+        versionCode = 163
+        versionName = "1.13.1" // Always remember to update Cores Tag!
         applicationId = "com.swordfish.lemuroid"
     }
 

diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/game/GameActivity.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/mobile/feature/game/GameActivity.kt
@@ -677,18 +677,23 @@ class GameActivity : BaseGameActivity() {
             leftPad.primaryDialMaxSizeDp = DEFAULT_PRIMARY_DIAL_SIZE * leftScale
             rightPad.primaryDialMaxSizeDp = DEFAULT_PRIMARY_DIAL_SIZE * rightScale
 
+            val baseVerticalMargin = GraphicsUtils.convertDpToPixel(
+                touchControllerConfig.verticalMarginDP,
+                applicationContext
+            )
+
             if (orientation == Configuration.ORIENTATION_PORTRAIT) {
                 leftPad.spacingBottom = linearInterpolation(
                     padSettings.marginY,
                     0f,
                     maxMargins
-                ).roundToInt()
+                ).roundToInt() + baseVerticalMargin.roundToInt()
                 leftPad.spacingLeft = 0
                 rightPad.spacingBottom = linearInterpolation(
                     padSettings.marginY,
                     0f,
                     maxMargins
-                ).roundToInt()
+                ).roundToInt() + baseVerticalMargin.roundToInt()
                 rightPad.spacingRight = 0
 
                 leftPad.offsetX = linearInterpolation(padSettings.marginX, 0f, maxMargins)
@@ -697,9 +702,9 @@ class GameActivity : BaseGameActivity() {
                 leftPad.offsetY = 0f
                 rightPad.offsetY = 0f
             } else {
-                leftPad.spacingBottom = 0
+                leftPad.spacingBottom = baseVerticalMargin.roundToInt()
                 leftPad.spacingLeft = linearInterpolation(padSettings.marginX, 0f, maxMargins).roundToInt()
-                rightPad.spacingBottom = 0
+                rightPad.spacingBottom = baseVerticalMargin.roundToInt()
                 rightPad.spacingRight = linearInterpolation(
                     padSettings.marginX,
                     0f,

diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/input/InputClass.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/input/InputClass.kt
@@ -20,8 +20,9 @@ interface InputClass {
     fun getSupportedShortcuts(): List<GameMenuShortcut>
 }
 
-fun InputDevice.getInputClass(): InputClass {
+fun InputDevice?.getInputClass(): InputClass {
     return when {
+        this == null -> InputClassUnknown
         (sources and InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD -> InputClassGamePad
         (sources and InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD -> InputClassKeyboard
         else -> InputClassUnknown