#1566 hide fix button for floating button deleted error

Author: sds100

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/KeyMapListItemCreator.kt

@@ -24,6 +24,7 @@ import io.github.sds100.keymapper.mappings.keymaps.trigger.TriggerMode
 import io.github.sds100.keymapper.system.devices.InputDeviceUtils
 import io.github.sds100.keymapper.system.inputevents.InputEventUtils
 import io.github.sds100.keymapper.util.Error
+import io.github.sds100.keymapper.util.isFixable
 import io.github.sds100.keymapper.util.ui.ResourceProvider
 import io.github.sds100.keymapper.util.ui.compose.ComposeChipModel
 import io.github.sds100.keymapper.util.ui.compose.ComposeIconInfo
@@ -149,7 +150,7 @@ class KeyMapListItemCreator(
             val chip = if (error == null) {
                 ComposeChipModel.Normal(id = action.uid, text = chipText, icon = icon)
             } else {
-                ComposeChipModel.Error(action.uid, chipText, error)
+                ComposeChipModel.Error(action.uid, chipText, error, isFixable = error.isFixable)
             }
 
             yield(chip)

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/KeyMapListScreen.kt

@@ -296,6 +296,7 @@ private fun KeyMapListItem(
                             ErrorChip(
                                 onClick = { onTriggerErrorClick(error) },
                                 text = getTriggerErrorMessage(error),
+                                enabled = error.isFixable,
                             )
                         }
                     }
@@ -486,14 +487,19 @@ private fun ActionConstraintChip(
             )
         }
 
