diff options
| author | Andy Scherzinger <info@andy-scherzinger.de> | 2023-04-08 10:45:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-08 10:45:16 +0300 |
| commit | 6b336e4ddddff11da38be97151f9a866b4ddbd73 (patch) | |
| tree | f5519750b94895a30dd2284eaabe13409a6b1680 /app | |
| parent | e7e8f1e9dcc0f3747e69e52d6e624f97d2dbee79 (diff) | |
| parent | 51074e6a1e4304f78516351bef966e49a7190d30 (diff) | |
Merge pull request #1753 from nextcloud/fix-category-colors
fix(theming): Fix category theming
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java | 7 | ||||
| -rw-r--r-- | app/src/main/res/layout/item_notes_list_note_item_grid.xml | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java index 4baf154d..cf92dc06 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java @@ -72,11 +72,12 @@ public abstract class NoteViewHolder extends RecyclerView.ViewHolder { if (noteCategory instanceof Chip) { util.material.colorChipBackground((Chip) noteCategory); } else { - util.platform.tintDrawable(context, noteCategory.getBackground(), ColorRole.PRIMARY); if (isDarkMode(context)) { - util.platform.colorTextView(noteCategory, ColorRole.ON_PRIMARY); - } else { + util.platform.tintDrawable(context, noteCategory.getBackground(), ColorRole.SECONDARY_CONTAINER); util.platform.colorTextView(noteCategory, ColorRole.ON_SECONDARY_CONTAINER); + } else { + util.platform.tintDrawable(context, noteCategory.getBackground(), ColorRole.PRIMARY); + util.platform.colorTextView(noteCategory, ColorRole.ON_PRIMARY_CONTAINER); } } diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid.xml b/app/src/main/res/layout/item_notes_list_note_item_grid.xml index d9325f19..ecdea4ca 100644 --- a/app/src/main/res/layout/item_notes_list_note_item_grid.xml +++ b/app/src/main/res/layout/item_notes_list_note_item_grid.xml @@ -93,7 +93,7 @@ app:chipEndPadding="@dimen/spacer_1x" app:chipMinHeight="0dp" app:chipStartPadding="@dimen/spacer_1x" - app:chipStrokeColor="@color/defaultBrand" + app:chipStrokeColor="@android:color/transparent" app:chipStrokeWidth="1dp" app:ensureMinTouchTargetSize="false" app:textEndPadding="0dp" |