From cd52beed5aeadaf0a08d7d7782ee613ae6d06cb8 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Mon, 24 Sep 2018 13:42:28 +0300
Subject: [PATCH] Hide nearby card view when Media Details is visible

---
 .../nrw/commons/contributions/ContributionsActivity.java     | 2 ++
 .../nrw/commons/contributions/ContributionsFragment.java     | 5 +++++
 app/src/main/res/values/strings.xml                          | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index a63d3dd94..12f91529e 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -193,6 +193,8 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
                 contributionsFragment.getChildFragmentManager().popBackStack();
                 // Tabs were invisible when Media Details Fragment is active, make them visible again on Contrib List Fragment active
                 showTabs();
+                // Nearby Notification Card View was invisible when Media Details Fragment is active, make it visible again on Contrib List Fragment active
+                contributionsFragment.nearbyNoificationCardView.setVisibility(View.VISIBLE);
                 // Make number of uploads visible when Contributions List is visible
                 // TODO Neslihan: ContributionListViewUtils.setIndicatorVisibility(contributionsFragment.numberOfUploads, contributionsFragment.numberOfUploadsProgressBar, true, false);
                 // TODO Neslihan: ContributionListViewUtils.setIndicatorVisibility(contributionsFragment.notificationsCardView, contributionsFragment.notificationsCardViewProgressBar, true, false);
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 ae8247db8..455a2745d 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
@@ -170,6 +170,9 @@ public class ContributionsFragment
     public void setContributionsListFragment() {
         // show tabs on contribution list is visible
         ((ContributionsActivity)getActivity()).showTabs();
+        // show nearby card view on contributions list is visible
+        nearbyNoificationCardView.setVisibility(View.GONE);
+
 
         // Create if null
         if (getContributionsListFragment() == null) {
@@ -190,6 +193,8 @@ public class ContributionsFragment
     public void setMediaDetailPagerFragment() {
         // hide tabs on media detail view is visible
         ((ContributionsActivity)getActivity()).hideTabs();
+        // hide nearby card view on media detail is visible
+        nearbyNoificationCardView.setVisibility(View.GONE);
 
         // Create if null
         if (getMediaDetailPagerFragment() == null) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 751fe4fed..c4d39964a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -355,7 +355,7 @@
 
   <string name="contributions_fragment">Contributions</string>
   <string name="nearby_fragment">Nearby</string>
-  <string name="notifictions">Notifications</string>
+  <string name="notifications">Notifications</string>
   <string name="display_nearby_notification">Display nearby notification</string>
   <string name="display_nearby_notification_summary">Display closest wikidata item needs an image, above contribution list</string>