From cf0706c239271ffb021527e5eeef65d498426034 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Tue, 21 Mar 2023 18:53:48 -0400 Subject: [PATCH 1/2] Android: Remove deprecated use of launchWhenStarted/Resumed --- .../java/org/dolphinemu/dolphinemu/adapters/GameAdapter.kt | 3 ++- .../org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt | 3 ++- .../dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.kt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.kt index 0f7ec20811..103ba4a318 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.kt @@ -17,6 +17,7 @@ import org.dolphinemu.dolphinemu.activities.EmulationActivity import androidx.fragment.app.FragmentActivity import androidx.lifecycle.lifecycleScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.dolphinemu.dolphinemu.databinding.CardGameBinding import org.dolphinemu.dolphinemu.dialogs.GamePropertiesDialog @@ -72,7 +73,7 @@ class GameAdapter(private val mActivity: FragmentActivity) : RecyclerView.Adapte } } - mActivity.lifecycleScope.launchWhenStarted { + mActivity.lifecycleScope.launch { withContext(Dispatchers.IO) { val customCoverUri = CoilUtils.findCustomCover(gameFile) withContext(Dispatchers.Main) { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt index 4f062538f9..404d617ea0 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt @@ -15,6 +15,7 @@ import android.widget.ImageView import androidx.fragment.app.FragmentActivity import androidx.lifecycle.lifecycleScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.dolphinemu.dolphinemu.dialogs.GamePropertiesDialog import org.dolphinemu.dolphinemu.utils.CoilUtils @@ -68,7 +69,7 @@ class GameRowPresenter(private val mActivity: FragmentActivity) : Presenter() { } } - mActivity.lifecycleScope.launchWhenStarted { + mActivity.lifecycleScope.launch { withContext(Dispatchers.IO) { val customCoverUri = CoilUtils.findCustomCover(gameFile) withContext(Dispatchers.Main) { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.kt index dd1226d3f2..dec284abfb 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.kt @@ -24,6 +24,7 @@ import com.google.android.material.color.MaterialColors import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.elevation.ElevationOverlayProvider import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.dolphinemu.dolphinemu.R import org.dolphinemu.dolphinemu.databinding.ActivityCheatsBinding @@ -171,7 +172,7 @@ class CheatsActivity : AppCompatActivity(), PanelSlideListener { .setCancelable(false) .show() - lifecycleScope.launchWhenResumed { + lifecycleScope.launch { withContext(Dispatchers.IO) { val codes = downloadCodes(gameTdbId!!) withContext(Dispatchers.Main) { From ce66d5875f3d92b36e1faad9c035547786603a1b Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Tue, 21 Mar 2023 19:12:28 -0400 Subject: [PATCH 2/2] Android: Fix long press action for leanback game cards --- .../org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt index 404d617ea0..c23b4b3e14 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.kt @@ -54,11 +54,12 @@ class GameRowPresenter(private val mActivity: FragmentActivity) : Presenter() { // Set the background color of the card val background = ContextCompat.getDrawable(context, R.drawable.tv_card_background) cardParent.infoAreaBackground = background - cardParent.setOnClickListener { view: View -> + cardParent.setOnLongClickListener { view: View -> val activity = view.context as FragmentActivity val fragment = GamePropertiesDialog.newInstance(holder.gameFile) activity.supportFragmentManager.beginTransaction() .add(fragment, GamePropertiesDialog.TAG).commit() + true } if (GameFileCacheManager.findSecondDisc(gameFile) != null) {