-        is ComposeChipModel.Error -> ErrorChip(onClick = { onFixClick(model.error) }, model.text)
+        is ComposeChipModel.Error -> ErrorChip(
+            onClick = { onFixClick(model.error) },
+            model.text,
+            model.isFixable,
+        )
     }
 }
 
 @Composable
 private fun ErrorChip(
     onClick: () -> Unit,
     text: String,
+    enabled: Boolean,
 ) {
     CompactChip(
         text = text,
@@ -507,6 +513,7 @@ private fun ErrorChip(
         containerColor = MaterialTheme.colorScheme.errorContainer,
         contentColor = MaterialTheme.colorScheme.onErrorContainer,
         onClick = onClick,
+        enabled = enabled,
     )
 }
 
@@ -517,35 +524,29 @@ private fun CompactChip(
     icon: (@Composable () -> Unit)? = null,
     containerColor: Color = MaterialTheme.colorScheme.surfaceContainer,
     contentColor: Color = MaterialTheme.colorScheme.onSurface,
-) {
-    Surface(
-        modifier = modifier.height(chipHeight),
-        color = containerColor,
-        shape = AssistChipDefaults.shape,
-    ) {
-        CompactChipContent(icon, text, contentColor)
-    }
-}
-
-@Composable
-private fun CompactChip(
-    modifier: Modifier = Modifier,
-    text: String,
-    icon: (@Composable () -> Unit)? = null,
-    containerColor: Color = MaterialTheme.colorScheme.surfaceContainer,
-    contentColor: Color = MaterialTheme.colorScheme.onSurface,
-    onClick: () -> Unit,
+    onClick: (() -> Unit)? = null,
+    enabled: Boolean = false,
 ) {
     CompositionLocalProvider(
         LocalMinimumInteractiveComponentSize provides 16.dp,
     ) {
-        Surface(
-            modifier = modifier.height(chipHeight),
-            color = containerColor,
-            shape = AssistChipDefaults.shape,
-            onClick = onClick,
-        ) {
-            CompactChipContent(icon, text, contentColor)
+        if (onClick == null || !enabled) {
+            Surface(
+                modifier = modifier.height(chipHeight),
+                color = containerColor,
+                shape = AssistChipDefaults.shape,
+            ) {
+                CompactChipContent(icon, text, contentColor)
+            }
+        } else {
+            Surface(
+                modifier = modifier.height(chipHeight),
+                color = containerColor,
+                shape = AssistChipDefaults.shape,
+                onClick = onClick,
+            ) {
+                CompactChipContent(icon, text, contentColor)
+            }
         }
     }
 }

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/BaseConfigTriggerViewModel.kt

@@ -598,7 +598,7 @@ abstract class BaseConfigTriggerViewModel(
         }
     }
 
-    fun onTriggerErrorClick(error: TriggerError) {
+    open fun onTriggerErrorClick(error: TriggerError) {
         coroutineScope.launch {
             when (error) {
                 TriggerError.DND_ACCESS_DENIED ->
@@ -609,12 +609,6 @@ abstract class BaseConfigTriggerViewModel(
                         fixError = { displayKeyMap.fixTriggerError(error) },
                     )
 
-                TriggerError.ASSISTANT_TRIGGER_NOT_PURCHASED,
-                TriggerError.FLOATING_BUTTONS_NOT_PURCHASED,
-                -> {
-                    showAdvancedTriggersBottomSheet = true
-                }
-
                 TriggerError.DPAD_IME_NOT_SELECTED -> {
                     showDpadTriggerSetupBottomSheet = true
                 }

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerError.kt

@@ -3,21 +3,21 @@ package io.github.sds100.keymapper.mappings.keymaps.trigger
 /**
  * Created by sds100 on 04/04/2021.
  */
-enum class TriggerError {
-    DND_ACCESS_DENIED,
-    SCREEN_OFF_ROOT_DENIED,
-    CANT_DETECT_IN_PHONE_CALL,
+enum class TriggerError(val isFixable: Boolean) {
+    DND_ACCESS_DENIED(isFixable = true),
+    SCREEN_OFF_ROOT_DENIED(isFixable = true),
+    CANT_DETECT_IN_PHONE_CALL(isFixable = true),
 
     // This error appears when a key map has an assistant trigger but the user hasn't purchased
     // the product.
-    ASSISTANT_TRIGGER_NOT_PURCHASED,
+    ASSISTANT_TRIGGER_NOT_PURCHASED(isFixable = true),
 
     /**
      * A Key Mapper IME must be used for DPAD triggers to work.
      */
-    DPAD_IME_NOT_SELECTED,
+    DPAD_IME_NOT_SELECTED(isFixable = true),
 
-    FLOATING_BUTTON_DELETED,
+    FLOATING_BUTTON_DELETED(isFixable = false),
 
-    FLOATING_BUTTONS_NOT_PURCHASED,
+    FLOATING_BUTTONS_NOT_PURCHASED(isFixable = true),
 }

app/src/main/java/io/github/sds100/keymapper/mappings/keymaps/trigger/TriggerKeyListItem.kt

@@ -186,7 +186,7 @@ fun TriggerKeyListItem(
                 CompositionLocalProvider(
                     LocalMinimumInteractiveComponentSize provides 16.dp,
                 ) {
-                    if (model.error != null) {
+                    if (model.error != null && model.error?.isFixable ?: false) {
                         FilledTonalButton(
                             modifier = Modifier.padding(start = 8.dp, end = 8.dp),
                             onClick = { onFixClick(model.error!!) },

app/src/main/java/io/github/sds100/keymapper/util/ErrorUtils.kt

@@ -173,6 +173,7 @@ val Error.isFixable: Boolean
         is Error.PermissionDenied,
         is Error.ShizukuNotStarted,
         is Error.CantDetectKeyEventsInPhoneCall,
+
         -> true
 
         else -> false

app/src/main/java/io/github/sds100/keymapper/util/ui/compose/ComposeChipModel.kt

@@ -14,5 +14,6 @@ sealed class ComposeChipModel {
         override val id: String,
         override val text: String,
         val error: io.github.sds100.keymapper.util.Error,
+        val isFixable: Boolean = true,
     ) : ComposeChipModel()
 }