Merge remote-tracking branch 'origin/release' into dev
# Conflicts: # dependencies.gradle
This commit is contained in:
@ -365,7 +365,7 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
|
||||
if (concernEntity.getGame() != null) {
|
||||
viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGame().getIcon(), concernEntity.getGame().getIconSubscript(), concernEntity.getGame().getIconFloat());
|
||||
} else {
|
||||
viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGameIcon(), null, concernEntity.getGame().getIconFloat());
|
||||
viewHolder.binding.newsDigestThumb.displayGameIcon(concernEntity.getGameIcon(), null, null);
|
||||
}
|
||||
viewHolder.binding.newsDigestTitle.setText(concernEntity.getGameName());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user