Skip to content

Rezise single line list items #2944

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 3 commits into from
Dec 9, 2025
Merged

Rezise single line list items #2944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
227e7c0
style(list): M3 card style for list items
AndyScherzinger Dec 3, 2025
3912941
chore: cleanup duplicated dimens values
AndyScherzinger Dec 9, 2025
cd2ed45
chore: Add editor config
AndyScherzinger Dec 9, 2025
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
51 changes: 51 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# .editorconfig

# see http://EditorConfig.org

# SPDX-FileCopyrightText: 2018-2025 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

# This is the file in the root of the project.
# For sub folders you can have other files that override only some settings.
# For these, this settings should be false.
root=true

[*]
max_line_length=120
# use spaces, not tabs.
indent_style=space
indent_size=4

[*.yml]
max_line_length=150

charset=utf-8

# Trimming is good for consistency
trim_trailing_whitespace=true
# I've seen cases where a missing new_line was ignored on *nix systems.
# Never again with this setting!
insert_final_newline=true

[*.properties]
# Exception for Java properties files should be encoded latin1 (aka iso8859-1)
charset=latin1

[*.{cmd,bat}]
# batch files on Windows should stay with CRLF
end_of_line=crlf

[*.md]
trim_trailing_whitespace=false

[.drone.yml]
indent_size=2

