Don't use TabHost
This commit is contained in:
Christopher Eby
parent
b842b7e46f
commit
268a537969
6
res/color/tab_indicator_text.xml
Normal file
6
res/color/tab_indicator_text.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_selected="true" android:color="#ffffff"/>
|
||||
<item android:state_focused="true" android:color="#ffffff"/>
|
||||
<item android:color="#808080"/>
|
||||
</selector>
|
||||
7
res/drawable/buttonbar.xml
Normal file
7
res/drawable/buttonbar.xml
Normal file
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_focused="true" android:drawable="@drawable/buttonbar_focused" />
|
||||
<item android:state_pressed="true" android:drawable="@drawable/buttonbar_pressed" />
|
||||
<item android:state_selected="true" android:drawable="@drawable/buttonbar_active" />
|
||||
<item android:state_selected="false" android:drawable="@drawable/buttonbar_inactive" />
|
||||
</selector>
|
||||
BIN
res/drawable/buttonbar_active.9.png
Normal file
BIN
res/drawable/buttonbar_active.9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 198 B |
BIN
res/drawable/buttonbar_focused.9.png
Normal file
BIN
res/drawable/buttonbar_focused.9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 198 B |
BIN
res/drawable/buttonbar_inactive.9.png
Normal file
BIN
res/drawable/buttonbar_inactive.9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 260 B |
BIN
res/drawable/buttonbar_pressed.9.png
Normal file
BIN
res/drawable/buttonbar_pressed.9.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 195 B |
0
res/drawable/ic_menu_shuffle.png
Executable file → Normal file
0
res/drawable/ic_menu_shuffle.png
Executable file → Normal file
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
@ -21,46 +21,118 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
-->
|
||||
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<TabHost
|
||||
android:id="@android:id/tabhost"
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0px"
|
||||
android:layout_weight="1">
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_height="0px">
|
||||
<TabWidget
|
||||
android:id="@+id/tab_widget"
|
||||
android:tabStripEnabled="false"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" >
|
||||
<TextView
|
||||
android:id="@+id/artist_tab"
|
||||
android:focusable="true"
|
||||
android:background="@drawable/buttonbar"
|
||||
android:drawableTop="@drawable/ic_tab_artists"
|
||||
android:text="@string/artists"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/tab_indicator_text"
|
||||
android:paddingTop="7dip"
|
||||
android:paddingBottom="2dip"
|
||||
android:gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="0px"
|
||||
android:layout_height="64dip" />
|
||||
<TextView
|
||||
android:id="@+id/album_tab"
|
||||
android:focusable="true"
|
||||
android:background="@drawable/buttonbar"
|
||||
android:drawableTop="@drawable/ic_tab_albums"
|
||||
android:text="@string/albums"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/tab_indicator_text"
|
||||
android:paddingTop="7dip"
|
||||
android:paddingBottom="2dip"
|
||||
android:gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="0px"
|
||||
android:layout_height="64dip" />
|
||||
<TextView
|
||||
android:id="@+id/song_tab"
|
||||
android:focusable="true"
|
||||
android:background="@drawable/buttonbar"
|
||||
android:drawableTop="@drawable/ic_tab_songs"
|
||||
android:text="@string/songs"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/tab_indicator_text"
|
||||
android:paddingTop="7dip"
|
||||
android:paddingBottom="2dip"
|
||||
android:gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="0px"
|
||||
android:layout_height="64dip" />
|
||||
<TextView
|
||||
android:id="@+id/playlist_tab"
|
||||
android:focusable="true"
|
||||
android:background="@drawable/buttonbar"
|
||||
android:drawableTop="@drawable/ic_tab_playlists"
|
||||
android:text="@string/playlists"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/tab_indicator_text"
|
||||
android:paddingTop="7dip"
|
||||
android:paddingBottom="2dip"
|
||||
android:gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="0px"
|
||||
android:layout_height="64dip" />
|
||||
<TextView
|
||||
android:id="@+id/genre_tab"
|
||||
android:focusable="true"
|
||||
android:background="@drawable/buttonbar"
|
||||
android:drawableTop="@drawable/ic_tab_songs"
|
||||
android:text="@string/genres"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/tab_indicator_text"
|
||||
android:paddingTop="7dip"
|
||||
android:paddingBottom="2dip"
|
||||
android:gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="0px"
|
||||
android:layout_height="64dip" />
|
||||
</TabWidget>
|
||||
<FrameLayout
|
||||
android:id="@+id/lists"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<TabWidget
|
||||
android:id="@android:id/tabs"
|
||||
<ListView
|
||||
android:id="@+id/artist_list"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
<FrameLayout
|
||||
android:id="@android:id/tabcontent"
|
||||
android:layout_height="fill_parent" />
|
||||
<ListView
|
||||
android:id="@+id/album_list"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<ListView
|
||||
android:id="@+id/artist_list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" />
|
||||
<ListView
|
||||
android:id="@+id/album_list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" />
|
||||
<ListView
|
||||
android:id="@+id/song_list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" />
|
||||
<ListView
|
||||
android:id="@+id/playlist_list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" />
|
||||
<ListView
|
||||
android:id="@+id/genre_list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
</TabHost>
|
||||
android:layout_height="fill_parent" />
|
||||
<ListView
|
||||
android:id="@+id/song_list"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" />
|
||||
<ListView
|
||||
android:id="@+id/playlist_list"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" />
|
||||
<ListView
|
||||
android:id="@+id/genre_list"
|
||||
android:visibility="gone"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/limiter_layout"
|
||||
android:layout_width="wrap_content"
|
||||
@ -89,3 +161,4 @@ THE SOFTWARE.
|
||||
android:src="@android:drawable/ic_menu_close_clear_cancel" />
|
||||
</RelativeLayout>
|
||||
</merge>
|
||||
|
||||
|
||||
@ -50,14 +50,14 @@ import android.widget.AdapterView;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TabHost;
|
||||
import android.widget.TabWidget;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
/**
|
||||
* The library activity where songs to play can be selected from the library.
|
||||
*/
|
||||
public class LibraryActivity extends PlaybackActivity implements AdapterView.OnItemClickListener, TextWatcher, TabHost.OnTabChangeListener {
|
||||
public class LibraryActivity extends PlaybackActivity implements AdapterView.OnItemClickListener, TextWatcher {
|
||||
/**
|
||||
* The number of tabs in the song selector.
|
||||
*/
|
||||
@ -69,7 +69,9 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
|
||||
private static final int[] modeForAction =
|
||||
{ SongTimeline.MODE_PLAY, SongTimeline.MODE_ENQUEUE };
|
||||
|
||||
private TabHost mTabHost;
|
||||
private TabWidget mTabWidget;
|
||||
private ViewGroup mLists;
|
||||
private int mCurrentTab;
|
||||
|
||||
private View mSearchBox;
|
||||
private boolean mSearchBoxVisible;
|
||||
@ -130,17 +132,6 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
|
||||
setContentView(R.layout.library_nocontrols);
|
||||
}
|
||||
|
||||
mTabHost = (TabHost)findViewById(android.R.id.tabhost);
|
||||
mTabHost.setup();
|
||||
|
||||
Resources res = getResources();
|
||||
mTabHost.addTab(mTabHost.newTabSpec("tab_artists").setIndicator(res.getText(R.string.artists), res.getDrawable(R.drawable.tab_artists)).setContent(R.id.artist_list));
|
||||
mTabHost.addTab(mTabHost.newTabSpec("tab_albums").setIndicator(res.getText(R.string.albums), res.getDrawable(R.drawable.tab_albums)).setContent(R.id.album_list));
|
||||
mTabHost.addTab(mTabHost.newTabSpec("tab_songs").setIndicator(res.getText(R.string.songs), res.getDrawable(R.drawable.tab_songs)).setContent(R.id.song_list));
|
||||
mTabHost.addTab(mTabHost.newTabSpec("tab_playlists").setIndicator(res.getText(R.string.playlists), res.getDrawable(R.drawable.tab_playlists)).setContent(R.id.playlist_list));
|
||||
// TODO: find/create genre icon
|
||||
mTabHost.addTab(mTabHost.newTabSpec("tab_genres").setIndicator(res.getText(R.string.genres), res.getDrawable(R.drawable.tab_songs)).setContent(R.id.genre_list));
|
||||
|
||||
mSearchBox = findViewById(R.id.search_box);
|
||||
|
||||
mTextFilter = (TextView)findViewById(R.id.filter_text);
|
||||
@ -159,21 +150,31 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
|
||||
// These should be in the same order as MediaUtils.TYPE_*
|
||||
mAdapters = new MediaAdapter[] { mArtistAdapter, mAlbumAdapter, mSongAdapter, mPlaylistAdapter, mGenreAdapter };
|
||||
|
||||
mLists = (ViewGroup)findViewById(R.id.lists);
|
||||
TabWidget tabWidget = (TabWidget)findViewById(R.id.tab_widget);
|
||||
tabWidget.setCurrentTab(0);
|
||||
mTabWidget = tabWidget;
|
||||
for (int i = 0, count = tabWidget.getTabCount(); i != count; ++i) {
|
||||
View view = tabWidget.getChildTabViewAt(i);
|
||||
view.setOnClickListener(this);
|
||||
view.setTag(i);
|
||||
}
|
||||
|
||||
getContentResolver().registerContentObserver(MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI, true, mPlaylistObserver);
|
||||
|
||||
mCurrentAdapter = mAdapters[mTabHost.getCurrentTab()];
|
||||
|
||||
mTabHost.setOnTabChangedListener(this);
|
||||
int currentTab = 0;
|
||||
|
||||
if (state != null) {
|
||||
if (state.getBoolean("search_box_visible"))
|
||||
setSearchBoxVisible(true);
|
||||
int currentTab = state.getInt("current_tab", -1);
|
||||
if (currentTab != -1)
|
||||
mTabHost.setCurrentTab(currentTab);
|
||||
mTextFilter.setText(state.getString("filter"));
|
||||
currentTab = state.getInt("current_tab", 0);
|
||||
}
|
||||
|
||||
setCurrentTab(currentTab);
|
||||
|
||||
if (state != null)
|
||||
mTextFilter.setText(state.getString("filter"));
|
||||
|
||||
// query adapters
|
||||
onMediaChange();
|
||||
}
|
||||
@ -193,7 +194,7 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
|
||||
protected void onSaveInstanceState(Bundle out)
|
||||
{
|
||||
out.putBoolean("search_box_visible", mSearchBoxVisible);
|
||||
out.putInt("current_tab", mTabHost.getCurrentTab());
|
||||
out.putInt("current_tab", mCurrentTab);
|
||||
out.putString("filter", mTextFilter.getText().toString());
|
||||
out.putSerializable("limiter_albums", mAlbumAdapter.getLimiter());
|
||||
out.putSerializable("limiter_songs", mSongAdapter.getLimiter());
|
||||
@ -291,7 +292,7 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
|
||||
{
|
||||
int type = intent.getIntExtra("type", 1);
|
||||
long id = intent.getLongExtra("id", -1);
|
||||
mTabHost.setCurrentTab(setLimiter(mAdapters[type - 1].getLimiter(id)));
|
||||
setCurrentTab(setLimiter(mAdapters[type - 1].getLimiter(id)));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -398,12 +399,6 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
|
||||
}
|
||||
}
|
||||
|
||||
public void onTabChanged(String tabId)
|
||||
{
|
||||
mCurrentAdapter = mAdapters[mTabHost.getCurrentTab()];
|
||||
updateLimiterViews();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View view)
|
||||
{
|
||||
@ -415,31 +410,35 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
|
||||
} else if (view == mCover) {
|
||||
startActivity(new Intent(this, FullPlaybackActivity.class));
|
||||
} else if (view.getTag() != null) {
|
||||
// a limiter view was clicked
|
||||
|
||||
int i = (Integer)view.getTag();
|
||||
if (i == 1) {
|
||||
// generate the artist limiter (we need to query the artist id)
|
||||
MediaAdapter.Limiter limiter = mSongAdapter.getLimiter();
|
||||
assert(limiter.type == MediaUtils.TYPE_ALBUM);
|
||||
if (view.getParent() instanceof TabWidget) {
|
||||
// a tab was clicked
|
||||
setCurrentTab(i);
|
||||
} else {
|
||||
// a limiter view was clicked
|
||||
if (i == 1) {
|
||||
// generate the artist limiter (we need to query the artist id)
|
||||
MediaAdapter.Limiter limiter = mSongAdapter.getLimiter();
|
||||
assert(limiter.type == MediaUtils.TYPE_ALBUM);
|
||||
|
||||
ContentResolver resolver = getContentResolver();
|
||||
Uri uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
|
||||
String[] projection = new String[] { MediaStore.Audio.Media.ARTIST_ID };
|
||||
Cursor cursor = resolver.query(uri, projection, limiter.selection, null, null);
|
||||
if (cursor != null) {
|
||||
if (cursor.moveToNext()) {
|
||||
setLimiter(mArtistAdapter.getLimiter(cursor.getLong(0)));
|
||||
updateLimiterViews();
|
||||
ContentResolver resolver = getContentResolver();
|
||||
Uri uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
|
||||
String[] projection = new String[] { MediaStore.Audio.Media.ARTIST_ID };
|
||||
Cursor cursor = resolver.query(uri, projection, limiter.selection, null, null);
|
||||
if (cursor != null) {
|
||||
if (cursor.moveToNext()) {
|
||||
setLimiter(mArtistAdapter.getLimiter(cursor.getLong(0)));
|
||||
updateLimiterViews();
|
||||
cursor.close();
|
||||
return;
|
||||
}
|
||||
cursor.close();
|
||||
return;
|
||||
}
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
|
||||
setLimiter(null);
|
||||
updateLimiterViews();
|
||||
setLimiter(null);
|
||||
updateLimiterViews();
|
||||
}
|
||||
} else {
|
||||
super.onClick(view);
|
||||
}
|
||||
@ -806,4 +805,17 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
|
||||
mCover.setVisibility(cover == null ? View.GONE : View.VISIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Switch to the tab at the given index.
|
||||
*/
|
||||
private void setCurrentTab(int i)
|
||||
{
|
||||
mCurrentAdapter = mAdapters[i];
|
||||
mTabWidget.setCurrentTab(i);
|
||||
mLists.getChildAt(mCurrentTab).setVisibility(View.GONE);
|
||||
mLists.getChildAt(i).setVisibility(View.VISIBLE);
|
||||
mCurrentTab = i;
|
||||
updateLimiterViews();
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user