Set span count per viewport width

6 files changed, 18 insertions, 4 deletions

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 0cab9274..eca82fef 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
@@ -13,7 +13,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewTreeObserver;
@@ -608,8 +607,7 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi
         listView.setAdapter(adapter);
 
         if (gridView) {
-            final DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
-            int spanCount = (int) ((displayMetrics.widthPixels / displayMetrics.density) / getResources().getInteger(R.integer.max_dp_grid_view));
+            int spanCount = getResources().getInteger(R.integer.grid_view_span_count);
             StaggeredGridLayoutManager gridLayoutManager = new StaggeredGridLayoutManager(spanCount, StaggeredGridLayoutManager.VERTICAL);
             listView.setLayoutManager(gridLayoutManager);
             listView.addItemDecoration(new GridItemDecoration(adapter, spanCount,
diff --git a/app/src/main/res/values-w1280dp/integers.xml b/app/src/main/res/values-w1280dp/integers.xml
new file mode 100644
index 00000000..0d3d9c7f
--- /dev/null
+++ b/app/src/main/res/values-w1280dp/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="grid_view_span_count">5</integer>
+</resources>
diff --git a/app/src/main/res/values-w400dp/integers.xml b/app/src/main/res/values-w400dp/integers.xml
new file mode 100644
index 00000000..064f91e1
--- /dev/null
+++ b/app/src/main/res/values-w400dp/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="grid_view_span_count">2</integer>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w600dp/integers.xml b/app/src/main/res/values-w600dp/integers.xml
new file mode 100644
index 00000000..371e127f
--- /dev/null
+++ b/app/src/main/res/values-w600dp/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="grid_view_span_count">3</integer>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w800dp/integers.xml b/app/src/main/res/values-w800dp/integers.xml
new file mode 100644
index 00000000..782d4488
--- /dev/null
+++ b/app/src/main/res/values-w800dp/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="grid_view_span_count">4</integer>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index 3a6f3f24..ade19fa3 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="max_dp_grid_view">170</integer>
+    <integer name="grid_view_span_count">1</integer>
 </resources>
\ No newline at end of file