Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 6b336e4d authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #1753 from nextcloud/fix-category-colors 

fix(theming): Fix category theming
parents e7e8f1e9 51074e6a

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

+4 −3
Original line number Diff line number Diff line
@@ -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);

                }

            }

app/src/main/res/layout/item_notes_list_note_item_grid.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"