diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-03-07 23:14:48 +0300 |
---|---|---|
committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2021-03-08 00:11:22 +0300 |
commit | 616a26682937422d93dc354850b906b8af30ebf1 (patch) | |
tree | 39c1e2d8c42fe8ec04b49fb0c01d84e5bd9a75e8 /app/src/main/java/it/niedermann/owncloud/notes/widget | |
parent | 61340ab6f8d124e59e2362cc39971700a3a98ff2 (diff) |
Pay attention to sufficient contrast ration when applying account color to add button
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/widget')
-rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java index 245a374c..9e815089 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java @@ -10,16 +10,20 @@ import android.widget.RemoteViews; import android.widget.RemoteViewsService; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import java.util.ArrayList; import java.util.List; +import it.niedermann.android.util.ColorUtil; import it.niedermann.owncloud.notes.R; +import it.niedermann.owncloud.notes.branding.BrandingUtil; import it.niedermann.owncloud.notes.edit.EditNoteActivity; import it.niedermann.owncloud.notes.persistence.NotesDatabase; import it.niedermann.owncloud.notes.shared.model.Category; import it.niedermann.owncloud.notes.shared.model.DBNote; import it.niedermann.owncloud.notes.shared.model.LocalAccount; +import it.niedermann.owncloud.notes.shared.util.NotesColorUtil; import static it.niedermann.owncloud.notes.edit.EditNoteActivity.PARAM_CATEGORY; import static it.niedermann.owncloud.notes.widget.notelist.NoteListsWidgetData.MODE_DISPLAY_ALL; @@ -111,7 +115,9 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact note_content.setOnClickFillInIntent(R.id.widget_note_list_entry, fillInIntent); note_content.setTextViewText(R.id.widget_entry_content_tv, getAddButtonText(context, data.getMode(), category)); note_content.setImageViewResource(R.id.widget_entry_fav_icon, R.drawable.ic_add_blue_24dp); - note_content.setInt(R.id.widget_entry_fav_icon, "setColorFilter", localAccount.getColor()); + note_content.setInt(R.id.widget_entry_fav_icon, "setColorFilter", NotesColorUtil.contrastRatioIsSufficient(ContextCompat.getColor(context, R.color.widget_background), localAccount.getColor()) + ? localAccount.getColor() + : ContextCompat.getColor(context, R.color.widget_foreground)); } else { position--; if (position > dbNotes.size() - 1 || dbNotes.get(position) == null) { |