mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix visibility error on media details view (#2009)

Browse source
This commit is contained in:
neslihanturan 2018-11-19 12:35:36 +02:00 • committed by Vivek Maskara
parent f607c1c14d
commit e9bfc4bc7a
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
View file

@ -546,7 +546,6 @@ public class ContributionsFragment
private void updateClosestNearbyCardViewInfo() { private void updateClosestNearbyCardViewInfo() {
curLatLng = locationManager.getLastLocation(); curLatLng = locationManager.getLastLocation();
placesDisposable = Observable.fromCallable(() -> nearbyController placesDisposable = Observable.fromCallable(() -> nearbyController

3
app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file

@ -45,6 +45,7 @@ import fr.free.nrw.commons.MediaDataExtractor;
import fr.free.nrw.commons.MediaWikiImageView; import fr.free.nrw.commons.MediaWikiImageView;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.category.CategoryDetailsActivity; 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.delete.DeleteTask;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.location.LatLng;
@ -204,12 +205,14 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
}; };
view.getViewTreeObserver().addOnGlobalLayoutListener(layoutListener); view.getViewTreeObserver().addOnGlobalLayoutListener(layoutListener);
locale = getResources().getConfiguration().locale; locale = getResources().getConfiguration().locale;
return view; return view;
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
((ContributionsFragment)(getParentFragment().getParentFragment())).nearbyNoificationCardView.setVisibility(View.GONE);
media = detailProvider.getMediaAtPosition(index); media = detailProvider.getMediaAtPosition(index);
if (media == null) { if (media == null) {
// Ask the detail provider to ping us when we're ready // Ask the detail provider to ping us when we're ready

4
app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java
View file

@ -201,9 +201,7 @@ public class NearbyNoificationCardView extends CardView{
* @param place Closes place where we will get information from * @param place Closes place where we will get information from
*/ */
public void updateContent(boolean isClosestNearbyPlaceFound, Place place) { public void updateContent(boolean isClosestNearbyPlaceFound, Place place) {
if (this.getVisibility() == GONE) { Timber.d("Update nearby card notification content");
return; // If nearby card view is invisible because of preferences, do nothing
}
cardViewVisibilityState = CardViewVisibilityState.READY; cardViewVisibilityState = CardViewVisibilityState.READY;
permissionRequestButton.setVisibility(GONE); permissionRequestButton.setVisibility(GONE);
contentLayout.setVisibility(VISIBLE); contentLayout.setVisibility(VISIBLE);