norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Create tab count constants in SongSelector

Browse Source
This commit is contained in:
Christopher Eby 2010-05-31 22:33:54 -05:00
parent 6234b402f2
commit 91b8d627a8
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/kreed/vanilla/SongSelector.java
View File

@ -57,6 +57,15 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
public class SongSelector extends PlaybackActivity implements AdapterView.OnItemClickListener, TextWatcher, TabHost.OnTabChangeListener, Filter.FilterListener { public class SongSelector extends PlaybackActivity implements AdapterView.OnItemClickListener, TextWatcher, TabHost.OnTabChangeListener, Filter.FilterListener {
/**
* The number of tabs in the song selector.
*/
private static final int TAB_COUNT = 4;
/**
* The number of tabs in the song selector that should be limited.
*/
private static final int LIMIT_COUNT = 3;
private TabHost mTabHost; private TabHost mTabHost;
private View mSearchBox; private View mSearchBox;
@ -120,7 +129,7 @@ public class SongSelector extends PlaybackActivity implements AdapterView.OnItem
if (currentTab != -1) if (currentTab != -1)
mTabHost.setCurrentTab(currentTab); mTabHost.setCurrentTab(currentTab);
mTextFilter.setText(state.getString("filter")); mTextFilter.setText(state.getString("filter"));
for (int i = 0; i != 3; ++i) for (int i = 0; i != LIMIT_COUNT; ++i)
getAdapter(i).setLimiter(state.getStringArray("limiter_" + i), true); getAdapter(i).setLimiter(state.getStringArray("limiter_" + i), true);
updateLimiterViews(); updateLimiterViews();
} }
@ -178,7 +187,7 @@ public class SongSelector extends PlaybackActivity implements AdapterView.OnItem
out.putBoolean("search_box_visible", mSearchBoxVisible); out.putBoolean("search_box_visible", mSearchBoxVisible);
out.putInt("current_tab", mTabHost.getCurrentTab()); out.putInt("current_tab", mTabHost.getCurrentTab());
out.putString("filter", mTextFilter.getText().toString()); out.putString("filter", mTextFilter.getText().toString());
for (int i = 0; i != 3; ++i) for (int i = 0; i != LIMIT_COUNT; ++i)
out.putStringArray("limiter_" + i, getAdapter(i).getLimiter()); out.putStringArray("limiter_" + i, getAdapter(i).getLimiter());
} }
@ -265,7 +274,7 @@ public class SongSelector extends PlaybackActivity implements AdapterView.OnItem
getAdapter(limiter.length).setLimiter(limiter, false); getAdapter(limiter.length).setLimiter(limiter, false);
mTabHost.setCurrentTab(limiter.length); mTabHost.setCurrentTab(limiter.length);
for (int i = limiter.length + 1; i < 3; ++i) for (int i = limiter.length + 1; i < LIMIT_COUNT; ++i)
getAdapter(i).setLimiter(limiter, true); getAdapter(i).setLimiter(limiter, true);
} }
@ -356,7 +365,7 @@ public class SongSelector extends PlaybackActivity implements AdapterView.OnItem
System.arraycopy(oldLimiter, 0, limiter, 0, i); System.arraycopy(oldLimiter, 0, limiter, 0, i);
} }
for (int j = 3; --j != -1; ) { for (int j = LIMIT_COUNT; --j != -1; ) {
MediaAdapter adapter = getAdapter(j); MediaAdapter adapter = getAdapter(j);
if (adapter.getLimiterLength() > i) if (adapter.getLimiterLength() > i)
adapter.setLimiter(limiter, true); adapter.setLimiter(limiter, true);
@ -538,7 +547,7 @@ public class SongSelector extends PlaybackActivity implements AdapterView.OnItem
public void onFilterComplete(int count) public void onFilterComplete(int count)
{ {
CharSequence text = mTextFilter.getText(); CharSequence text = mTextFilter.getText();
for (int i = 3; --i != -1; ) for (int i = TAB_COUNT; --i != -1; )
getAdapter(i).filter(text, null); getAdapter(i).filter(text, null);
} }
@ -629,7 +638,7 @@ public class SongSelector extends PlaybackActivity implements AdapterView.OnItem
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
public void run() public void run()
{ {
for (int i = 0; i != 4; ++i) for (int i = 0; i != TAB_COUNT; ++i)
getAdapter(i).requery(); getAdapter(i).requery();
} }
}); });