diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-11-11 14:23:46 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-11-11 14:23:46 -0800 |
| commit | 9f1f29344b1ce6b21285bc781446debf8c16cb23 (patch) | |
| tree | b2f24b91b2014748698190b49d441b0ff425059d /res | |
| parent | 5a1510d4431779a2f4c13159e21f29a8a11c4e6d (diff) | |
| download | dsub-9f1f29344b1ce6b21285bc781446debf8c16cb23.tar.gz dsub-9f1f29344b1ce6b21285bc781446debf8c16cb23.tar.bz2 dsub-9f1f29344b1ce6b21285bc781446debf8c16cb23.zip | |
Abstracted out action buttons into include
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/download.xml | 48 | ||||
| -rw-r--r-- | res/layout-port/download.xml | 60 | ||||
| -rw-r--r-- | res/layout/download_action_buttons.xml | 60 |
3 files changed, 67 insertions, 101 deletions
diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml index 5b4db35e..b896509e 100644 --- a/res/layout-land/download.xml +++ b/res/layout-land/download.xml @@ -40,55 +40,11 @@ android:layout_weight="1"
android:background="@android:color/transparent">
- <LinearLayout
- android:id="@+id/download_other_controls_layout"
- android:orientation="horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal">
-
- <Button
- android:id="@+id/download_jukebox"
- android:text="RC"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="3dip"
- android:padding="9dip"/>
- <Button
- android:id="@+id/download_equalizer"
- android:text="EQ"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="3dip"
- android:padding="9dip"/>
- <Button
- android:id="@+id/download_visualizer"
- android:text="VIS"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="3dip"
- android:padding="9dip"/>
- <ImageButton
- android:id="@+id/download_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:background="@drawable/menubar_button"
- android:src="@android:drawable/star_big_off"
- android:padding="10dip"/>
- </LinearLayout>
+ <include layout="@layout/download_action_buttons"/>
<LinearLayout
android:id="@+id/download_visualizer_view_layout"
+ android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="60dip"
android:layout_marginLeft="12dip"
diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml index 4b39286a..9fb5d7bf 100644 --- a/res/layout-port/download.xml +++ b/res/layout-port/download.xml @@ -25,13 +25,13 @@ android:background="@android:color/transparent">
<RelativeLayout android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_weight="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_above="@+id/download_song_title">
<ImageView
android:id="@+id/download_album_art_image"
+ android:src="@drawable/unknown_album_large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
@@ -46,62 +46,12 @@ android:background="@color/overlayColor"
android:layout_alignParentBottom="true">
- <Button
- android:id="@+id/download_jukebox"
- android:text="RC"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:paddingTop="4dip"
- android:paddingLeft="14dip"
- android:paddingBottom="4dip"/>
-
- <Button
- android:id="@+id/download_equalizer"
- android:text="EQ"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:paddingTop="4dip"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
- android:paddingBottom="4dip"/>
-
- <Button
- android:id="@+id/download_visualizer"
- android:text="VIS"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@drawable/menubar_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:paddingTop="4dip"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
- android:paddingBottom="4dip"/>
-
- <ImageButton
- android:id="@+id/download_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/download_jukebox"
- android:background="@drawable/menubar_button"
- android:src="@android:drawable/star_big_off"
- android:paddingTop="8dip"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- android:paddingBottom="8dip"/>
+ <include layout="@layout/download_action_buttons"/>
</LinearLayout>
<LinearLayout
android:id="@+id/download_visualizer_view_layout"
+ android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="60dip"
android:layout_marginLeft="16dip"
diff --git a/res/layout/download_action_buttons.xml b/res/layout/download_action_buttons.xml new file mode 100644 index 00000000..70e8cc43 --- /dev/null +++ b/res/layout/download_action_buttons.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/download_other_controls_layout"
+ android:orientation="horizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal">
+
+ <Button
+ android:id="@+id/download_jukebox"
+ android:text="RC"
+ android:textStyle="bold"
+ android:textSize="22sp"
+ android:background="@drawable/menubar_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:paddingTop="4dip"
+ android:paddingLeft="14dip"
+ android:paddingBottom="4dip"/>
+
+ <Button
+ android:id="@+id/download_equalizer"
+ android:text="EQ"
+ android:textStyle="bold"
+ android:textSize="22sp"
+ android:background="@drawable/menubar_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:paddingTop="4dip"
+ android:paddingLeft="7dip"
+ android:paddingRight="7dip"
+ android:paddingBottom="4dip"/>
+
+ <Button
+ android:id="@+id/download_visualizer"
+ android:text="VIS"
+ android:textStyle="bold"
+ android:textSize="22sp"
+ android:background="@drawable/menubar_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:paddingTop="4dip"
+ android:paddingLeft="7dip"
+ android:paddingRight="7dip"
+ android:paddingBottom="4dip"/>
+
+ <ImageButton
+ android:id="@+id/download_star"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/menubar_button"
+ android:src="@android:drawable/star_big_off"
+ android:paddingTop="8dip"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:paddingBottom="8dip"/>
+</LinearLayout>
\ No newline at end of file |