From a06aa2d32c9077b7b4d680431f0d607c097e59f7 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Fri, 17 Apr 2020 10:29:47 +0200 Subject: [PATCH] android/GameAdapter: Fix the getColor calls using the wrong context --- .../main/java/org/citra/citra_emu/adapters/GameAdapter.java | 4 ++-- .../java/org/citra/citra_emu/viewholders/GameViewHolder.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java b/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java index a50c48a93..bc791638a 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java @@ -16,7 +16,6 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.FragmentActivity; import androidx.recyclerview.widget.RecyclerView; -import org.citra.citra_emu.CitraApplication; import org.citra.citra_emu.R; import org.citra.citra_emu.activities.EmulationActivity; import org.citra.citra_emu.model.GameDatabase; @@ -101,7 +100,8 @@ public final class GameAdapter extends RecyclerView.Adapter impl holder.company = mCursor.getString(GameDatabase.GAME_COLUMN_COMPANY); final int backgroundColorId = isValidGame(holder.path) ? R.color.card_view_background : R.color.card_view_disabled; - holder.setBackgroundColor(ContextCompat.getColor(CitraApplication.getAppContext(), backgroundColorId)); + View itemView = holder.getItemView(); + itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), backgroundColorId)); } else { Log.error("[GameAdapter] Can't bind view; Cursor is not valid."); } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java index a4d90650c..50dbcbe18 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java @@ -40,7 +40,7 @@ public class GameViewHolder extends RecyclerView.ViewHolder { textFileName = itemView.findViewById(R.id.text_filename); } - public void setBackgroundColor(int color){ - itemView.setBackgroundColor(color); + public View getItemView() { + return itemView; } }