Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android/GameAdapter: Fix the getColor calls using the wrong context

Browse Source
This commit is contained in:
FearlessTobi 2020-04-17 10:29:47 +02:00 committed by xperia64
parent 6b86a05152
commit a06aa2d32c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java
View File

@ -16,7 +16,6 @@ import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import org.citra.citra_emu.CitraApplication;
import org.citra.citra_emu.R; import org.citra.citra_emu.R;
import org.citra.citra_emu.activities.EmulationActivity; import org.citra.citra_emu.activities.EmulationActivity;
import org.citra.citra_emu.model.GameDatabase; import org.citra.citra_emu.model.GameDatabase;
@ -101,7 +100,8 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
holder.company = mCursor.getString(GameDatabase.GAME_COLUMN_COMPANY); holder.company = mCursor.getString(GameDatabase.GAME_COLUMN_COMPANY);
final int backgroundColorId = isValidGame(holder.path) ? R.color.card_view_background : R.color.card_view_disabled; 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 { } else {
Log.error("[GameAdapter] Can't bind view; Cursor is not valid."); Log.error("[GameAdapter] Can't bind view; Cursor is not valid.");
} }

4
src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java
View File

@ -40,7 +40,7 @@ public class GameViewHolder extends RecyclerView.ViewHolder {
textFileName = itemView.findViewById(R.id.text_filename); textFileName = itemView.findViewById(R.id.text_filename);
} }
public void setBackgroundColor(int color){ public View getItemView() {
itemView.setBackgroundColor(color); return itemView;
} }
} }