From ea37245cfd808a7483a9ef8c753df7b476a9b098 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Mon, 19 Nov 2018 12:35:36 +0200 Subject: [PATCH] Fix visibility error on media details view (#2009) --- .../free/nrw/commons/contributions/ContributionsFragment.java | 1 - .../java/fr/free/nrw/commons/media/MediaDetailFragment.java | 3 +++ .../fr/free/nrw/commons/nearby/NearbyNoificationCardView.java | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) 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 962a24ce3..eea4e25d5 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 @@ -546,7 +546,6 @@ public class ContributionsFragment private void updateClosestNearbyCardViewInfo() { - curLatLng = locationManager.getLastLocation(); placesDisposable = Observable.fromCallable(() -> nearbyController diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 8b988a06a..12389b905 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -45,6 +45,7 @@ import fr.free.nrw.commons.MediaDataExtractor; import fr.free.nrw.commons.MediaWikiImageView; import fr.free.nrw.commons.R; import fr.free.nrw.commons.category.CategoryDetailsActivity; +import fr.free.nrw.commons.contributions.ContributionsFragment; import fr.free.nrw.commons.delete.DeleteTask; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.location.LatLng; @@ -204,12 +205,14 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { }; view.getViewTreeObserver().addOnGlobalLayoutListener(layoutListener); locale = getResources().getConfiguration().locale; + return view; } @Override public void onResume() { super.onResume(); + ((ContributionsFragment)(getParentFragment().getParentFragment())).nearbyNoificationCardView.setVisibility(View.GONE); media = detailProvider.getMediaAtPosition(index); if (media == null) { // Ask the detail provider to ping us when we're ready 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 62228f019..c44fbf763 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 @@ -201,9 +201,7 @@ public class NearbyNoificationCardView extends CardView{ * @param place Closes place where we will get information from */ public void updateContent(boolean isClosestNearbyPlaceFound, Place place) { - if (this.getVisibility() == GONE) { - return; // If nearby card view is invisible because of preferences, do nothing - } + Timber.d("Update nearby card notification content"); cardViewVisibilityState = CardViewVisibilityState.READY; permissionRequestButton.setVisibility(GONE); contentLayout.setVisibility(VISIBLE);