Skip to content

List item style #2949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Dec 11, 2025
Merged

List item style #2949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
65 changes: 52 additions & 13 deletions app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@

public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 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;
Expand Down Expand Up @@ -85,8 +84,8 @@ public <T extends Context & NoteClickListener> 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
Expand Down Expand Up @@ -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 -> {
Expand All @@ -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 -> {
Expand All @@ -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
);
}
}
}
Expand Down Expand Up @@ -270,4 +309,4 @@ public Integer getSwipedPosition() {
public void setSwipedPosition(@Nullable Integer swipedPosition) {
this.swipedPosition = swipedPosition;
}
}
}
29 changes: 15 additions & 14 deletions app/src/main/res/layout/item_notes_list_note_item_grid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors
~ SPDX-FileCopyrightText: 2020-2025 Nextcloud GmbH and Nextcloud contributors
~ SPDX-License-Identifier: GPL-3.0-or-later
-->
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
Expand All @@ -18,34 +18,32 @@
android:id="@+id/wrapper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/spacer_1x">
android:orientation="vertical">

<TextView
android:id="@+id/noteTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/spacer_2x"
android:layout_marginTop="@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" />


<TextView
android:id="@+id/noteExcerpt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/spacer_2x"
android:layout_marginBottom="@dimen/spacer_1x"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/fg_default"
tools:maxLength="200"
tools:text="@tools:sample/lorem/random" />


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -61,7 +59,8 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/menu_favorite"
android:padding="@dimen/spacer_2x"
android:paddingStart="@dimen/spacer_2x"
android:paddingEnd="@dimen/spacer_list_card"
tools:src="@drawable/ic_star_yellow_24dp" />

<ImageView
Expand All @@ -72,24 +71,27 @@
android:clickable="false"
android:contentDescription="@null"
android:focusable="false"
android:padding="@dimen/spacer_2x"
android:paddingStart="@dimen/spacer_2x"
android:paddingEnd="@dimen/spacer_list_card"
android:src="@drawable/ic_checkbox_blank_outline" />

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/noteStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="@dimen/spacer_1x"
android:layout_marginEnd="2dp"
android:baseline="14dp"
app:srcCompat="@drawable/ic_sync_blue_18dp" />
</FrameLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacer_2x"
android:layout_marginBottom="@dimen/spacer_2x"
android:gravity="center_vertical"
android:minHeight="@dimen/iconized_single_line_item_icon_size"
android:orientation="vertical">

<com.google.android.material.chip.Chip
Expand Down Expand Up @@ -120,11 +122,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:paddingStart="@dimen/spacer_1hx"
android:paddingEnd="@dimen/spacer_2x"
android:layout_marginEnd="@dimen/spacer_2x"
tools:text="27.11." />

</LinearLayout>
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>
53 changes: 25 additions & 28 deletions app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!--
~ Nextcloud Notes - Android Client
~
~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors
~ SPDX-FileCopyrightText: 2020-2025 Nextcloud GmbH and Nextcloud contributors
~ SPDX-License-Identifier: GPL-3.0-or-later
-->
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
Expand All @@ -15,30 +15,23 @@
app:cardCornerRadius="@dimen/card_radius">

<LinearLayout
android:id="@+id/wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacer_2x"
android:orientation="vertical">

<LinearLayout
android:id="@+id/wrapper"
<TextView
android:id="@+id/noteTitle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<TextView
android:id="@+id/noteTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/spacer_2x"
android:layout_marginTop="@dimen/spacer_2x"
android:hyphenationFrequency="full"
android:textAppearance="?attr/textAppearanceHeadline5"
android:textColor="@color/fg_default"
tools:maxLength="50"
tools:text="@tools:sample/lorem/random" />

</LinearLayout>
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" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -55,34 +48,39 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/menu_favorite"
android:padding="@dimen/spacer_2x"
android:paddingStart="@dimen/spacer_2x"
android:paddingEnd="@dimen/spacer_list_card"
tools:src="@drawable/ic_star_yellow_24dp" />

<ImageView
android:id="@+id/custom_checkbox"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:clickable="false"
android:contentDescription="@null"
android:focusable="false"
android:padding="@dimen/spacer_2x"
android:paddingStart="@dimen/spacer_2x"
android:paddingEnd="@dimen/spacer_list_card"
android:src="@drawable/ic_checkbox_blank_outline" />

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/noteStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="@dimen/spacer_1x"
android:layout_marginEnd="2dp"
android:baseline="14dp"
app:srcCompat="@drawable/ic_sync_blue_18dp" />
</FrameLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacer_2x"
android:layout_marginBottom="@dimen/spacer_2x"
android:gravity="center_vertical"
android:minHeight="@dimen/iconized_single_line_item_icon_size"
android:orientation="vertical">

<com.google.android.material.chip.Chip
Expand Down Expand Up @@ -113,8 +111,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:paddingStart="@dimen/spacer_1hx"
android:paddingEnd="@dimen/spacer_2x"
android:layout_marginEnd="@dimen/spacer_2x"
tools:text="27.11." />

</LinearLayout>
Expand Down
Loading