Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't hardcode tab indexes in multiple places

Browse Source
This commit is contained in:
Daniel Martí 2015-04-21 19:09:14 +02:00
parent 7945c0dead
commit 76a489c492
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
F-Droid/src/org/fdroid/fdroid/compat/TabManager.java
View File

@ -18,6 +18,7 @@ public class TabManager {
public static final int INDEX_AVAILABLE = 0; public static final int INDEX_AVAILABLE = 0;
public static final int INDEX_INSTALLED = 1; public static final int INDEX_INSTALLED = 1;
public static final int INDEX_CAN_UPDATE = 2; public static final int INDEX_CAN_UPDATE = 2;
public static final int INDEX_COUNT = 3;
private final ViewPager pager; private final ViewPager pager;
private final FDroid parent; private final FDroid parent;

13
F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
View File

@ -5,6 +5,7 @@ import android.support.v4.app.FragmentPagerAdapter;
import org.fdroid.fdroid.FDroid; import org.fdroid.fdroid.FDroid;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.compat.TabManager;
import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.views.fragments.AvailableAppsFragment; import org.fdroid.fdroid.views.fragments.AvailableAppsFragment;
import org.fdroid.fdroid.views.fragments.CanUpdateAppsFragment; import org.fdroid.fdroid.views.fragments.CanUpdateAppsFragment;
@ -33,9 +34,9 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
@Override @Override
public Fragment getItem(int i) { public Fragment getItem(int i) {
switch (i) { switch (i) {
case 0: case TabManager.INDEX_AVAILABLE:
return new AvailableAppsFragment(); return new AvailableAppsFragment();
case 1: case TabManager.INDEX_INSTALLED:
return new InstalledAppsFragment(); return new InstalledAppsFragment();
default: default:
return new CanUpdateAppsFragment(); return new CanUpdateAppsFragment();
@ -43,16 +44,16 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
} }
@Override @Override
public int getCount() { return 3; } public int getCount() { return TabManager.INDEX_COUNT; }
@Override @Override
public String getPageTitle(int i) { public String getPageTitle(int i) {
switch (i) { switch (i) {
case 0: case TabManager.INDEX_AVAILABLE:
return parent.getString(R.string.tab_noninstalled); return parent.getString(R.string.tab_noninstalled);
case 1: case TabManager.INDEX_INSTALLED:
return parent.getString(R.string.inst); return parent.getString(R.string.inst);
case 2: case TabManager.INDEX_CAN_UPDATE:
return getUpdateTabTitle(); return getUpdateTabTitle();
default: default:
return ""; return "";