From 1024f36ac44bf892a93aa6d8f8ca7addc17b4deb Mon Sep 17 00:00:00 2001 From: Christopher Eby Date: Sun, 7 Mar 2010 21:50:51 -0600 Subject: [PATCH] Add tabs to the song selector They serve no purpose, yet --- res/drawable/tab_albums.xml | 9 ++++++ res/drawable/tab_albums_selected.png | Bin 0 -> 1217 bytes res/drawable/tab_albums_unselected.png | Bin 0 -> 686 bytes res/drawable/tab_artists.xml | 9 ++++++ res/drawable/tab_artists_selected.png | Bin 0 -> 1127 bytes res/drawable/tab_artists_unselected.png | Bin 0 -> 595 bytes res/drawable/tab_songs.xml | 9 ++++++ res/drawable/tab_songs_selected.png | Bin 0 -> 1510 bytes res/drawable/tab_songs_unselected.png | Bin 0 -> 793 bytes res/layout/song_selector.xml | 37 +++++++++++++++++++++--- res/values/strings.xml | 4 +++ src/org/kreed/vanilla/SongSelector.java | 17 +++++++++-- 12 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 res/drawable/tab_albums.xml create mode 100644 res/drawable/tab_albums_selected.png create mode 100644 res/drawable/tab_albums_unselected.png create mode 100644 res/drawable/tab_artists.xml create mode 100644 res/drawable/tab_artists_selected.png create mode 100644 res/drawable/tab_artists_unselected.png create mode 100644 res/drawable/tab_songs.xml create mode 100644 res/drawable/tab_songs_selected.png create mode 100644 res/drawable/tab_songs_unselected.png diff --git a/res/drawable/tab_albums.xml b/res/drawable/tab_albums.xml new file mode 100644 index 00000000..65a98041 --- /dev/null +++ b/res/drawable/tab_albums.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/tab_albums_selected.png b/res/drawable/tab_albums_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..702436e1a5c1163b173f236672ed825f9ee3f8b6 GIT binary patch literal 1217 zcmV;y1U~zTP)sF|J? zRMxOPXkStX8tY0yqd!2uf;Q7Tj#+n#MukJEsq5aodHdXCGPPQ|Sa3~T8*P9s53*^E zGVWY+6Hqkcb-w|{$gs4=dQne{Olc~l0 z;C{*VJH^Gf4F<#0yc;)aBIeH@EC_;T!o&&VM~@y8r1R1blT!?4v-zi5t@ef2D*W9a z)b|gbzFQO#5f1-*gAM|91$6=CDTG>3pJhvygui(9tWZuA&?ecIcA&1dwrWyf;8ZM5 zijqA8PbI;%7yajsPHs<5URzuJ$=D?h>_|yTpdI!`gZPbkZb zfT4%6;h@gAYYC&AgeoZ_ZaSUksK*Z<8vfdWTlx7}Fy=+O=WGnKq3>@)TuOQ$fKId* z3DE&bx_w_+`5pm)^huLNu_LGWIbor`E0!-GOU20(obBklFR(;aOiWBdT}}1Jj!@Ai z0>{(Rc2V)!+w2~V3wMf&PKt9I>g#KBvM=l=Tsu=ei0KfLw`_@#V%Bz3aPj>4qf~$n zHpS+&Eh%Z9R7e4a`II(CCLQ=bwB+8sJXtBwdV1<k0ubVeBdB@DT@aZ6B43fd>}@GsR8S`QC3=d*J`lwbA9gBtC@ub1((F{ z*2l(%(wZD?5K*DUw90Y-aZD8K$V36t!q1#OEdZHPsupI4g^r_dL=FXZG2!&V7&Ifdy#)FOKhz?*Hcw|V~4t%JrEO&L~M-a}{HjIa3 z`pCtLrku*iNKA~64`a>^l}+)w@GdT+WIKRTU@+uRDx7Fxj^Y14gngd=@6F6%$;)*{ zNXXPq!;qDr$&(kH&CHBNdL`PmLJYescz#2efi@!h5$wzaLDm8L;Nakqora-QKX>lz znFACFo@zq*J4;K72t#jMGU{{+SV6c!P54t`iamnTCgcjH)5a7DQIU}gTUvgY{@DQ( zBoyKZZ{i6jGSrJAO$TDeXwUG&MGqmzCeI0jaO6tAVvS53N@4^Y;&Mb9dKvrYZfeZMl+Q(|qm9<->{| zlIyv->2y6avsW{Z6Y0k`;`OP!c8+VK4fblrUQWg8?e5EIGhI-vms5_xEyrBVyYqV9 f%CM#7mjD9*ur;J*?au@200000NkvXXu0mjfb@)S` literal 0 HcmV?d00001 diff --git a/res/drawable/tab_albums_unselected.png b/res/drawable/tab_albums_unselected.png new file mode 100644 index 0000000000000000000000000000000000000000..f8083f6b63ff6bad90db9bb37fc713d11079aad1 GIT binary patch literal 686 zcmV;f0#W^mP)G7&sM|!5B4(qjky46XjWNX(DMq)E^?f+wwViYJ zp7-7A@NxF;{qcO?=bY#Jo?{J%!xl3w6bhNT-)8yeW-ZIWBnW~5V6SnkAMgO8$Xb$@ zfhmvxLv;vlVb7#zCnAxEmnUH74>KR+32+H6{su>28nn=`fp*XjHdtC!n~Nuam-Y&}TJt-PH>Bfe zX=otA&dEYfZS0FEGN@9O93Wr>{TMrL1f7EW&Qy(PU2-nKgfz1c%Zlb)L2yq> zRe%qS2+q;$9tKxs|Hs(O7iF%ZIjWS~9#E;5`v z`#S0|E<gVIc4Ei;t{;yH1-#u zp;r3>3VshxGzKIJPRsm9nYBC0*6k|krIh*+gvv3=D&dWtBR8A@PRSmjLIBlpkAaMk z8!jl`li>}))*tQ*qC5d)tF*Gct7Bk#wg={QE^@+4#r3`E-LbV;EdJ~6_*Z}d06g@S Ui5>znTL1t607*qoM6N<$g2}Nj-T(jq literal 0 HcmV?d00001 diff --git a/res/drawable/tab_artists.xml b/res/drawable/tab_artists.xml new file mode 100644 index 00000000..b4b68946 --- /dev/null +++ b/res/drawable/tab_artists.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/tab_artists_selected.png b/res/drawable/tab_artists_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..3b010d536ade7f97d2b906d855733fb406daf748 GIT binary patch literal 1127 zcmV-t1ep7YP)R~<&4ZG zWjQx@`8sEwFNUQ1zP0{DFFd^4`QG z_1edeEBVexF61O`(KNt(zT1u~4h{}lP21=Xm;soLhCHdSui$$e$VuEHKR`5J>yIBf zasbAM0DR~S#k7@yxDz8I7Be3`$VuG7444-cg{xN}IqDhJn)BdbiQ%(uz5&`K2MwtOPuU)b4c#I?R z1w_4RZ*RhJXHK6!igW$^{NjgACX+{wNGg@$yZ)-zfA}=`ZEyf(8`NqQqesyvmQx;TD{8SJAmh&n4sPW-@^cr&5aG^+_%?lZ4Ece z%JSi&oqO8Uq~Y!eW<3gp0?${8`2zfZ{YTNTQLC-SSPxL4Vu<-=YGMBiVm63$eDH+IJg#za(KpQo1TEbdftHavwRm=wV!i?=)WvA7Xu1 zciY1UHATBK_uQfy(dJs5PNqu5U2%$cW`q)D?I3;>+`EfqPir)mHI002ovPDHLkV1m}t7~TK? literal 0 HcmV?d00001 diff --git a/res/drawable/tab_artists_unselected.png b/res/drawable/tab_artists_unselected.png new file mode 100644 index 0000000000000000000000000000000000000000..0737253b0d0ea65c473b25c538a05ac1d8e11982 GIT binary patch literal 595 zcmV-Z0<8UsP)S}*>3a;^fC4ZoOo6^*r3A#m8Hj*@ z;sjoSruc4vzQq`$RsuF$MD7}Nf_BgYn!%2X{;R)xKzbNf>?~$H1iqzbUtk*OU`D}5 z*eU|5VV^S%F542wD=vrSCRDMk&2J(S_g+qciaE{jv)Tfxng{*`{0sPV0&-vyoRr~P zV|L8gmSYDei{JtrfDaI47Sk27T!O;W?AzpJ2}JUFV>{&VZU;Y~`KeQQSxXQyRY0FZ zv5A6i@D83NL1hbwO6_8~U6AX!WW8XI?M-Q!2E1%SF;FYpmmtM8J_4s;9!zoIJJ7~r zwI%tO^|A>?=+=1>ilsQuD8z|uV#AJ0vlkQS_aZ>p1ZS0|V{tO}!5A21L>|B)IG6f$ zfo;cIvEnJ%rNe}jA96PD_i>3@DwzqF>D2D(CI%Gu{9Epail<_+=8xcto3CgQihJRO zGgwY4)?Ek@M{C#=@_4CiXJNXP0L@oB)2sxn)KI{hl>kvVMjURvUMz}t h;@bT6{(Jr-zyPx~bu`99`S<_;002ovPDHLkV1n;o3lIPR literal 0 HcmV?d00001 diff --git a/res/drawable/tab_songs.xml b/res/drawable/tab_songs.xml new file mode 100644 index 00000000..63e38a4a --- /dev/null +++ b/res/drawable/tab_songs.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/tab_songs_selected.png b/res/drawable/tab_songs_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..fa3ad8400be15b8338e79c0104888ba88ccbbf06 GIT binary patch literal 1510 zcmV;Vb;{$=f z8jnW^M}Xy_aNM0-yXXFAE(Y#JeKR}%yYK() zihj@1d42p0kD8tuB#w?^DvJAIXxm#Q&g6&*jG4t!4m@sS_sX&_-^Lqmxn-V(7m6V5u5Zq}1P9(RX^ z?ii~azVa^~kGBr^+Ye5RVKG|N41uZtA9}s6<2js0($HZk8>OpD}J{R(EG- zEAWVrul3TU3TD5yrY0ZuBF4wYhV}8IF62esOPCVBq$m z4QM)l{uI3PAqDO~Ha8dJJ_;B5`36%3z|^i{49 z2X8Ym5g+?T9A$$W0gwx%;mU-#*i|}vo&Z!)(^FGZ`V7!p3+x^2Z3(Wq8zUn(Qz7a< zU0XMZwV=APG6`a#tF)--EoUd^fbULAI{Tz|YWJn4VyV`&wO<|S?dfSV8;C&IEqJ#E zOK02V%M$8@#^8V0n$@CbnGz0hQAcHXl+MTis?i%F=oKVpd%(lfOSCs71)-H&Cy|_i z!lUN#`Hlcc@%;mXtgCHp^;il0gu*Z^ueW=9uV@<#J3A*IFK@;g<|Y=r1r zH*eI=Cj(`p4&BjAcPeJutNDggoM@+M7{$R-8{rU09O{agIggoqt!SUCGoUiV=@bp9 z+ToNvXFO*{>$&5#hJ-T;W_9?Ok(^EY8l6$yVxIAw8PT=l`9A^-0Lp})@=&!bTL1t6 M07*qoM6N<$g8psCV*mgE literal 0 HcmV?d00001 diff --git a/res/drawable/tab_songs_unselected.png b/res/drawable/tab_songs_unselected.png new file mode 100644 index 0000000000000000000000000000000000000000..48144f10be99dbfe4f78ceb03e7732ce67866872 GIT binary patch literal 793 zcmV+!1LpjRP)iZbPK8VPsA?1eS@fyV_k^id1cvz(TUBGS9G8xJ1Pe;@ zn^<(lxY;@2OUS%WKp(Iim%ty@&hX5I&{b-Hwxp2-k~KFi8RJDjFL;g5qN;W`fWNHo z5|mrOM->CxQC^55aKTc+lIr&Jnt>>1zQ$6V<)tG~cZa$OWLR9P3b@ZVy~87z=8+6? z%(6<+R<_e|bzqKfDTSw>ZhZmVW(hvS|5J*<1BzFMDj7=$I(V7vr{J{n%!lZm65TBX z7D;HGZ~iu_Hn>W$6q+B@gqOe@qH2!}*?tDxwcMIx-3MBjh7 - + android:layout_weight="1"> + + + + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 86583313..c712f8fe 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11,6 +11,10 @@ (Paused) Click to start the music service. + Artists + Albums + Songs + Audio Output Notifications Song Selector diff --git a/src/org/kreed/vanilla/SongSelector.java b/src/org/kreed/vanilla/SongSelector.java index 0493c8ef..1aae49cb 100644 --- a/src/org/kreed/vanilla/SongSelector.java +++ b/src/org/kreed/vanilla/SongSelector.java @@ -20,9 +20,10 @@ package org.kreed.vanilla; import org.kreed.vanilla.R; -import android.app.Activity; +import android.app.TabActivity; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.Editable; @@ -30,11 +31,14 @@ import android.text.InputType; import android.text.TextWatcher; import android.view.KeyEvent; import android.view.View; +import android.view.Window; import android.widget.AdapterView; import android.widget.ListView; +import android.widget.TabHost; import android.widget.TextView; -public class SongSelector extends Activity implements AdapterView.OnItemClickListener, TextWatcher, View.OnClickListener { +public class SongSelector extends TabActivity implements AdapterView.OnItemClickListener, TextWatcher, View.OnClickListener { + private TabHost mTabHost; private SongAdapter mAdapter; private ListView mListView; private TextView mTextView; @@ -44,8 +48,17 @@ public class SongSelector extends Activity implements AdapterView.OnItemClickLis { super.onCreate(icicle); + requestWindowFeature(Window.FEATURE_NO_TITLE); + setContentView(R.layout.song_selector); + mTabHost = getTabHost(); + + 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)); + mAdapter = new SongAdapter(this); mListView = (ListView)findViewById(R.id.song_list);