From 026ab6f60eef6acf072011e99874cb65ca78c0de Mon Sep 17 00:00:00 2001
From: "Mr.Dragon" <whyorean@gmail.com>
Date: Wed, 22 Aug 2018 14:28:17 +0530
Subject: [PATCH] Fix GridLayout span based on usable Display Dimension

---
 .../dragons/aurora/adapters/UpdatableAppsGridAdapter.java    | 2 +-
 .../com/dragons/aurora/fragment/CategoryListFragment.java    | 2 +-
 .../com/dragons/aurora/fragment/UpdatableAppsFragment.java   | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/dragons/aurora/adapters/UpdatableAppsGridAdapter.java b/app/src/main/java/com/dragons/aurora/adapters/UpdatableAppsGridAdapter.java
index 8e4ffa3f0..44ee62869 100644
--- a/app/src/main/java/com/dragons/aurora/adapters/UpdatableAppsGridAdapter.java
+++ b/app/src/main/java/com/dragons/aurora/adapters/UpdatableAppsGridAdapter.java
@@ -161,7 +161,7 @@ public class UpdatableAppsGridAdapter extends RecyclerView.Adapter<UpdatableApps
 
         if ((!isGrid)) {
             holder.AppMenu.setVisibility(View.VISIBLE);
-            holder.AppMenu.setOnClickListener(v -> setup3dotMenu(holder, app, position));
+            setup3dotMenu(holder, app, position);
         }
     }
 
diff --git a/app/src/main/java/com/dragons/aurora/fragment/CategoryListFragment.java b/app/src/main/java/com/dragons/aurora/fragment/CategoryListFragment.java
index f20293224..15c4f959b 100644
--- a/app/src/main/java/com/dragons/aurora/fragment/CategoryListFragment.java
+++ b/app/src/main/java/com/dragons/aurora/fragment/CategoryListFragment.java
@@ -112,7 +112,7 @@ public class CategoryListFragment extends CategoryListTask {
         show(view, R.id.all_cat_view);
         RecyclerView recyclerView = ViewUtils.findViewById(view, R.id.all_cat_view);
         recyclerView.setAdapter(new AllCategoriesAdapter(this, categoryManager.getCategoriesFromSharedPreferences()));
-        recyclerView.setLayoutManager(new GridAutoFitLayoutManager(getContext(), 200));
+        recyclerView.setLayoutManager(new GridAutoFitLayoutManager(getContext(), 150));
         recyclerView.setLayoutAnimation(AnimationUtils.loadLayoutAnimation(getContext(), R.anim.anim_falldown));
     }
 
diff --git a/app/src/main/java/com/dragons/aurora/fragment/UpdatableAppsFragment.java b/app/src/main/java/com/dragons/aurora/fragment/UpdatableAppsFragment.java
index ae53bc0c8..228348a90 100644
--- a/app/src/main/java/com/dragons/aurora/fragment/UpdatableAppsFragment.java
+++ b/app/src/main/java/com/dragons/aurora/fragment/UpdatableAppsFragment.java
@@ -37,7 +37,6 @@ import com.dragons.aurora.PlayStoreApiAuthenticator;
 import com.dragons.aurora.R;
 import com.dragons.aurora.UpdateChecker;
 import com.dragons.aurora.Util;
-import com.dragons.aurora.activities.AuroraActivity;
 import com.dragons.aurora.adapters.UpdatableAppsGridAdapter;
 import com.dragons.aurora.database.Jessie;
 import com.dragons.aurora.helpers.Accountant;
@@ -240,7 +239,7 @@ public class UpdatableAppsFragment extends UpdatableAppsTaskHelper {
     }
 
     private void setupRecycler(List<App> appsToAdd) {
-        if (getDisplayDensity() <= 420) {
+        if (getDisplayDensity() >= 400) {
             recyclerView.setLayoutManager(new GridAutoFitLayoutManager(getContext(), 128));
             updatableAppsAdapter = new UpdatableAppsGridAdapter(this, appsToAdd, true);
         } else {
@@ -281,7 +280,7 @@ public class UpdatableAppsFragment extends UpdatableAppsTaskHelper {
     }
 
     private float getDisplayDensity() {
-        return (Resources.getSystem().getDisplayMetrics().densityDpi);
+        return (Resources.getSystem().getConfiguration().screenWidthDp);
     }
 
     public interface OnUpdateListener {