mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 12:53:55 +01:00
Add tabs and fragments method
This commit is contained in:
parent
df1d5527e6
commit
3f8d219a8b
2 changed files with 31 additions and 2 deletions
|
|
@ -31,6 +31,14 @@ public class ContributionsActivity
|
||||||
public Intent uploadServiceIntent;
|
public Intent uploadServiceIntent;
|
||||||
public boolean isAuthCookieAcquired = false;
|
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) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_contributions);
|
setContentView(R.layout.activity_contributions);
|
||||||
|
|
@ -38,7 +46,7 @@ public class ContributionsActivity
|
||||||
|
|
||||||
requestAuthToken();
|
requestAuthToken();
|
||||||
initDrawer();
|
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();
|
//prepareForContributions();
|
||||||
//prepareForNearby();
|
//prepareForNearby();
|
||||||
|
|
@ -53,13 +61,30 @@ public class ContributionsActivity
|
||||||
uploadServiceIntent.setAction(UploadService.ACTION_START_SERVICE);
|
uploadServiceIntent.setAction(UploadService.ACTION_START_SERVICE);
|
||||||
startService(uploadServiceIntent);
|
startService(uploadServiceIntent);
|
||||||
|
|
||||||
//addTabsAndFragments();
|
addTabsAndFragments();
|
||||||
isAuthCookieAcquired = true;
|
isAuthCookieAcquired = true;
|
||||||
/*if (contributionsFragment != null) {
|
/*if (contributionsFragment != null) {
|
||||||
contributionsFragment.onAuthCookieAcquired(uploadServiceIntent);
|
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
|
@Override
|
||||||
protected void onAuthFailure() {
|
protected void onAuthFailure() {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
package fr.free.nrw.commons.contributions;
|
||||||
|
|
||||||
|
public class ContributionsFragment {
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue