Merge branch 'feature/1980-notification-panel-constraint' into develop

Author: sds100

CHANGELOG.md

@@ -277,6 +277,12 @@ class ChooseConstraintViewModel @Inject constructor(
                 ConstraintId.LOCK_SCREEN_NOT_SHOWING ->
                     returnResult.emit(ConstraintData.LockScreenNotShowing)
 
+                ConstraintId.NOTIFICATION_PANEL_SHOWING ->
+                    returnResult.emit(ConstraintData.NotificationPanelShowing)
+
+                ConstraintId.NOTIFICATION_PANEL_NOT_SHOWING ->
+                    returnResult.emit(ConstraintData.NotificationPanelNotShowing)
+
                 ConstraintId.TIME -> {
                     timeConstraintState = ConstraintData.Time(
                         startHour = 0,

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

@@ -219,6 +219,16 @@ sealed class ConstraintData {
         override val id: ConstraintId = ConstraintId.HINGE_OPEN
     }
 
+    @Serializable
+    data object NotificationPanelShowing : ConstraintData() {
+        override val id: ConstraintId = ConstraintId.NOTIFICATION_PANEL_SHOWING
+    }
+
+    @Serializable
+    data object NotificationPanelNotShowing : ConstraintData() {
+        override val id: ConstraintId = ConstraintId.NOTIFICATION_PANEL_NOT_SHOWING
+    }
+
     @Serializable
     data class Time(
         val startHour: Int,
@@ -405,6 +415,10 @@ object ConstraintEntityMapper {
             ConstraintEntity.HINGE_CLOSED -> ConstraintData.HingeClosed
             ConstraintEntity.HINGE_OPEN -> ConstraintData.HingeOpen
 
+            ConstraintEntity.NOTIFICATION_PANEL_SHOWING -> ConstraintData.NotificationPanelShowing
+            ConstraintEntity.NOTIFICATION_PANEL_NOT_SHOWING ->
+                ConstraintData.NotificationPanelNotShowing
+
             ConstraintEntity.TIME -> {
                 val startTime =
                     entity.extras.getData(ConstraintEntity.EXTRA_START_TIME).valueOrNull()!!
@@ -725,6 +739,16 @@ object ConstraintEntityMapper {
             ConstraintEntity.HINGE_OPEN,
         )
 
+        is ConstraintData.NotificationPanelShowing -> ConstraintEntity(
+            uid = constraint.uid,
+            ConstraintEntity.NOTIFICATION_PANEL_SHOWING,
+        )
+
+        is ConstraintData.NotificationPanelNotShowing -> ConstraintEntity(
+            uid = constraint.uid,
+            ConstraintEntity.NOTIFICATION_PANEL_NOT_SHOWING,
+        )
+
         is ConstraintData.Time -> ConstraintEntity(
             uid = constraint.uid,
             type = ConstraintEntity.TIME,

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

@@ -19,4 +19,5 @@ enum class ConstraintDependency {
     RINGER_MODE,
     CHARGING_STATE,
     HINGE_STATE,
+    NOTIFICATION_PANEL_STATE,
 }

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

@@ -64,5 +64,8 @@ enum class ConstraintId {
     HINGE_CLOSED,
     HINGE_OPEN,
 
+    NOTIFICATION_PANEL_SHOWING,
+    NOTIFICATION_PANEL_NOT_SHOWING,
+
     TIME,
 }

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

@@ -79,6 +79,10 @@ class LazyConstraintSnapshot(
         lockScreenAdapter.isLockScreenShowing()
     }
 
+    private val isNotificationShadeExpanded: Boolean by lazy {
+        accessibilityService.isNotificationShadeExpanded.firstBlocking()
+    }
+
     private val localTime = LocalTime.now()
 
     private fun isMediaPlaying(): Boolean {
@@ -205,6 +209,9 @@ class LazyConstraintSnapshot(
                 !isLockscreenShowing ||
                     appInForeground != "com.android.systemui"
 
+            is ConstraintData.NotificationPanelShowing -> isNotificationShadeExpanded
+            is ConstraintData.NotificationPanelNotShowing -> !isNotificationShadeExpanded
+
             is ConstraintData.Time ->
                 if (constraint.data.startTime.isAfter(constraint.data.endTime)) {
                     localTime.isAfter(constraint.data.startTime) ||

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

@@ -177,6 +177,10 @@ class ConstraintUiHelper(
         is ConstraintData.LockScreenNotShowing -> getString(
             R.string.constraint_lock_screen_not_showing,
         )
+        is ConstraintData.NotificationPanelShowing ->
+            getString(R.string.constraint_notification_panel_showing)
+        is ConstraintData.NotificationPanelNotShowing ->
+            getString(R.string.constraint_notification_panel_not_showing)
         is ConstraintData.Time -> getString(
             R.string.constraint_time_formatted,
             arrayOf(

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

@@ -117,6 +117,10 @@ object ConstraintUtils {
         ConstraintId.HINGE_OPEN,
             -> ConstraintCategory.DEVICE
 
+        ConstraintId.NOTIFICATION_PANEL_SHOWING,
+        ConstraintId.NOTIFICATION_PANEL_NOT_SHOWING,
+            -> ConstraintCategory.DISPLAY
+
         ConstraintId.TIME -> ConstraintCategory.TIME
     }
 
@@ -200,6 +204,12 @@ object ConstraintUtils {
             Icons.Outlined.ScreenLockPortrait,
         )
         ConstraintId.LOCK_SCREEN_NOT_SHOWING -> ComposeIconInfo.Vector(Icons.Outlined.LockOpen)
+
+        ConstraintId.NOTIFICATION_PANEL_SHOWING ->
+            ComposeIconInfo.Vector(Icons.Outlined.Notifications)
+        ConstraintId.NOTIFICATION_PANEL_NOT_SHOWING ->
+            ComposeIconInfo.Vector(Icons.Outlined.NotificationsOff)
+
         ConstraintId.TIME -> ComposeIconInfo.Vector(Icons.Outlined.Timer)
     }
 
@@ -254,6 +264,10 @@ object ConstraintUtils {
         ConstraintId.HINGE_OPEN -> R.string.constraint_hinge_open
         ConstraintId.LOCK_SCREEN_SHOWING -> R.string.constraint_lock_screen_showing
         ConstraintId.LOCK_SCREEN_NOT_SHOWING -> R.string.constraint_lock_screen_not_showing
+        ConstraintId.NOTIFICATION_PANEL_SHOWING ->
+            R.string.constraint_notification_panel_showing
+        ConstraintId.NOTIFICATION_PANEL_NOT_SHOWING ->
+            R.string.constraint_notification_panel_not_showing
         ConstraintId.TIME -> R.string.constraint_time
     }
 }

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

@@ -105,6 +105,8 @@ class DetectConstraintsUseCaseImpl @AssistedInject constructor(
                 }
             ConstraintDependency.KEYBOARD_VISIBLE ->
                 accessibilityService.isInputMethodVisible.map { dependency }
+            ConstraintDependency.NOTIFICATION_PANEL_STATE ->
+                accessibilityService.isNotificationShadeExpanded.map { dependency }
         }
     }
 }

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

@@ -144,6 +144,8 @@ class KeyMapConstraintsComparator(
             is ConstraintData.PhysicalOrientation -> Success(
                 constraint.data.physicalOrientation.toString(),
             )
+            ConstraintData.NotificationPanelShowing -> Success("")
+            ConstraintData.NotificationPanelNotShowing -> Success("")
         }
     }
 }