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

No need for TabInfo struct in TabsAdapter

Browse Source
This commit is contained in:
Daniel Martí 2015-06-15 01:38:52 +02:00
parent 4084cd5260
commit 3fa5a51600
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
F-Droid/src/org/fdroid/fdroid/installer/TabsAdapter.java
View File

@ -27,6 +27,7 @@ import android.widget.TabHost;
import android.widget.TabWidget; import android.widget.TabWidget;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
/** /**
* This is a helper class that implements the management of tabs and all * This is a helper class that implements the management of tabs and all
@ -44,20 +45,10 @@ public class TabsAdapter extends PagerAdapter
private final Context mContext; private final Context mContext;
private final TabHost mTabHost; private final TabHost mTabHost;
private final ViewPager mViewPager; private final ViewPager mViewPager;
private final ArrayList<TabInfo> mTabs = new ArrayList<>(); private final List<View> mTabs = new ArrayList<>();
private final Rect mTempRect = new Rect(); private final Rect mTempRect = new Rect();
private TabHost.OnTabChangeListener mOnTabChangeListener; private TabHost.OnTabChangeListener mOnTabChangeListener;
static final class TabInfo {
private final String tag;
private final View view;
TabInfo(String _tag, View _view) {
tag = _tag;
view = _view;
}
}
static class DummyTabFactory implements TabHost.TabContentFactory { static class DummyTabFactory implements TabHost.TabContentFactory {
private final Context mContext; private final Context mContext;
@ -87,8 +78,7 @@ public class TabsAdapter extends PagerAdapter
tabSpec.setContent(new DummyTabFactory(mContext)); tabSpec.setContent(new DummyTabFactory(mContext));
String tag = tabSpec.getTag(); String tag = tabSpec.getTag();
TabInfo info = new TabInfo(tag, view); mTabs.add(view);
mTabs.add(info);
mTabHost.addTab(tabSpec); mTabHost.addTab(tabSpec);
notifyDataSetChanged(); notifyDataSetChanged();
} }
@ -100,7 +90,7 @@ public class TabsAdapter extends PagerAdapter
@Override @Override
public Object instantiateItem(ViewGroup container, int position) { public Object instantiateItem(ViewGroup container, int position) {
View view = mTabs.get(position).view; View view = mTabs.get(position);
container.addView(view); container.addView(view);
return view; return view;
} }
@ -151,7 +141,7 @@ public class TabsAdapter extends PagerAdapter
widget.requestRectangleOnScreen(mTempRect, false); widget.requestRectangleOnScreen(mTempRect, false);
// Make sure the scrollbars are visible for a moment after selection // Make sure the scrollbars are visible for a moment after selection
final View contentView = mTabs.get(position).view; final View contentView = mTabs.get(position);
if (contentView instanceof CaffeinatedScrollView) { if (contentView instanceof CaffeinatedScrollView) {
((CaffeinatedScrollView) contentView).awakenScrollBars(); ((CaffeinatedScrollView) contentView).awakenScrollBars();
} }