VERY experimental Nintendo Switch 2 emulator
C++
android: Use suspend function for creating dynamic shortcuts
t895dfe5b1545da4
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.ktindex 0c82cdba88..2ef6385597 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt@@ -22,12 +22,16 @@ import androidx.core.graphics.drawable.toBitmapimport androidx.core.graphics.drawable.toDrawableimport androidx.documentfile.provider.DocumentFileimport androidx.lifecycle.ViewModelProvider+import androidx.lifecycle.lifecycleScopeimport androidx.navigation.findNavControllerimport androidx.preference.PreferenceManagerimport androidx.recyclerview.widget.AsyncDifferConfigimport androidx.recyclerview.widget.DiffUtilimport androidx.recyclerview.widget.ListAdapterimport androidx.recyclerview.widget.RecyclerView+import kotlinx.coroutines.Dispatchers+import kotlinx.coroutines.launch+import kotlinx.coroutines.withContextimport org.yuzu.yuzu_emu.HomeNavigationDirectionsimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplication@@ -92,28 +96,34 @@ class GameAdapter(private val activity: AppCompatActivity) :data = Uri.parse(holder.game.path)}- val layerDrawable = ResourcesCompat.getDrawable(- YuzuApplication.appContext.resources,- R.drawable.shortcut,- null- ) as LayerDrawable- layerDrawable.setDrawableByLayerId(- R.id.shortcut_foreground,- GameIconUtils.getGameIcon(holder.game).toDrawable(YuzuApplication.appContext.resources)- )- val inset = YuzuApplication.appContext.resources- .getDimensionPixelSize(R.dimen.icon_inset)- layerDrawable.setLayerInset(1, inset, inset, inset, inset)- val shortcut = ShortcutInfoCompat.Builder(YuzuApplication.appContext, holder.game.path)- .setShortLabel(holder.game.title)- .setIcon(- IconCompat.createWithAdaptiveBitmap(- layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)+ activity.lifecycleScope.launch {+ withContext(Dispatchers.IO) {+ val layerDrawable = ResourcesCompat.getDrawable(+ YuzuApplication.appContext.resources,+ R.drawable.shortcut,+ null+ ) as LayerDrawable+ layerDrawable.setDrawableByLayerId(+ R.id.shortcut_foreground,+ GameIconUtils.getGameIcon(activity, holder.game)+ .toDrawable(YuzuApplication.appContext.resources))- )- .setIntent(openIntent)- .build()- ShortcutManagerCompat.pushDynamicShortcut(YuzuApplication.appContext, shortcut)+ val inset = YuzuApplication.appContext.resources+ .getDimensionPixelSize(R.dimen.icon_inset)+ layerDrawable.setLayerInset(1, inset, inset, inset, inset)+ val shortcut =+ ShortcutInfoCompat.Builder(YuzuApplication.appContext, holder.game.path)+ .setShortLabel(holder.game.title)+ .setIcon(+ IconCompat.createWithAdaptiveBitmap(+ layerDrawable.toBitmap(config = Bitmap.Config.ARGB_8888)+ )+ )+ .setIntent(openIntent)+ .build()+ ShortcutManagerCompat.pushDynamicShortcut(YuzuApplication.appContext, shortcut)+ }+ }val action = HomeNavigationDirections.actionGlobalEmulationActivity(holder.game)view.findNavController().navigate(action)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.ktindex 654d62f52f..2e9b0beb8c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameIconUtils.kt@@ -8,9 +8,9 @@ import android.graphics.BitmapFactoryimport android.widget.ImageViewimport androidx.core.graphics.drawable.toBitmapimport androidx.core.graphics.drawable.toDrawable+import androidx.lifecycle.LifecycleOwnerimport coil.ImageLoaderimport coil.decode.DataSource-import coil.executeBlockingimport coil.fetch.DrawableResultimport coil.fetch.FetchResultimport coil.fetch.Fetcher@@ -76,12 +76,13 @@ object GameIconUtils {imageLoader.enqueue(request)}- fun getGameIcon(game: Game): Bitmap {+ suspend fun getGameIcon(lifecycleOwner: LifecycleOwner, game: Game): Bitmap {val request = ImageRequest.Builder(YuzuApplication.appContext).data(game)+ .lifecycle(lifecycleOwner).error(R.drawable.default_icon).build()- return imageLoader.executeBlocking(request)+ return imageLoader.execute(request).drawable!!.toBitmap(config = Bitmap.Config.ARGB_8888)}}