#1773 feat: allow showing floating buttons on top of the status bar or input method

Author: sds100

CHANGELOG.md

@@ -11,6 +11,7 @@
 - #1788 dismiss lockscreen when launching app action from lockscreen
 - Show tips for parallel and sequence triggers, and constraints in the trigger screen
 - #397 enable/disable all key maps in a group
+- #1773 Option to show floating buttons on top of keyboard or notification panel.
 
 ## Removed
 

base/src/main/assets/whats-new.txt

@@ -6,6 +6,8 @@ Version 4.0! 🎉
 
 Enable/disable all the key maps in a group
 
+Option to show floating buttons on top of keyboard or notification panel
+
 Many other bug fixes and optimisations
 
 See all the changes at http://changelog.keymapper.club.

base/src/main/java/io/github/sds100/keymapper/base/backup/BackupManager.kt

@@ -257,6 +257,9 @@ class BackupManagerImpl @Inject constructor(
 
                     // Do nothing. Just added columns to the accessibility node table.
                     JsonMigration(19, 20) { json -> json },
+
+                    // Do nothing. Just added columns to floating button entity.
+                    JsonMigration(20, 21) { json -> json },
                 )
 
                 if (keyMapListJsonArray != null) {

base/src/main/java/io/github/sds100/keymapper/base/floating/FloatingButtonData.kt

@@ -16,6 +16,8 @@ data class FloatingButtonData(
     val layoutName: String,
     val appearance: FloatingButtonAppearance,
     val location: Location,
+    val showOverStatusBar: Boolean,
+    val showOverInputMethod: Boolean,
 ) {
     /**
      * This stores data about where a draggable overlay is located. It needs extra information
@@ -79,6 +81,8 @@ object FloatingButtonEntityMapper {
                 orientation = ConstantTypeConverters.ORIENTATION_MAP.getKey(entity.orientation)!!,
                 displaySize = SizeKM(entity.displayWidth, entity.displayHeight),
             ),
+            showOverStatusBar = entity.showOverStatusBar ?: false,
+            showOverInputMethod = entity.showOverInputMethod ?: false,
         )
     }
 
@@ -95,6 +99,8 @@ object FloatingButtonEntityMapper {
             orientation = ConstantTypeConverters.ORIENTATION_MAP[button.location.orientation]!!,
             displayWidth = button.location.displaySize.width,
             displayHeight = button.location.displaySize.height,
+            showOverStatusBar = button.showOverStatusBar,
+            showOverInputMethod = button.showOverInputMethod,
         )
     }
 }

base/src/main/java/io/github/sds100/keymapper/base/utils/ui/compose/icons/SwitchText.kt

@@ -0,0 +1,57 @@
+package io.github.sds100.keymapper.base.utils.ui.compose.icons
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun SwitchText(
+    modifier: Modifier = Modifier,
+    text: String,
+    isChecked: Boolean,
+    isEnabled: Boolean = true,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    Surface(modifier = modifier, shape = MaterialTheme.shapes.medium, color = Color.Transparent) {
+        Row(
+            modifier = Modifier
+                .clickable(enabled = isEnabled) { onCheckedChange(!isChecked) }
+                .padding(8.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Switch(
+                enabled = isEnabled,
+                checked = isChecked,
+                // This is null so tapping on the checkbox highlights the whole row.
+                onCheckedChange = null,
+            )
+
+            Text(
+                modifier = Modifier.padding(horizontal = 12.dp),
+
+                text = text,
+                style = if (isEnabled) {
+                    MaterialTheme.typography.bodyLarge
+                } else {
+                    MaterialTheme.typography.bodyLarge.copy(
+                        color = MaterialTheme.colorScheme.onSurface.copy(
+                            alpha = 0.5f,
+                        ),
+                    )
+                },
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}

base/src/main/res/values/strings.xml

@@ -1296,6 +1296,8 @@
     <string name="floating_button_config_cancel_button">Cancel</string>
     <string name="floating_button_config_done_button">Done</string>
     <string name="floating_button_config_empty_text_error">The button must have text!</string>
+    <string name="floating_button_config_show_over_status_bar">Show over notification panel</string>
+    <string name="floating_button_config_show_over_input_method">Show over keyboard</string>
     <string name="floating_buttons_product_title">Floating buttons</string>
     <string name="floating_buttons_product_description">Floating buttons display over the apps you want. They work just like real buttons, and you can place, style, and map them however you like.</string>
     <string name="floating_button_text_key_map_list_item">Floating button %s (%s)</string>

data/schemas/io.github.sds100.keymapper.data.db.AppDatabase/20.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 20,
-    "identityHash": "f2f5eac59b7bdee472c0dd7ff9bae4b2",
+    "identityHash": "924d05910c30626072186db67e664837",
     "entities": [
       {
         "tableName": "keymaps",
@@ -220,7 +220,7 @@
       },
       {
         "tableName": "floating_buttons",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` TEXT NOT NULL, `layout_uid` TEXT NOT NULL, `text` TEXT NOT NULL, `button_size` INTEGER NOT NULL, `x` INTEGER NOT NULL, `y` INTEGER NOT NULL, `orientation` TEXT NOT NULL, `display_width` INTEGER NOT NULL, `display_height` INTEGER NOT NULL, `border_opacity` REAL, `background_opacity` REAL, PRIMARY KEY(`uid`), FOREIGN KEY(`layout_uid`) REFERENCES `floating_layouts`(`uid`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` TEXT NOT NULL, `layout_uid` TEXT NOT NULL, `text` TEXT NOT NULL, `button_size` INTEGER NOT NULL, `x` INTEGER NOT NULL, `y` INTEGER NOT NULL, `orientation` TEXT NOT NULL, `display_width` INTEGER NOT NULL, `display_height` INTEGER NOT NULL, `border_opacity` REAL, `background_opacity` REAL, `show_over_status_bar` INTEGER NOT NULL DEFAULT 0, `show_over_input_method` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`uid`), FOREIGN KEY(`layout_uid`) REFERENCES `floating_layouts`(`uid`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "uid",
@@ -285,6 +285,20 @@
             "fieldPath": "backgroundOpacity",
             "columnName": "background_opacity",
             "affinity": "REAL"
+          },
+          {
+            "fieldPath": "showOverStatusBar",
+            "columnName": "show_over_status_bar",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "showOverInputMethod",
+            "columnName": "show_over_input_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
           }
         ],
         "primaryKey": {
@@ -454,7 +468,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f2f5eac59b7bdee472c0dd7ff9bae4b2')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '924d05910c30626072186db67e664837')"
     ]
   }
 }