#1434, #1426 fix: tint icon for key map launcher shortcuts correctly

Closes #1434 #1426

Author: sds100

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

@@ -1,13 +1,15 @@
 package io.github.sds100.keymapper.mappings.keymaps
 
 import android.content.Intent
+import android.graphics.Color
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.os.bundleOf
 import io.github.sds100.keymapper.R
 import io.github.sds100.keymapper.api.Api
 import io.github.sds100.keymapper.system.apps.AppShortcutAdapter
 import io.github.sds100.keymapper.util.Result
 import io.github.sds100.keymapper.util.ui.ResourceProvider
+import io.github.sds100.keymapper.util.ui.TintType
 
 /**
  * Created by sds100 on 23/03/2021.
@@ -24,33 +26,60 @@ class CreateKeyMapShortcutUseCaseImpl(
     override val isSupported: Boolean
         get() = adapter.areLauncherShortcutsSupported
 
-    override fun pinShortcutForSingleAction(keyMapUid: String, action: KeyMapAction): Result<*> =
-        adapter.pinShortcut(createShortcutForSingleAction(keyMapUid, action))
+    override fun pinShortcutForSingleAction(keyMapUid: String, action: KeyMapAction): Result<*> {
+        return adapter.pinShortcut(createShortcutForSingleAction(keyMapUid, action))
+    }
 
     override fun pinShortcutForMultipleActions(
         keyMapUid: String,
         shortcutLabel: String,
-    ): Result<*> = adapter.pinShortcut(createShortcutForMultipleActions(keyMapUid, shortcutLabel))
+    ): Result<*> {
+        return adapter.pinShortcut(createShortcutForMultipleActions(keyMapUid, shortcutLabel))
+    }
 
     override fun createIntentForSingleAction(
         keyMapUid: String,
         action: KeyMapAction,
-    ): Intent = adapter.createShortcutResultIntent(createShortcutForSingleAction(keyMapUid, action))
+    ): Intent {
+        return adapter.createShortcutResultIntent(createShortcutForSingleAction(keyMapUid, action))
+    }
 
-    override fun createIntentForMultipleActions(keyMapUid: String, shortcutLabel: String): Intent =
-        adapter.createShortcutResultIntent(
+    override fun createIntentForMultipleActions(keyMapUid: String, shortcutLabel: String): Intent {
+        return adapter.createShortcutResultIntent(
             createShortcutForMultipleActions(
                 keyMapUid,
                 shortcutLabel,
             ),
         )
+    }
 
     private fun createShortcutForSingleAction(
         keyMapUid: String,
         action: KeyMapAction,
     ): ShortcutInfoCompat {
-        val icon = actionUiHelper.getIcon(action.data)?.drawable
-            ?: getDrawable(R.mipmap.ic_launcher_round)
+        val iconInfo = actionUiHelper.getIcon(action.data)
+
+        // If the action doesn't have an icon then use the key mapper icon
+        // for the launcher shortcut.
+        if (iconInfo == null) {
+            return adapter.createLauncherShortcut(
+                iconResId = R.mipmap.ic_launcher_round,
+                label = actionUiHelper.getTitle(action.data, showDeviceDescriptors = false),
+                intentAction = Api.ACTION_TRIGGER_KEYMAP_BY_UID,
+                bundleOf(Api.EXTRA_KEYMAP_UID to keyMapUid),
+            )
+        }
+
+        val icon = iconInfo.drawable
+
+        when (iconInfo.tintType) {
+            // Always set the icon as black if it needs to be on surface because the
+            // background is white. Also, getting the colorOnSurface attribute
+            // from the application context doesn't seem to work correctly.
+            TintType.OnSurface -> icon.setTint(Color.BLACK)
+            is TintType.Color -> icon.setTint(iconInfo.tintType.color)
+            else -> {}
+        }
 
         return adapter.createLauncherShortcut(
             icon = icon,
@@ -64,7 +93,7 @@ class CreateKeyMapShortcutUseCaseImpl(
         keyMapUid: String,
         shortcutLabel: String,
     ): ShortcutInfoCompat = adapter.createLauncherShortcut(
-        icon = getDrawable(R.mipmap.ic_launcher_round),
+        iconResId = R.mipmap.ic_launcher_round,
         label = shortcutLabel,
         intentAction = Api.ACTION_TRIGGER_KEYMAP_BY_UID,
         bundleOf(Api.EXTRA_KEYMAP_UID to keyMapUid),

app/src/main/java/io/github/sds100/keymapper/system/apps/AndroidAppShortcutAdapter.kt

@@ -54,9 +54,37 @@ class AndroidAppShortcutAdapter(context: Context) : AppShortcutAdapter {
         label: String,
         intentAction: String,
         intentExtras: Bundle,
+    ): ShortcutInfoCompat {
+        return createLauncherShortcut(
+            IconCompat.createWithBitmap(icon.toBitmap()),
+            label,
+            intentAction,
+            intentExtras,
+        )
+    }
+
+    override fun createLauncherShortcut(
+        iconResId: Int,
+        label: String,
+        intentAction: String,
+        intentExtras: Bundle,
+    ): ShortcutInfoCompat {
+        return createLauncherShortcut(
+            IconCompat.createWithResource(ctx, iconResId),
+            label,
+            intentAction,
+            intentExtras,
+        )
+    }
+
+    private fun createLauncherShortcut(
+        icon: IconCompat,
+        label: String,
+        intentAction: String,
+        intentExtras: Bundle,
     ): ShortcutInfoCompat {
         val builder = ShortcutInfoCompat.Builder(ctx, UUID.randomUUID().toString()).apply {
-            setIcon(IconCompat.createWithBitmap(icon.toBitmap()))
+            setIcon(icon)
             setShortLabel(label)
 
             Intent(ctx, LaunchKeyMapShortcutActivity::class.java).apply {

app/src/main/java/io/github/sds100/keymapper/system/apps/AppShortcutAdapter.kt

@@ -23,6 +23,13 @@ interface AppShortcutAdapter {
         intentExtras: Bundle,
     ): ShortcutInfoCompat
 
+    fun createLauncherShortcut(
+        iconResId: Int,
+        label: String,
+        intentAction: String,
+        intentExtras: Bundle,
+    ): ShortcutInfoCompat
+
     fun pinShortcut(shortcut: ShortcutInfoCompat): Result<*>
     fun createShortcutResultIntent(shortcut: ShortcutInfoCompat): Intent
 

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

@@ -25,8 +25,7 @@ class ResourceProviderImpl(
 
     override val onThemeChange = MutableSharedFlow<Unit>()
 
-    override fun getString(resId: Int, args: Array<Any>): String =
-        ctx.str(resId, formatArgArray = args)
+    override fun getString(resId: Int, args: Array<Any>): String = ctx.str(resId, formatArgArray = args)
 
     override fun getText(resId: Int): CharSequence = ctx.getText(resId)