mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-10-23 13:15:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use proper ItemDecoration class for defining gutter

Browse source
This commit is contained in:
Stefan Niedermann 2020-06-10 14:33:42 +02:00
parent 53605bc67b
commit 15b3906b0e
9 changed files with 81 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
View file

@ -64,6 +64,7 @@ import it.niedermann.owncloud.notes.formattinghelp.FormattingHelpActivity;
import it.niedermann.owncloud.notes.model.Capabilities;
import it.niedermann.owncloud.notes.model.Category;
import it.niedermann.owncloud.notes.model.DBNote;
import it.niedermann.owncloud.notes.model.GridItemDecoration;
import it.niedermann.owncloud.notes.model.ISyncCallback;
import it.niedermann.owncloud.notes.model.Item;
import it.niedermann.owncloud.notes.model.ItemAdapter;
@ -600,13 +601,15 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi
adapter = new ItemAdapter(this, gridView);
listView.setAdapter(adapter);
final DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
int spanCount = (int) ((displayMetrics.widthPixels / displayMetrics.density) / getResources().getInteger(R.integer.max_dp_grid_view));
listView.setLayoutManager(
gridView
? new StaggeredGridLayoutManager(spanCount, StaggeredGridLayoutManager.VERTICAL)
: new LinearLayoutManager(this)
);
if (gridView) {
final DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
int spanCount = (int) ((displayMetrics.widthPixels / displayMetrics.density) / getResources().getInteger(R.integer.max_dp_grid_view));
StaggeredGridLayoutManager gridLayoutManager = new StaggeredGridLayoutManager(spanCount, StaggeredGridLayoutManager.VERTICAL);
listView.setLayoutManager(gridLayoutManager);
listView.addItemDecoration(new GridItemDecoration(adapter, getResources().getDimensionPixelSize(R.dimen.spacer_2x)));
} else {
listView.setLayoutManager(new LinearLayoutManager(this));
}
}
private void refreshLists() {

47
app/src/main/java/it/niedermann/owncloud/notes/model/GridItemDecoration.java Normal file
View file

@ -0,0 +1,47 @@
package it.niedermann.owncloud.notes.model;
import android.graphics.Rect;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
public class GridItemDecoration extends RecyclerView.ItemDecoration {
@NonNull
private final ItemAdapter adapter;
private final int gutter;
public GridItemDecoration(@NonNull ItemAdapter adapter, int gutter) {
this.adapter = adapter;
this.gutter = gutter;
}
public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
final int position = parent.getChildAdapterPosition(view);
final StaggeredGridLayoutManager.LayoutParams lp = (StaggeredGridLayoutManager.LayoutParams) view.getLayoutParams();
if (adapter.getItemViewType(position) == ItemAdapter.TYPE_SECTION) {
lp.setFullSpan(true);
} else {
final int spanIndex = lp.getSpanIndex();
if (position >= 0) {
// First row gets some spacing at the top
if (position < adapter.getFirstPositionOfViewType(ItemAdapter.TYPE_SECTION)) {
outRect.top = gutter;
}
// First column gets some spacing at the left and the right side
if (spanIndex == 0) {
outRect.left = gutter;
}
// All columns get some spacing at the bottom and at the right side
outRect.right = gutter;
outRect.bottom = gutter;
}
}
}
}

12
app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java
View file

@ -209,4 +209,16 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> i
public void setHighlightSearchQuery(CharSequence searchQuery) {
this.searchQuery = searchQuery;
}
/**
* @return the position of the first item which matches the given viewtype, -1 if not available
*/
public int getFirstPositionOfViewType(@IntRange(from = 0, to = 2) int viewType) {
for (int i = 0; i < itemList.size(); i++) {
if (getItemViewType(i) == viewType) {
return i;
}
}
return -1;
}
}

3
app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewGridHolder.java
View file