[*.{kt,kts}]
ktlint_code_style = android_studio
# IDE does not follow this Ktlint rule strictly, but the default ordering is pretty good anyway, so let's ditch it
ktlint_standard_import-ordering = disabled
ktlint_standard_no-consecutive-comments = disabled
ktlint_function_naming_ignore_when_annotated_with = Composable
ij_kotlin_allow_trailing_comma = false
ij_kotlin_allow_trailing_comma_on_call_site = false
4 changes: 2 additions & 2 deletions 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 @@ -534,8 +534,8 @@ private void setupNotesList() {
final var layoutManager = new LinearLayoutManager(this);
listView.setLayoutManager(layoutManager);
listView.addItemDecoration(new SectionItemDecoration(adapter,
getResources().getDimensionPixelSize(R.dimen.spacer_activity_sides) + getResources().getDimensionPixelSize(R.dimen.spacer_1x) + getResources().getDimensionPixelSize(R.dimen.spacer_3x) + getResources().getDimensionPixelSize(R.dimen.spacer_2x),
getResources().getDimensionPixelSize(R.dimen.spacer_3x),
getResources().getDimensionPixelSize(R.dimen.spacer_1hx) + getResources().getDimensionPixelSize(R.dimen.spacer_3x) + getResources().getDimensionPixelSize(R.dimen.spacer_2x),
getResources().getDimensionPixelSize(R.dimen.spacer_2x),
getResources().getDimensionPixelSize(R.dimen.spacer_1x),
0
));
Expand Down
13 changes: 3 additions & 10 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 @@ -40,12 +40,10 @@
import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemGridBinding;
import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemGridOnlyTitleBinding;
import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemWithExcerptBinding;
import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemWithoutExcerptBinding;
import it.niedermann.owncloud.notes.databinding.ItemNotesListSectionItemBinding;
import it.niedermann.owncloud.notes.main.items.grid.NoteViewGridHolder;
import it.niedermann.owncloud.notes.main.items.grid.NoteViewGridHolderOnlyTitle;
import it.niedermann.owncloud.notes.main.items.list.NoteViewHolderWithExcerpt;
import it.niedermann.owncloud.notes.main.items.list.NoteViewHolderWithoutExcerpt;
import it.niedermann.owncloud.notes.main.items.list.NoteViewListHolder;
import it.niedermann.owncloud.notes.main.items.section.SectionItem;
import it.niedermann.owncloud.notes.main.items.section.SectionViewHolder;
import it.niedermann.owncloud.notes.persistence.entity.Note;
Expand Down Expand Up @@ -140,15 +138,10 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
BrandingUtil.of(color, parent.getContext()).platform.colorTextView(binding.sectionTitle);
return new SectionViewHolder(binding);
}
case TYPE_NOTE_WITH_EXCERPT -> {
case TYPE_NOTE_WITH_EXCERPT, TYPE_NOTE_ONLY_TITLE, TYPE_NOTE_WITHOUT_EXCERPT -> {
ItemNotesListNoteItemWithExcerptBinding binding = ItemNotesListNoteItemWithExcerptBinding.inflate(inflater, parent, false);
BrandingUtil.of(color, parent.getContext()).notes.themeCard(binding.noteCard);
return new NoteViewHolderWithExcerpt(binding, noteClickListener);
}
case TYPE_NOTE_ONLY_TITLE, TYPE_NOTE_WITHOUT_EXCERPT -> {
ItemNotesListNoteItemWithoutExcerptBinding binding = ItemNotesListNoteItemWithoutExcerptBinding.inflate(inflater, parent, false);
BrandingUtil.of(color, parent.getContext()).notes.themeCard(binding.noteCard);
return new NoteViewHolderWithoutExcerpt(binding, noteClickListener);
return new NoteViewListHolder(binding, noteClickListener);
}
default -> {
throw new IllegalArgumentException("Not supported viewType: " + viewType);
Expand Down
69 changes: 0 additions & 69 deletions .../main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithoutExcerpt.java
View file
Open in desktop

This file was deleted.

16 changes: 13 additions & 3 deletions ...items/list/NoteViewHolderWithExcerpt.java → ...s/main/items/list/NoteViewListHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import it.niedermann.owncloud.notes.shared.model.DBStatus;
import it.niedermann.owncloud.notes.shared.model.NoteClickListener;

public class NoteViewHolderWithExcerpt extends NoteViewHolder {
public class NoteViewListHolder extends NoteViewHolder {
@NonNull
private final ItemNotesListNoteItemWithExcerptBinding binding;

Expand All @@ -30,7 +30,7 @@ public class NoteViewHolderWithExcerpt extends NoteViewHolder {
private final int deleteSwipeBackgroundColor;


public NoteViewHolderWithExcerpt(@NonNull ItemNotesListNoteItemWithExcerptBinding binding, @NonNull NoteClickListener noteClickListener) {
public NoteViewListHolder(@NonNull ItemNotesListNoteItemWithExcerptBinding binding, @NonNull NoteClickListener noteClickListener) {
super(binding.getRoot(), noteClickListener);
this.binding = binding;
Resources resources = binding.getRoot().getContext().getResources();
Expand Down Expand Up @@ -62,7 +62,17 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @
bindModified(binding.noteModified, note.getModified());

bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt(), color);
if (note.getExcerpt().isEmpty()) {
bindSearchableContent(
context,
binding.noteExcerpt,
searchQuery,
context.getString(R.string.listview_no_content),
color
);
} else {
bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt(), color);
}
}

@NonNull
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,23 @@

<ImageView
android:id="@+id/noteFavorite"
android:layout_width="56dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/menu_favorite"
android:padding="@dimen/spacer_2x"
android:paddingStart="@dimen/spacer_list_card"
android:paddingEnd="@dimen/spacer_1x"
tools:src="@drawable/ic_star_yellow_24dp" />

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

<androidx.appcompat.widget.AppCompatImageView
Expand All @@ -91,7 +93,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginTop="12dp"
android:layout_marginEnd="4dp"
android:layout_marginEnd="0dp"
android:baseline="14dp"
app:srcCompat="@drawable/ic_sync_blue_18dp" />
</FrameLayout>
Expand All @@ -101,9 +103,10 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:paddingVertical="@dimen/spacer_2x"
android:paddingTop="@dimen/spacer_1x"
android:paddingBottom="@dimen/spacer_list_card"
android:paddingStart="@dimen/zero"
android:paddingEnd="@dimen/spacer_2x">
android:paddingEnd="@dimen/spacer_list_card">

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -131,7 +134,6 @@

</LinearLayout>


<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
Expand Down
Loading
Loading