diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java index efb5d1df6..dc706e36f 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java @@ -474,6 +474,7 @@ public class ContributionsFragment if (prefs.getBoolean("displayNearbyCardView", true)) { nearbyNoificationCardView.setVisibility(View.VISIBLE); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (((ContributionsActivity)getActivity()).locationManager.isLocationPermissionGranted()) { // Display nearest location, first listen diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java index d6a093c9e..5d54ceb8e 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java @@ -99,6 +99,13 @@ public class NearbyNoificationCardView extends CardView{ }); CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams) this.getLayoutParams(); layoutParams.setBehavior(swipeDismissBehavior); + + // If you don't setVisibility after getting layout params, then you will se an empty space in place of nerabyNotificationCardView + if (((ContributionsActivity)context).prefs.getBoolean("displayNearbyCardView", true)) { + this.setVisibility(VISIBLE); + } else { + this.setVisibility(GONE); + } }