@ -16,8 +16,6 @@ public class NoteViewGridHolder extends NoteViewHolder {
public NoteViewGridHolder(@NonNull ItemNotesListNoteItemGridBinding binding, @NonNull NoteClickListener noteClickListener) {
super(binding.getRoot(), noteClickListener, true);
this.binding = binding;
itemView.setOnClickListener(this);
itemView.setOnLongClickListener(this);
}
public void showSwipe(boolean left) {
@ -25,6 +23,7 @@ public class NoteViewGridHolder extends NoteViewHolder {
}
public void bind(@NonNull DBNote note, boolean showCategory, int mainColor, int textColor, @Nullable CharSequence searchQuery) {
super.bind(note, showCategory, mainColor, textColor, searchQuery);
@NonNull final Context context = itemView.getContext();
bindCategory(context, binding.noteCategory, showCategory, note.getCategory(), mainColor);
binding.noteStatus.setVisibility(DBStatus.VOID.equals(note.getStatus()) ? View.INVISIBLE : View.VISIBLE);

27
app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewHolder.java
View file

@ -14,6 +14,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.CallSuper;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -31,14 +32,15 @@ import it.niedermann.owncloud.notes.branding.BrandingUtil;
import it.niedermann.owncloud.notes.util.MarkDownUtil;
import it.niedermann.owncloud.notes.util.Notes;
import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
import static it.niedermann.owncloud.notes.util.ColorUtil.contrastRatioIsSufficient;
import static it.niedermann.owncloud.notes.util.ColorUtil.isColorDark;
import static it.niedermann.owncloud.notes.util.MarkDownUtil.parseCompat;
public abstract class NoteViewHolder extends RecyclerView.ViewHolder implements View.OnLongClickListener, View.OnClickListener {
public abstract class NoteViewHolder extends RecyclerView.ViewHolder {
@NonNull
private final NoteClickListener noteClickListener;
private final boolean renderMarkdown;
@Nullable
private MarkdownProcessor markdownProcessor;
public NoteViewHolder(@NonNull View v, @NonNull NoteClickListener noteClickListener, boolean renderMarkdown) {
@ -50,25 +52,14 @@ public abstract class NoteViewHolder extends RecyclerView.ViewHolder implements
markdownProcessor.factory(TextFactory.create());
markdownProcessor.config(MarkDownUtil.getMarkDownConfiguration(itemView.getContext()).build());
}
v.setOnClickListener(this);
v.setOnLongClickListener(this);
}
@Override
public void onClick(View v) {
final int adapterPosition = getAdapterPosition();
if (adapterPosition != NO_POSITION) {
noteClickListener.onNoteClick(adapterPosition, v);
}
@CallSuper
public void bind(@NonNull DBNote note, boolean showCategory, int mainColor, int textColor, @Nullable CharSequence searchQuery) {
itemView.setOnClickListener((view) -> noteClickListener.onNoteClick(getAdapterPosition(), view));
itemView.setOnLongClickListener((view) -> noteClickListener.onNoteLongClick(getAdapterPosition(), view));
}
@Override
public boolean onLongClick(View v) {
return noteClickListener.onNoteLongClick(getAdapterPosition(), v);
}
public abstract void bind(@NonNull DBNote note, boolean showCategory, int mainColor, int textColor, @Nullable CharSequence searchQuery);
protected void bindCategory(@NonNull Context context, @NonNull TextView noteCategory, boolean showCategory, @NonNull String category, int mainColor) {
final boolean isDarkThemeActive = Notes.isDarkThemeActive(context);
noteCategory.setVisibility(showCategory && !category.isEmpty() ? View.VISIBLE : View.GONE);
@ -138,7 +129,7 @@ public abstract class NoteViewHolder extends RecyclerView.ViewHolder implements
}
private void bindContent(@NonNull TextView textView, @NonNull CharSequence charSequence) {
if (renderMarkdown) {
if (renderMarkdown && markdownProcessor != null) {
new Thread(() -> {
try {
final CharSequence parsedCharSequence = parseCompat(markdownProcessor, charSequence);

3
app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewHolderWithExcerpt.java
View file

@ -16,8 +16,6 @@ public class NoteViewHolderWithExcerpt extends NoteViewHolder {
public NoteViewHolderWithExcerpt(@NonNull ItemNotesListNoteItemWithExcerptBinding binding, @NonNull NoteClickListener noteClickListener) {
super(binding.getRoot(), noteClickListener, false);
this.binding = binding;
itemView.setOnClickListener(this);
itemView.setOnLongClickListener(this);
}
public void showSwipe(boolean left) {
@ -27,6 +25,7 @@ public class NoteViewHolderWithExcerpt extends NoteViewHolder {
}
public void bind(@NonNull DBNote note, boolean showCategory, int mainColor, int textColor, @Nullable CharSequence searchQuery) {
super.bind(note, showCategory, mainColor, textColor, searchQuery);
@NonNull final Context context = itemView.getContext();
binding.noteSwipeable.setAlpha(DBStatus.LOCAL_DELETED.equals(note.getStatus()) ? 0.5f : 1.0f);
bindCategory(context, binding.noteCategory, showCategory, note.getCategory(), mainColor);

3
app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewHolderWithoutExcerpt.java
View file

@ -16,8 +16,6 @@ public class NoteViewHolderWithoutExcerpt extends NoteViewHolder {
public NoteViewHolderWithoutExcerpt(@NonNull ItemNotesListNoteItemWithoutExcerptBinding binding, @NonNull NoteClickListener noteClickListener) {
super(binding.getRoot(), noteClickListener, false);
this.binding = binding;
itemView.setOnClickListener(this);
itemView.setOnLongClickListener(this);
}
@ -28,6 +26,7 @@ public class NoteViewHolderWithoutExcerpt extends NoteViewHolder {
}
public void bind(@NonNull DBNote note, boolean showCategory, int mainColor, int textColor, @Nullable CharSequence searchQuery) {
super.bind(note, showCategory, mainColor, textColor, searchQuery);
@NonNull final Context context = itemView.getContext();
binding.noteSwipeable.setAlpha(DBStatus.LOCAL_DELETED.equals(note.getStatus()) ? 0.5f : 1.0f);
bindCategory(context, binding.noteCategory, showCategory, note.getCategory(), mainColor);

3
app/src/main/java/it/niedermann/owncloud/notes/model/SectionViewHolder.java
View file

@ -15,8 +15,5 @@ public class SectionViewHolder extends RecyclerView.ViewHolder {
public void bind(SectionItem item) {
binding.sectionTitle.setText(item.getTitle());
if (itemView.getLayoutParams() != null && itemView.getLayoutParams() instanceof StaggeredGridLayoutManager.LayoutParams) {
((StaggeredGridLayoutManager.LayoutParams) itemView.getLayoutParams()).setFullSpan(true);
}
}
}

1
app/src/main/res/layout/item_notes_list_note_item_grid.xml
View file

@ -5,7 +5,6 @@
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/spacer_1x"
android:focusable="true">
<LinearLayout