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

Fixes #4218 - In-App notifications appear on media detail fragment (#4246)

Browse source 
* Fixed issue with In-App Notification appearing on media detail view.

* Added a comment

* fixed style issues

Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com>
This commit is contained in:
Pratham Pahariya 2021-02-22 15:30:28 +05:30 • committed by GitHub
parent 7d8ea51c4f
commit d81caf6a42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -431,6 +431,8 @@ public class ContributionsFragment
showNearbyCardPermissionRationale(); showNearbyCardPermissionRationale();
}); });
// Notification cards should only be seen on contributions list, not in media details
if (mediaDetailPagerFragment == null) {
if (store.getBoolean("displayNearbyCardView", true)) { if (store.getBoolean("displayNearbyCardView", true)) {
checkPermissionsAndShowNearbyCardView(); checkPermissionsAndShowNearbyCardView();
if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) { if (nearbyNotificationCardView.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
@ -445,6 +447,7 @@ public class ContributionsFragment
setNotificationCount(); setNotificationCount();
fetchCampaigns(); fetchCampaigns();
} }
}
private void checkPermissionsAndShowNearbyCardView() { private void checkPermissionsAndShowNearbyCardView() {
if (PermissionUtils.hasPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION)) { if (PermissionUtils.hasPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION)) {