Skip to content

Commit 669f951

Browse files
Merge pull request #2938 from nextcloud/style/noid/gridItemBackgroundColor
Fix grid item background color
2 parents 74e0f5a + ef763b5 commit 669f951

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public void themeBackgroundItemView(View view) {
251251

252252
public void themeCard(@NonNull MaterialCardView view) {
253253
withScheme(view, scheme -> {
254-
view.setBackgroundTintList(buildColorStateList(
254+
view.setCardBackgroundColor(buildColorStateList(
255255
new Pair<>(android.R.attr.state_activated, dynamicColor.secondaryContainer().getArgb(scheme)),
256256
new Pair<>(-android.R.attr.state_activated, dynamicColor.surface().getArgb(scheme)))
257257
);

app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,10 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
173173
((SectionViewHolder) holder).bind((SectionItem) itemList.get(position));
174174
case TYPE_NOTE_WITH_EXCERPT, TYPE_NOTE_WITHOUT_EXCERPT, TYPE_NOTE_ONLY_TITLE -> {
175175
holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(tracker != null && tracker.hasSelection() ? View.VISIBLE : View.GONE);
176+
holder.itemView.setSelected(isSelected);
176177
if (isSelected) {
177-
holder.itemView.setBackgroundColor(ContextCompat.getColor(holder.itemView.getContext(), R.color.bg_highlighted));
178178
((ImageView) holder.itemView.findViewById(R.id.custom_checkbox)).setImageDrawable(BrandingUtil.getInstance(holder.itemView.getContext()).platform.tintDrawable(holder.itemView.getContext(), R.drawable.ic_checkbox_marked, ColorRole.PRIMARY));
179179
} else {
180-
holder.itemView.setBackgroundColor(holder.itemView.getContext().getColor(com.nextcloud.android.common.ui.R.color.bg_default));
181180
((ImageView) holder.itemView.findViewById(R.id.custom_checkbox)).setImageResource(R.drawable.ic_checkbox_blank_outline);
182181
}
183182
holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(isMultiSelect ? View.VISIBLE : View.GONE);

0 commit comments

Comments
 (0)