#985 feat: constraints for foldable hinge being open/closed.

Author: sds100

CHANGELOG.md

@@ -19,6 +19,7 @@
 - #661 Action to execute shell commands.
 - #991 Consolidated volume and stream actions.
 - #1066 Action to mute/unmute microphone.
+- #985 Constraints for foldable hinge being open/closed.
 
 ## Removed
 

base/src/main/java/io/github/sds100/keymapper/base/constraints/ConstraintSnapshot.kt

@@ -1,15 +1,16 @@
 package io.github.sds100.keymapper.base.constraints
 
 import android.media.AudioManager
+import android.os.Build
 import io.github.sds100.keymapper.base.system.accessibility.IAccessibilityService
 import io.github.sds100.keymapper.common.utils.Orientation
 import io.github.sds100.keymapper.common.utils.firstBlocking
 import io.github.sds100.keymapper.system.bluetooth.BluetoothDeviceInfo
 import io.github.sds100.keymapper.system.camera.CameraAdapter
 import io.github.sds100.keymapper.system.devices.DevicesAdapter
 import io.github.sds100.keymapper.system.display.DisplayAdapter
-import io.github.sds100.keymapper.system.hinge.FoldableAdapter
-import io.github.sds100.keymapper.system.hinge.HingeState
+import io.github.sds100.keymapper.system.foldable.FoldableAdapter
+import io.github.sds100.keymapper.system.foldable.HingeState
 import io.github.sds100.keymapper.system.inputmethod.InputMethodAdapter
 import io.github.sds100.keymapper.system.lock.LockScreenAdapter
 import io.github.sds100.keymapper.system.media.MediaAdapter
@@ -145,16 +146,24 @@ class LazyConstraintSnapshot(
             is ConstraintData.Discharging -> !isCharging
 
             is ConstraintData.HingeClosed -> {
-                when (val state = foldableAdapter.hingeState.value) {
-                    is HingeState.Available -> state.angle < 30f
-                    is HingeState.Unavailable -> false
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    when (val state = foldableAdapter.hingeState.value) {
+                        is HingeState.Available -> state.angle < 30f
+                        is HingeState.Unavailable -> false
+                    }
+                } else {
+                    false
                 }
             }
 
             is ConstraintData.HingeOpen -> {
-                when (val state = foldableAdapter.hingeState.value) {
-                    is HingeState.Available -> state.angle >= 150f
-                    is HingeState.Unavailable -> false
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    when (val state = foldableAdapter.hingeState.value) {
+                        is HingeState.Available -> state.angle >= 150f
+                        is HingeState.Unavailable -> false
+                    }
+                } else {
+                    false
                 }
             }
 

base/src/main/java/io/github/sds100/keymapper/base/constraints/DetectConstraintsUseCase.kt

@@ -8,7 +8,7 @@ import io.github.sds100.keymapper.system.camera.CameraAdapter
 import io.github.sds100.keymapper.system.camera.CameraLens
 import io.github.sds100.keymapper.system.devices.DevicesAdapter
 import io.github.sds100.keymapper.system.display.DisplayAdapter
-import io.github.sds100.keymapper.system.hinge.FoldableAdapter
+import io.github.sds100.keymapper.system.foldable.FoldableAdapter
 import io.github.sds100.keymapper.system.inputmethod.InputMethodAdapter
 import io.github.sds100.keymapper.system.lock.LockScreenAdapter
 import io.github.sds100.keymapper.system.media.MediaAdapter

base/src/main/java/io/github/sds100/keymapper/base/sorting/comparators/KeyMapConstraintsComparator.kt

@@ -133,6 +133,9 @@ class KeyMapConstraintsComparator(
                     .toEpochSecond(LocalDate.now(), ZoneOffset.UTC)
                     .toString(),
             )
+
+            ConstraintData.HingeClosed -> Success("")
+            ConstraintData.HingeOpen -> Success("")
         }
     }
 }

system/src/main/java/io/github/sds100/keymapper/system/SystemHiltModule.kt

@@ -22,8 +22,8 @@ import io.github.sds100.keymapper.system.display.AndroidDisplayAdapter
 import io.github.sds100.keymapper.system.display.DisplayAdapter
 import io.github.sds100.keymapper.system.files.AndroidFileAdapter
 import io.github.sds100.keymapper.system.files.FileAdapter
-import io.github.sds100.keymapper.system.hinge.AndroidFoldableAdapter
-import io.github.sds100.keymapper.system.hinge.FoldableAdapter
+import io.github.sds100.keymapper.system.foldable.AndroidFoldableAdapter
+import io.github.sds100.keymapper.system.foldable.FoldableAdapter
 import io.github.sds100.keymapper.system.inputmethod.AndroidInputMethodAdapter
 import io.github.sds100.keymapper.system.inputmethod.InputMethodAdapter
 import io.github.sds100.keymapper.system.intents.IntentAdapter

…r/system/hinge/AndroidFoldableAdapter.kt …ystem/foldable/AndroidFoldableAdapter.ktsystem/src/main/java/io/github/sds100/keymapper/system/hinge/AndroidFoldableAdapter.kt renamed to system/src/main/java/io/github/sds100/keymapper/system/foldable/AndroidFoldableAdapter.kt system/src/main/java/io/github/sds100/keymapper/system/hinge/AndroidFoldableAdapter.kt renamed to system/src/main/java/io/github/sds100/keymapper/system/foldable/AndroidFoldableAdapter.kt

@@ -1,4 +1,4 @@
-package io.github.sds100.keymapper.system.hinge
+package io.github.sds100.keymapper.system.foldable
 
 import android.content.Context
 import android.hardware.Sensor

…eymapper/system/hinge/FoldableAdapter.kt …apper/system/foldable/FoldableAdapter.ktsystem/src/main/java/io/github/sds100/keymapper/system/hinge/FoldableAdapter.kt renamed to system/src/main/java/io/github/sds100/keymapper/system/foldable/FoldableAdapter.kt system/src/main/java/io/github/sds100/keymapper/system/hinge/FoldableAdapter.kt renamed to system/src/main/java/io/github/sds100/keymapper/system/foldable/FoldableAdapter.kt

@@ -1,7 +1,7 @@
-package io.github.sds100.keymapper.system.hinge
+package io.github.sds100.keymapper.system.foldable
 
-import androidx.annotation.RequiresApi
 import android.os.Build
+import androidx.annotation.RequiresApi
 import kotlinx.coroutines.flow.StateFlow
 
 /**