diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index bd5dcceee..1ebd68fa1 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -525,7 +525,7 @@ private void setupNotesList() { listView.setLayoutManager(gridLayoutManager); listView.addItemDecoration(new GridItemDecoration(adapter, spanCount, getResources().getDimensionPixelSize(R.dimen.spacer_3x), - getResources().getDimensionPixelSize(R.dimen.spacer_3x), + getResources().getDimensionPixelSize(R.dimen.spacer_2x), getResources().getDimensionPixelSize(R.dimen.spacer_3x), getResources().getDimensionPixelSize(R.dimen.spacer_1x), getResources().getDimensionPixelSize(R.dimen.spacer_activity_sides) + getResources().getDimensionPixelSize(R.dimen.spacer_1x) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java index ae2c9d2fb..e5a0893aa 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java @@ -52,7 +52,6 @@ public class ItemAdapter extends RecyclerView.Adapter implements Branded { - public static final int TYPE_SECTION = 0; public static final int TYPE_NOTE_WITH_EXCERPT = 1; public static final int TYPE_NOTE_WITHOUT_EXCERPT = 2; @@ -85,8 +84,8 @@ public ItemAdapter(@NonNull T context, b setHasStableIds(true); } - - // FIXME this causes {@link it.niedermann.owncloud.notes.noteslist.items.list.NotesListViewItemTouchHelper} to not call clearView anymore → After marking a note as favorite, it stays yellow. + // FIXME this causes {@link it.niedermann.owncloud.notes.noteslist.items.list.NotesListViewItemTouchHelper} to + // not call clearView anymore → After marking a note as favorite, it stays yellow. @Override public long getItemId(int position) { return getItemViewType(position) == TYPE_SECTION @@ -118,13 +117,31 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int return new SectionViewHolder(binding); } case TYPE_NOTE_ONLY_TITLE -> { - ItemNotesListNoteItemGridOnlyTitleBinding binding = ItemNotesListNoteItemGridOnlyTitleBinding.inflate(inflater, parent, false); + ItemNotesListNoteItemGridOnlyTitleBinding binding = ItemNotesListNoteItemGridOnlyTitleBinding + .inflate(inflater, parent, false); BrandingUtil.of(color, parent.getContext()).notes.themeCard(binding.noteCard); + BrandingUtil.of(color, parent.getContext()).platform.colorTextView( + binding.noteTitle, ColorRole.ON_SURFACE + ); + BrandingUtil.of(color, parent.getContext()).platform.colorTextView( + binding.noteModified, ColorRole.ON_SURFACE_VARIANT + ); return new NoteViewGridHolderOnlyTitle(binding, noteClickListener, monospace, fontSize); } case TYPE_NOTE_WITH_EXCERPT, TYPE_NOTE_WITHOUT_EXCERPT -> { - ItemNotesListNoteItemGridBinding binding = ItemNotesListNoteItemGridBinding.inflate(inflater, parent, false); + ItemNotesListNoteItemGridBinding binding = ItemNotesListNoteItemGridBinding.inflate( + inflater, parent, false + ); BrandingUtil.of(color, parent.getContext()).notes.themeCard(binding.noteCard); + BrandingUtil.of(color, parent.getContext()).platform.colorTextView( + binding.noteTitle, ColorRole.ON_SURFACE + ); + BrandingUtil.of(color, parent.getContext()).platform.colorTextView( + binding.noteExcerpt, ColorRole.ON_SURFACE_VARIANT + ); + BrandingUtil.of(color, parent.getContext()).platform.colorTextView( + binding.noteModified, ColorRole.ON_SURFACE_VARIANT + ); return new NoteViewGridHolder(binding, noteClickListener, monospace, fontSize); } default -> { @@ -139,8 +156,18 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int return new SectionViewHolder(binding); } case TYPE_NOTE_WITH_EXCERPT, TYPE_NOTE_ONLY_TITLE, TYPE_NOTE_WITHOUT_EXCERPT -> { - ItemNotesListNoteItemWithExcerptBinding binding = ItemNotesListNoteItemWithExcerptBinding.inflate(inflater, parent, false); + ItemNotesListNoteItemWithExcerptBinding binding = ItemNotesListNoteItemWithExcerptBinding + .inflate(inflater, parent, false); BrandingUtil.of(color, parent.getContext()).notes.themeCard(binding.noteCard); + BrandingUtil.of(color, parent.getContext()).platform.colorTextView( + binding.noteTitle, ColorRole.ON_SURFACE + ); + BrandingUtil.of(color, parent.getContext()).platform.colorTextView( + binding.noteExcerpt, ColorRole.ON_SURFACE_VARIANT + ); + BrandingUtil.of(color, parent.getContext()).platform.colorTextView( + binding.noteModified, ColorRole.ON_SURFACE_VARIANT + ); return new NoteViewListHolder(binding, noteClickListener); } default -> { @@ -166,18 +193,30 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int case TYPE_SECTION -> ((SectionViewHolder) holder).bind((SectionItem) itemList.get(position)); case TYPE_NOTE_WITH_EXCERPT, TYPE_NOTE_WITHOUT_EXCERPT, TYPE_NOTE_ONLY_TITLE -> { - holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(tracker != null && tracker.hasSelection() ? View.VISIBLE : View.GONE); + holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(tracker != null && + tracker.hasSelection() ? View.VISIBLE : View.GONE); holder.itemView.setSelected(isSelected); if (isSelected) { ((MaterialCardView) holder.itemView.findViewById(R.id.noteCard)).setStrokeWidth((int) holder.itemView.getResources().getDimension(R.dimen.card_stroke_width_selected)); - ((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)); + ((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) + ); } else { ((MaterialCardView) holder.itemView.findViewById(R.id.noteCard)).setStrokeWidth((int) holder.itemView.getResources().getDimension(R.dimen.card_stroke_width)); - ((ImageView) holder.itemView.findViewById(R.id.custom_checkbox)).setImageResource(R.drawable.ic_checkbox_blank_outline); + ((ImageView) holder.itemView.findViewById(R.id.custom_checkbox)).setImageResource( + R.drawable.ic_checkbox_blank_outline + ); } - holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(isMultiSelect ? View.VISIBLE : View.GONE); - holder.itemView.findViewById(R.id.noteFavorite).setVisibility(isMultiSelect ? View.GONE : View.VISIBLE); - ((NoteViewHolder) holder).bind(isSelected, (Note) itemList.get(position), showCategory, color, searchQuery); + holder.itemView.findViewById(R.id.custom_checkbox).setVisibility( + isMultiSelect ? View.VISIBLE : View.GONE + ); + holder.itemView.findViewById(R.id.noteFavorite).setVisibility( + isMultiSelect ? View.GONE : View.VISIBLE + ); + ((NoteViewHolder) holder).bind( + isSelected, (Note) itemList.get(position), showCategory, color, searchQuery + ); } } } @@ -270,4 +309,4 @@ public Integer getSwipedPosition() { public void setSwipedPosition(@Nullable Integer swipedPosition) { this.swipedPosition = swipedPosition; } -} \ No newline at end of file +} 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 bb33b5bdf..f7884c32b 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 @@ -2,7 +2,7 @@ + android:orientation="vertical"> - - @@ -89,7 +89,9 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml b/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml index 32fb905ba..0f55d7812 100644 --- a/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml +++ b/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml @@ -2,7 +2,7 @@ - - - - - + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/spacer_2x" + android:layout_marginTop="@dimen/spacer_list_card" + android:layout_marginBottom="@dimen/spacer_1x" + android:hyphenationFrequency="full" + android:textAppearance="?attr/textAppearanceHeadline5" + android:textColor="@color/fg_default" + tools:maxLength="50" + tools:text="@tools:sample/lorem/random" /> @@ -82,7 +78,9 @@