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

Share layout content between library with/without control layouts.

Browse Source 
Also make search box not overlap.
This commit is contained in:
Christopher Eby 2011-09-22 13:08:06 -05:00
parent 827201a644
commit b842b7e46f
4 changed files with 73 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
res/layout/song_selector.xml → res/layout/library_content.xml
View File

@ -21,57 +21,51 @@ 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">
<LinearLayout
android:id="@+id/selector_layout"
<TabHost
android:id="@android:id/tabhost"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<TabHost
android:id="@android:id/tabhost"
android:layout_height="0px"
android:layout_weight="1">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="1">
<LinearLayout
android:orientation="vertical"
android:layout_height="fill_parent">
<TabWidget
android:id="@android:id/tabs"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TabWidget
android:id="@android:id/tabs"
<ListView
android:id="@+id/artist_list"
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: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>
<LinearLayout
android:id="@+id/limiter_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left" />
</LinearLayout>
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>
<LinearLayout
android:id="@+id/limiter_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left" />
<RelativeLayout
android:id="@+id/search_box"
android:layout_width="fill_parent"

31
res/layout/library_nocontrols.xml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2010 Christopher Eby <kreed@kreed.org>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
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">
<LinearLayout
android:id="@+id/selector_layout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<include layout="@layout/library_content" />
</LinearLayout>
</merge>

68
res/layout/song_selector_controls.xml → res/layout/library_withcontrols.xml
View File

@ -26,51 +26,7 @@ THE SOFTWARE.
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<TabHost
android:id="@android:id/tabhost"
android:layout_width="fill_parent"
android:layout_height="0px"
android:layout_weight="1">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TabWidget
android:id="@android:id/tabs"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<FrameLayout
android:id="@android:id/tabcontent"
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>
<LinearLayout
android:id="@+id/limiter_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left" />
<include layout="@layout/library_content" />
<RelativeLayout
android:id="@+id/controls"
android:layout_width="fill_parent"
@ -125,26 +81,4 @@ THE SOFTWARE.
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<RelativeLayout
android:id="@+id/search_box"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:paddingTop="4dip"
android:paddingLeft="4dip"
android:paddingRight="4dip"
android:visibility="gone"
android:background="@drawable/search_background">
<EditText
android:id="@+id/filter_text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textFilter" />
<org.kreed.vanilla.ControlButton
android:id="@+id/clear_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:src="@android:drawable/ic_menu_close_clear_cancel" />
</RelativeLayout>
</merge>

4
src/org/kreed/vanilla/LibraryActivity.java
View File

@ -112,7 +112,7 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
if (settings.getBoolean("controls_in_selector", false)) {
setContentView(R.layout.song_selector_controls);
setContentView(R.layout.library_withcontrols);
mControls = findViewById(R.id.controls);
@ -127,7 +127,7 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
mPlayPauseButton.setOnClickListener(this);
next.setOnClickListener(this);
} else {
setContentView(R.layout.song_selector);
setContentView(R.layout.library_nocontrols);
}
mTabHost = (TabHost)findViewById(android.R.id.tabhost);