From cd91086660501b3fbf1a2c937cdd39298604cfc0 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Fri, 12 Jun 2020 19:04:41 +0200 Subject: Fix margin top in first row for grid view --- .../owncloud/notes/android/activity/NotesListViewActivity.java | 4 ++-- .../java/it/niedermann/owncloud/notes/model/GridItemDecoration.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'app/src/main') diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java index ccfbbe41..0cab9274 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java @@ -612,12 +612,12 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi 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, + listView.addItemDecoration(new GridItemDecoration(adapter, spanCount, getResources().getDimensionPixelSize(R.dimen.spacer_3x), getResources().getDimensionPixelSize(R.dimen.spacer_5x), getResources().getDimensionPixelSize(R.dimen.spacer_3x), getResources().getDimensionPixelSize(R.dimen.spacer_1x), - getResources().getDimensionPixelSize(R.dimen.spacer_2x) + getResources().getDimensionPixelSize(R.dimen.spacer_1x) )); } else { LinearLayoutManager layoutManager = new LinearLayoutManager(this); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/GridItemDecoration.java b/app/src/main/java/it/niedermann/owncloud/notes/model/GridItemDecoration.java index 6443121e..68b349e0 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/model/GridItemDecoration.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/model/GridItemDecoration.java @@ -12,10 +12,12 @@ public class GridItemDecoration extends SectionItemDecoration { @NonNull private final ItemAdapter adapter; + private final int spanCount; private final int gutter; - public GridItemDecoration(@NonNull ItemAdapter adapter, @Px int sectionLeft, @Px int sectionTop, @Px int sectionRight, @Px int sectionBottom, @Px int gutter) { + public GridItemDecoration(@NonNull ItemAdapter adapter, int spanCount, @Px int sectionLeft, @Px int sectionTop, @Px int sectionRight, @Px int sectionBottom, @Px int gutter) { super(adapter, sectionLeft, sectionTop, sectionRight, sectionBottom); + this.spanCount = spanCount; this.adapter = adapter; this.gutter = gutter; } @@ -33,7 +35,7 @@ public class GridItemDecoration extends SectionItemDecoration { if (position >= 0) { // First row gets some spacing at the top - if (position < adapter.getFirstPositionOfViewType(ItemAdapter.TYPE_SECTION)) { + if (position < spanCount && position < adapter.getFirstPositionOfViewType(ItemAdapter.TYPE_SECTION)) { outRect.top = gutter; } -- cgit v1.2.3