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

Make nearby card view invisible on swipe to nearby tab

Browse source
This commit is contained in:
neslihanturan 2018-09-28 13:53:58 +03:00
parent ad10832774
commit 55a391a2a9
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
View file

@ -30,6 +30,7 @@ import fr.free.nrw.commons.nearby.NearbyFragment;
import fr.free.nrw.commons.notification.NotificationActivity; import fr.free.nrw.commons.notification.NotificationActivity;
import fr.free.nrw.commons.theme.NavigationBaseActivity; import fr.free.nrw.commons.theme.NavigationBaseActivity;
import fr.free.nrw.commons.upload.UploadService; import fr.free.nrw.commons.upload.UploadService;
import timber.log.Timber;
import static android.content.ContentResolver.requestSync; import static android.content.ContentResolver.requestSync;
@ -55,7 +56,7 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
private final int CONTRIBUTIONS_TAB_POSITION = 0; private final int CONTRIBUTIONS_TAB_POSITION = 0;
private final int NEARBY_TAB_POSITION = 1; private final int NEARBY_TAB_POSITION = 1;
public ContributionsFragment contributionsFragment; //public ContributionsFragment contributionsFragment;
private NearbyFragment nearbyFragment; private NearbyFragment nearbyFragment;
public boolean isContributionsFragmentVisible = true; // False means nearby fragment is visible public boolean isContributionsFragmentVisible = true; // False means nearby fragment is visible
private Menu menu; private Menu menu;
@ -82,8 +83,8 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
addTabsAndFragments(); addTabsAndFragments();
isAuthCookieAcquired = true; isAuthCookieAcquired = true;
if (contributionsFragment != null) { if (contributionsActivityPagerAdapter.contributionsFragment != null) {
contributionsFragment.onAuthCookieAcquired(uploadServiceIntent); contributionsActivityPagerAdapter.contributionsFragment.onAuthCookieAcquired(uploadServiceIntent);
} }
} }
@ -130,11 +131,21 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
tabLayout.getTabAt(CONTRIBUTIONS_TAB_POSITION).select(); tabLayout.getTabAt(CONTRIBUTIONS_TAB_POSITION).select();
isContributionsFragmentVisible = true; isContributionsFragmentVisible = true;
updateMenuItem(); updateMenuItem();
// If contrib tab, nearby notification card view top of contrib list should be visible
if (contributionsActivityPagerAdapter.contributionsFragment != null && contributionsActivityPagerAdapter.contributionsFragment.nearbyNoificationCardView != null) {
contributionsActivityPagerAdapter.contributionsFragment.nearbyNoificationCardView.setVisibility(View.VISIBLE);
Log.d("deneme","called23");
}
break; break;
case NEARBY_TAB_POSITION: case NEARBY_TAB_POSITION:
tabLayout.getTabAt(NEARBY_TAB_POSITION).select(); tabLayout.getTabAt(NEARBY_TAB_POSITION).select();
isContributionsFragmentVisible = false; isContributionsFragmentVisible = false;
updateMenuItem(); updateMenuItem();
// If nearby tab, nearby notifiction card view top of contrib list should be invisible
if (contributionsActivityPagerAdapter.contributionsFragment != null && contributionsActivityPagerAdapter.contributionsFragment.nearbyNoificationCardView != null) {
contributionsActivityPagerAdapter.contributionsFragment.nearbyNoificationCardView.setVisibility(View.GONE);
Log.d("deneme","called22");
}
break; break;
default: default:
tabLayout.getTabAt(CONTRIBUTIONS_TAB_POSITION).select(); tabLayout.getTabAt(CONTRIBUTIONS_TAB_POSITION).select();
@ -238,14 +249,14 @@ public class ContributionsActivity extends AuthenticatedActivity implements Frag
private void updateMenuItem() { private void updateMenuItem() {
if (isContributionsFragmentVisible) { if (isContributionsFragmentVisible) {
// Display notifications menu item // Display notifications menu item
Log.d("deneme6","notifications is visible");
menu.findItem(R.id.notifications).setVisible(true); menu.findItem(R.id.notifications).setVisible(true);
menu.findItem(R.id.list_sheet).setVisible(false); menu.findItem(R.id.list_sheet).setVisible(false);
Timber.d("Contributions activity notifications menu item is visible");
} else { } else {
// Display bottom list menu item // Display bottom list menu item
Log.d("deneme6","notifications is invisible");
menu.findItem(R.id.notifications).setVisible(false); menu.findItem(R.id.notifications).setVisible(false);
menu.findItem(R.id.list_sheet).setVisible(true); menu.findItem(R.id.list_sheet).setVisible(true);
Timber.d("Contributions activity list sheet menu item is visible");
} }
} }