From 3f8d219a8b0398ce0a009c7d9d9acaa84caccad0 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Thu, 6 Sep 2018 14:05:46 +0300
Subject: [PATCH] Add tabs and fragments method

---
 .../contributions/ContributionsActivity.java  | 29 +++++++++++++++++--
 .../contributions/ContributionsFragment.java  |  4 +++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

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 056867c2c..6c80eede2 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
@@ -31,6 +31,14 @@ public  class       ContributionsActivity
     public Intent uploadServiceIntent;
     public boolean isAuthCookieAcquired = false;
 
+    //public ContributionsActivityPagerAdapter contributionsActivityPagerAdapter;
+    private final int CONTRIBUTIONS_TAB_POSITION = 0;
+    private final int NEARBY_TAB_POSITION = 1;
+
+    public ContributionsFragment contributionsFragment;
+    private NewNearbyFragment nearbyFragment;
+    public boolean isContributionsFragmentVisible = true; // False means nearby fragment is visible
+
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_contributions);
@@ -38,7 +46,7 @@ public  class       ContributionsActivity
 
         requestAuthToken();
         initDrawer();
-        setTitle(getString(R.string.navigation_item_home)); // Should I create a new string with another name instead?
+        setTitle(getString(R.string.navigation_item_home)); // Should I create a new string variable with another name instead?
 
         //prepareForContributions();
         //prepareForNearby();
@@ -53,13 +61,30 @@ public  class       ContributionsActivity
         uploadServiceIntent.setAction(UploadService.ACTION_START_SERVICE);
         startService(uploadServiceIntent);
 
-        //addTabsAndFragments();
+        addTabsAndFragments();
         isAuthCookieAcquired = true;
         /*if (contributionsFragment != null) {
             contributionsFragment.onAuthCookieAcquired(uploadServiceIntent);
         }*/
     }
 
+    private void addTabsAndFragments() {
+        contributionsActivityPagerAdapter = new ContributionsActivityPagerAdapter(getSupportFragmentManager());
+        viewPager.setAdapter(contributionsActivityPagerAdapter);
+
+        tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.contributions_fragment)));
+        tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.nearby_fragment)));
+
+        //contributionsFragment = ((NewContributionsFragment)contributionsActivityPagerAdapter.getItem(CONTRIBUTIONS_TAB_POSITION));
+
+        if (uploadServiceIntent != null) { // If auth cookie already acquired
+            ((NewContributionsFragment)contributionsActivityPagerAdapter.getItem(CONTRIBUTIONS_TAB_POSITION)).onAuthCookieAcquired(uploadServiceIntent);
+        }
+        //nearbyFragment = ((NewNearbyFragment)contributionsActivityPagerAdapter.getItem(NEARBY_TAB_POSITION));
+
+        setTabAndViewPagerSynchronisation();
+    }
+
     @Override
     protected void onAuthFailure() {
 
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
new file mode 100644
index 000000000..870f63170
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
@@ -0,0 +1,4 @@
+package fr.free.nrw.commons.contributions;
+
+public class ContributionsFragment {
+}