diff options
Diffstat (limited to 'res/layout')
31 files changed, 343 insertions, 463 deletions
diff --git a/res/layout/abstract_activity.xml b/res/layout/abstract_activity.xml new file mode 100644 index 00000000..ed16c695 --- /dev/null +++ b/res/layout/abstract_activity.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/drawer_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <!-- The main content view -->
+ <FrameLayout
+ android:id="@+id/content_frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <!-- The navigation drawer -->
+ <ListView android:id="@+id/left_drawer"
+ android:layout_width="240dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="start"
+ android:choiceMode="singleChoice"
+ android:divider="@android:color/transparent"
+ android:dividerHeight="0dp"
+ android:background="?android:windowBackground"/>
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/res/layout/main.xml b/res/layout/abstract_fragment_activity.xml index f1509db6..605b988a 100644 --- a/res/layout/main.xml +++ b/res/layout/abstract_fragment_activity.xml @@ -1,81 +1,85 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center_horizontal" - android:orientation="vertical" > - - <android.support.v4.view.ViewPager - android:id="@+id/pager" - android:layout_width="fill_parent" - android:layout_height="0px" - android:layout_weight="1" > - </android.support.v4.view.ViewPager> - - <View - android:layout_width="fill_parent" - android:layout_height="1px" - android:background="@color/dividerColor"/> - - <LinearLayout - android:id="@+id/bottom_bar" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@drawable/media_button" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/album_art" - android:layout_width="50dip" - android:layout_height="50dip" - android:layout_gravity="left|center" - android:scaleType="fitStart" - android:src="@drawable/unknown_album"/> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:orientation="vertical" - android:paddingLeft="8dip"> - - <TextView - android:id="@+id/track_name" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textColor="?android:textColorPrimary" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textSize="13sp" - android:text="@string/search.artists"/> - - <TextView - android:id="@+id/artist_name" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:textColor="?android:textColorSecondary" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textSize="12sp" - android:text="@string/search.albums"/> - </LinearLayout> - - <ImageButton - style="@style/PlaybackControl.Small" - android:id="@+id/download_previous" - android:src="?attr/media_button_backward" - android:layout_centerVertical="true"/> - - <ImageButton - style="@style/PlaybackControl.Small" - android:id="@+id/download_start" - android:src="?attr/media_button_start" - android:layout_centerVertical="true"/> - - <ImageButton - style="@style/PlaybackControl.Small" - android:id="@+id/download_next" - android:src="?attr/media_button_forward" - android:layout_centerVertical="true"/> - </LinearLayout> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_horizontal"
+ android:orientation="vertical" >
+
+ <include layout="@layout/abstract_fragment_container" />
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1px"
+ android:background="@color/dividerColor"/>
+
+ <LinearLayout
+ android:id="@+id/bottom_bar"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/media_button"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/album_art"
+ android:layout_width="50dip"
+ android:layout_height="50dip"
+ android:layout_gravity="left|center"
+ android:scaleType="fitStart"
+ android:src="@drawable/unknown_album"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingLeft="8dip">
+
+ <TextView
+ android:id="@+id/track_name"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:textColor="?android:textColorPrimary"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="13sp"
+ android:text="@string/search.artists"/>
+
+ <TextView
+ android:id="@+id/artist_name"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:textColor="?android:textColorSecondary"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="12sp"
+ android:text="@string/search.albums"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1">
+
+ <ImageButton
+ style="@style/PlaybackControl.Small"
+ android:id="@+id/download_previous"
+ android:src="?attr/media_button_backward"
+ android:layout_width="0dp"
+ android:layout_weight="1"/>
+
+ <ImageButton
+ style="@style/PlaybackControl.Small"
+ android:id="@+id/download_start"
+ android:src="?attr/media_button_start"
+ android:layout_width="0dp"
+ android:layout_weight="1"/>
+
+ <ImageButton
+ style="@style/PlaybackControl.Small"
+ android:id="@+id/download_next"
+ android:src="?attr/media_button_forward"
+ android:layout_width="0dp"
+ android:layout_weight="1"/>
+ </LinearLayout>
+ </LinearLayout>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/abstract_fragment_container.xml b/res/layout/abstract_fragment_container.xml new file mode 100644 index 00000000..d4a8607f --- /dev/null +++ b/res/layout/abstract_fragment_container.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/fragment_container"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1"/>
\ No newline at end of file diff --git a/res/layout/select_podcasts.xml b/res/layout/abstract_list_fragment.xml index ea4fb07c..bfce4792 100644 --- a/res/layout/select_podcasts.xml +++ b/res/layout/abstract_list_fragment.xml @@ -1,29 +1,29 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/select_podcasts_layout" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <View - android:layout_width="fill_parent" - android:layout_height="1px" - android:background="@color/dividerColor"/> - - <include layout="@layout/tab_progress" /> - - <TextView - android:id="@+id/select_podcasts_empty" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="10dip" - android:text="@string/select_podcasts.empty" - android:visibility="gone" /> - - <ListView - android:id="@+id/select_podcasts_list" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1.0" - android:fastScrollEnabled="true"/> -</LinearLayout> +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/fragment_list_layout"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <View
+ android:layout_width="fill_parent"
+ android:layout_height="1px"
+ android:background="@color/dividerColor"/>
+
+ <include layout="@layout/tab_progress" />
+
+ <TextView
+ android:id="@+id/fragment_list_empty"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="10dip"
+ android:text="@string/common.empty"
+ android:visibility="gone" />
+
+ <ListView
+ android:id="@+id/fragment_list"
+ android:layout_width="fill_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1.0"
+ android:fastScrollEnabled="true"/>
+</LinearLayout>
diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml index ee710539..9051a72e 100644 --- a/res/layout/album_list_item.xml +++ b/res/layout/album_list_item.xml @@ -51,10 +51,10 @@ <ImageView
android:id="@+id/album_more"
- android:src="@drawable/list_item_more"
+ android:src="?attr/download_none"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
- android:paddingRight="6dip"
+ android:paddingRight="10dip"
android:background="@drawable/menubar_button"/>
</LinearLayout>
diff --git a/res/layout/appwidget4x1.xml b/res/layout/appwidget4x1.xml index 5e55aa37..68fecb9a 100644 --- a/res/layout/appwidget4x1.xml +++ b/res/layout/appwidget4x1.xml @@ -5,7 +5,8 @@ android:minWidth="250dp" android:minHeight="40dp" android:background="@drawable/appwidget_bg" - android:orientation="horizontal" > + android:orientation="horizontal" + android:id="@+id/widget_root"> <ImageView android:id="@+id/appwidget_coverart" diff --git a/res/layout/appwidget4x2.xml b/res/layout/appwidget4x2.xml index 575ae1c2..8409bbbf 100644 --- a/res/layout/appwidget4x2.xml +++ b/res/layout/appwidget4x2.xml @@ -5,7 +5,8 @@ android:minWidth="250dp" android:minHeight="110dp" android:background="@drawable/appwidget_bg" - android:orientation="horizontal" > + android:orientation="horizontal" + android:id="@+id/widget_root"> <ImageView android:id="@+id/appwidget_coverart" diff --git a/res/layout/appwidget4x3.xml b/res/layout/appwidget4x3.xml index b4f685bc..e72a266d 100644 --- a/res/layout/appwidget4x3.xml +++ b/res/layout/appwidget4x3.xml @@ -3,7 +3,8 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="@drawable/appwidget_bg" - android:orientation="vertical" > + android:orientation="vertical" + android:id="@+id/widget_root"> <ImageView android:id="@+id/appwidget_coverart" diff --git a/res/layout/appwidget4x4.xml b/res/layout/appwidget4x4.xml index 6e6c12ab..c885829b 100644 --- a/res/layout/appwidget4x4.xml +++ b/res/layout/appwidget4x4.xml @@ -3,7 +3,8 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" - android:background="@drawable/appwidget_bg" > + android:background="@drawable/appwidget_bg" + android:id="@+id/widget_root"> <ImageView android:id="@+id/appwidget_coverart" diff --git a/res/layout/artist_list_item.xml b/res/layout/basic_list_item.xml index edf1930e..2295a9ba 100644 --- a/res/layout/artist_list_item.xml +++ b/res/layout/basic_list_item.xml @@ -1,38 +1,38 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@android:color/transparent"> - - <TextView - android:id="@+id/artist_name" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="left|center_vertical" - android:paddingLeft="6dip" - android:paddingRight="6dip" - android:minHeight="50dip" - android:background="@android:color/transparent"/> - - <ImageButton - android:id="@+id/artist_star" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right|center_vertical" - android:src="@drawable/ic_stat_star" - android:background="@android:color/transparent" - android:focusable="false" - android:visibility="gone"/> - - <ImageView - android:id="@+id/artist_more" - android:src="@drawable/list_item_more" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_gravity="right|center_vertical" - android:paddingRight="6dip" - android:background="@drawable/menubar_button"/> +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="@android:color/transparent">
+
+ <TextView
+ android:id="@+id/item_name"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="left|center_vertical"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
+ android:minHeight="50dip"
+ android:background="@android:color/transparent"/>
+
+ <ImageButton
+ android:id="@+id/item_star"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|center_vertical"
+ android:src="@drawable/ic_stat_star"
+ android:background="@android:color/transparent"
+ android:focusable="false"
+ android:visibility="gone"/>
+
+ <ImageView
+ android:id="@+id/item_more"
+ android:src="?attr/download_none"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_gravity="right|center_vertical"
+ android:paddingRight="10dip"
+ android:background="@drawable/menubar_button"/>
</LinearLayout>
\ No newline at end of file diff --git a/res/layout/create_bookmark.xml b/res/layout/create_bookmark.xml new file mode 100644 index 00000000..f72b39d8 --- /dev/null +++ b/res/layout/create_bookmark.xml @@ -0,0 +1,26 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/comment_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="4dp" + android:textSize="20dp" + android:text="@string/common.comment" /> + <EditText + android:id="@+id/comment_text" + android:inputType="text" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginLeft="4dp" /> + </LinearLayout> +</LinearLayout> diff --git a/res/layout/download_action_buttons.xml b/res/layout/download_action_buttons.xml new file mode 100644 index 00000000..e3a45151 --- /dev/null +++ b/res/layout/download_action_buttons.xml @@ -0,0 +1,33 @@ +<?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"
+ style="@style/DownloadActionButton"/>
+
+ <Button
+ android:id="@+id/download_equalizer"
+ android:text="EQ"
+ style="@style/DownloadActionButton"/>
+
+ <Button
+ android:id="@+id/download_visualizer"
+ android:text="VIS"
+ style="@style/DownloadActionButton"/>
+
+ <ImageButton
+ android:id="@+id/download_star"
+ style="@style/DownloadActionImageButton"
+ android:src="@android:drawable/star_big_off"/>
+
+ <ImageButton
+ android:id="@+id/download_bookmark"
+ style="@style/DownloadActionImageButton"
+ android:src="?attr/bookmark"/>
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout/download_media_buttons.xml b/res/layout/download_media_buttons.xml index 1835a373..1ccf6c68 100644 --- a/res/layout/download_media_buttons.xml +++ b/res/layout/download_media_buttons.xml @@ -54,7 +54,7 @@ <ImageButton style="@style/PlaybackControl.Small" android:id="@+id/download_toggle_list" - android:src="@drawable/action_toggle_list" + android:src="?attr/toggle_list" android:layout_alignParentRight="true" android:layout_centerVertical="true" /> diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml new file mode 100644 index 00000000..a85d043e --- /dev/null +++ b/res/layout/drawer_list_item.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="8dip"
+ android:paddingBottom="9dip">
+
+ <ImageView
+ android:id="@+id/drawer_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left|center_vertical"
+ android:paddingTop="1dip"
+ android:paddingBottom="1dip"
+ android:paddingRight="8dip"
+ android:paddingLeft="10dip"/>
+
+ <TextView
+ android:id="@+id/drawer_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="26sp"
+ android:textStyle="bold"
+ android:singleLine="true"/>
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout/equalizer.xml b/res/layout/equalizer.xml index ee1a9560..6e3c7e5c 100644 --- a/res/layout/equalizer.xml +++ b/res/layout/equalizer.xml @@ -4,7 +4,6 @@ android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@drawable/album_art_background"
android:padding="16dip">
<CheckBox
@@ -12,7 +11,6 @@ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/equalizer.enabled"
- android:textColor="#c0c0c0"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<ScrollView
diff --git a/res/layout/equalizer_bar.xml b/res/layout/equalizer_bar.xml index c34d1108..3a104e9b 100644 --- a/res/layout/equalizer_bar.xml +++ b/res/layout/equalizer_bar.xml @@ -6,8 +6,6 @@ <TextView
android:id="@+id/equalizer.frequency"
- android:textSize="12sp"
- android:textColor="#c0c0c0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@@ -18,7 +16,6 @@ android:id="@+id/equalizer.level"
android:text="0 dB"
android:textSize="12sp"
- android:textColor="#c0c0c0"
android:gravity="right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/res/layout/help.xml b/res/layout/help.xml deleted file mode 100644 index f22dee37..00000000 --- a/res/layout/help.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <LinearLayout android:id="@+id/help_buttons" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_alignParentBottom="true" - android:padding="4dip" - android:gravity="center_horizontal" - android:background="#ffcccccc"> - - <Button android:id="@+id/help_back" - android:text="@string/help.back" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_marginRight="5dip" - android:paddingLeft="25dip" - android:paddingRight="25dip"/> - - <Button android:id="@+id/help_close" - android:text="@string/help.close" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_marginLeft="5dip" - android:paddingLeft="25dip" - android:paddingRight="25dip"/> - </LinearLayout> - - - <WebView - android:id="@+id/help_contents" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_above="@id/help_buttons" - android:layout_weight="1" - android:fadingEdge="vertical" - android:fadingEdgeLength="12dip"/> - - </RelativeLayout> diff --git a/res/layout/jukebox_volume.xml b/res/layout/jukebox_volume.xml index 4bccaec7..fd718326 100644 --- a/res/layout/jukebox_volume.xml +++ b/res/layout/jukebox_volume.xml @@ -32,7 +32,7 @@ android:paddingRight="12dip" android:layout_alignParentLeft="true" android:layout_below="@+id/jukebox_volume_title" - android:src="@drawable/volume"/> + android:src="?attr/volume"/> <SeekBar android:layout_height="wrap_content" diff --git a/res/layout/main_buttons.xml b/res/layout/main_buttons.xml index 1e60838d..7729315c 100644 --- a/res/layout/main_buttons.xml +++ b/res/layout/main_buttons.xml @@ -15,7 +15,7 @@ android:minHeight="?android:attr/listPreferredItemHeight">
<ImageView
- android:src="@drawable/main_select_server"
+ android:src="?attr/select_server"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@@ -71,7 +71,6 @@ <TextView
android:id="@+id/main_albums_newest"
android:text="@string/main.albums_newest"
- android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -83,7 +82,6 @@ <TextView
android:id="@+id/main_albums_recent"
android:text="@string/main.albums_recent"
- android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -95,7 +93,6 @@ <TextView
android:id="@+id/main_albums_frequent"
android:text="@string/main.albums_frequent"
- android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -107,7 +104,6 @@ <TextView
android:id="@+id/main_albums_highest"
android:text="@string/main.albums_highest"
- android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -119,7 +115,6 @@ <TextView
android:id="@+id/main_albums_starred"
android:text="@string/main.albums_starred"
- android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -131,7 +126,6 @@ <TextView
android:id="@+id/main_albums_genres"
android:text="@string/main.albums_genres"
- android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -143,7 +137,6 @@ <TextView
android:id="@+id/main_albums_random"
android:text="@string/main.albums_random"
- android:drawableRight="@drawable/list_item_more"
android:drawablePadding="6dip"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/notification.xml b/res/layout/notification.xml index 22e2cb63..55c7be2a 100644 --- a/res/layout/notification.xml +++ b/res/layout/notification.xml @@ -14,10 +14,12 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" android:orientation="vertical" - android:paddingLeft="11.0dip"> + android:paddingLeft="11.0dip" + android:layout_gravity="center_vertical"> <TextView android:id="@+id/notification_title" @@ -28,76 +30,54 @@ android:ellipsize="marquee" android:focusable="true" android:singleLine="true" /> - - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="horizontal" > - - <LinearLayout - android:layout_width="0.0dp" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1.0" - android:orientation="vertical"> - <TextView - android:id="@+id/notification_artist" - style="@android:style/TextAppearance.StatusBar.EventContent" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:ellipsize="end" - android:scrollHorizontally="true" - android:singleLine="true" /> + <TextView + android:id="@+id/notification_artist" + style="@android:style/TextAppearance.StatusBar.EventContent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:ellipsize="end" + android:scrollHorizontally="true" + android:singleLine="true" /> - <TextView - android:id="@+id/notification_album" - style="@android:style/TextAppearance.StatusBar.EventContent" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:ellipsize="end" - android:scrollHorizontally="true" - android:singleLine="true" /> - </LinearLayout> + <TextView + android:id="@+id/notification_album" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone"/> + </LinearLayout> - <ImageButton - android:id="@+id/control_previous" - android:src="@drawable/notification_prev" - android:background="@drawable/btn_bg" - android:layout_width="34dip" - android:layout_height="34dip" - android:layout_gravity="center|right" - android:layout_marginRight="10dip" - android:layout_marginTop="2dip" - android:layout_weight="0.0" - android:scaleType="fitXY"/> + <ImageButton + android:id="@+id/control_previous" + android:src="@drawable/notification_previous" + android:background="@drawable/btn_bg" + android:layout_width="46dip" + android:layout_height="fill_parent" + android:layout_gravity="center|right" + android:padding="8.0dip" + android:layout_weight="0.0" + android:scaleType="fitCenter"/> - <ImageButton - android:id="@+id/control_pause" - android:src="@drawable/notification_pause" - android:background="@drawable/btn_bg" - android:layout_width="34dip" - android:layout_height="34dip" - android:layout_gravity="center|right" - android:layout_marginRight="10dip" - android:layout_marginTop="2dip" - android:layout_weight="0.0" - android:scaleType="fitXY"/> + <ImageButton + android:id="@+id/control_pause" + android:src="@drawable/notification_pause" + android:background="@drawable/btn_bg" + android:layout_width="46dip" + android:layout_height="fill_parent" + android:layout_gravity="center|right" + android:padding="8.0dip" + android:layout_weight="0.0" + android:scaleType="fitCenter"/> - <ImageButton - android:id="@+id/control_next" - android:src="@drawable/notification_next" - android:background="@drawable/btn_bg" - android:layout_width="34dip" - android:layout_height="34dip" - android:layout_gravity="center|right" - android:layout_marginRight="10dip" - android:layout_marginTop="2dip" - android:layout_weight="0.0" - android:scaleType="fitXY"/> - </LinearLayout> - </LinearLayout> + <ImageButton + android:id="@+id/control_next" + android:src="@drawable/notification_next" + android:background="@drawable/btn_bg" + android:layout_width="46dip" + android:layout_height="fill_parent" + android:layout_gravity="center|right" + android:padding="8.0dip" + android:layout_weight="0.0" + android:scaleType="fitCenter"/> </LinearLayout> diff --git a/res/layout/notification_expanded.xml b/res/layout/notification_expanded.xml index 70e7269c..e2246506 100644 --- a/res/layout/notification_expanded.xml +++ b/res/layout/notification_expanded.xml @@ -70,7 +70,7 @@ android:layout_weight="0.0" android:background="@drawable/btn_bg" android:scaleType="fitXY" - android:src="@drawable/notification_prev" /> + android:src="@drawable/notification_previous" /> <ImageButton android:id="@+id/control_pause" diff --git a/res/layout/play_video.xml b/res/layout/play_video.xml deleted file mode 100644 index 6a9f3f74..00000000 --- a/res/layout/play_video.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <WebView - android:id="@+id/play_video_contents" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> - -</FrameLayout> diff --git a/res/layout/playlist_list_item.xml b/res/layout/playlist_list_item.xml deleted file mode 100644 index 1ec5753f..00000000 --- a/res/layout/playlist_list_item.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <TextView - android:id="@+id/playlist_name" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="left|center_vertical" - android:paddingLeft="6dip" - android:paddingRight="6dip" - android:minHeight="50dip"/> - - <ImageView - android:id="@+id/playlist_more" - android:src="@drawable/list_item_more" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_gravity="right|center_vertical" - android:paddingRight="6dip" - android:background="@drawable/menubar_button"/> -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/search.xml b/res/layout/search.xml deleted file mode 100644 index d1c5c84c..00000000 --- a/res/layout/search.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/search_layout"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
-
- <include layout="@layout/tab_progress"/>
-
- <ListView
- android:id="@+id/search_list"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"
- />
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/search_buttons.xml b/res/layout/search_buttons.xml index 10b72166..3e3acfac 100644 --- a/res/layout/search_buttons.xml +++ b/res/layout/search_buttons.xml @@ -5,17 +5,6 @@ android:layout_height="wrap_content">
<TextView
- android:id="@+id/search_search"
- android:text="@string/search.search"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:drawablePadding="0dp"
- android:drawableLeft="@drawable/search"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="center"
- android:padding="12dp"/>
-
- <TextView
android:id="@+id/search_artists"
android:text="@string/search.artists"
android:layout_width="fill_parent"
@@ -82,4 +71,3 @@ android:paddingBottom="8dp"/>
</LinearLayout>
-
diff --git a/res/layout/select_album_footer.xml b/res/layout/select_album_footer.xml deleted file mode 100644 index c1a30a1a..00000000 --- a/res/layout/select_album_footer.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:background="@android:color/transparent"
- android:paddingTop="6dp"
- android:paddingBottom="0dp"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
- <Button android:id="@+id/select_album_more"
- android:text="@string/select_album.more"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="6dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"/>
-
-</LinearLayout>
-
diff --git a/res/layout/select_artist.xml b/res/layout/select_artist.xml deleted file mode 100644 index fef51d3c..00000000 --- a/res/layout/select_artist.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/select_artist_layout"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
-
- <include layout="@layout/tab_progress"/>
-
- <ListView android:id="@+id/select_artist_list"
- android:textFilterEnabled="true"
- android:fastScrollEnabled="true"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"/>
-</LinearLayout>
-
diff --git a/res/layout/select_artist_header.xml b/res/layout/select_artist_header.xml index 0b3d151b..ba1b3d47 100644 --- a/res/layout/select_artist_header.xml +++ b/res/layout/select_artist_header.xml @@ -14,7 +14,7 @@ android:minHeight="?android:attr/listPreferredItemHeight">
<ImageView
- android:src="@drawable/main_select_server"
+ android:src="?attr/select_server"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
diff --git a/res/layout/select_genres.xml b/res/layout/select_genres.xml deleted file mode 100644 index 95f9d415..00000000 --- a/res/layout/select_genres.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/select_genre_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <include layout="@layout/tab_progress" /> - - <TextView - android:id="@+id/select_genre_empty" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="10dip" - android:text="@string/select_genre.empty" - android:visibility="gone" /> - - <ListView - android:id="@+id/select_genre_list" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1.0" - android:textFilterEnabled="true" - android:fastScrollEnabled="true"/> - </LinearLayout> -</FrameLayout>
\ No newline at end of file diff --git a/res/layout/select_playlist.xml b/res/layout/select_playlist.xml deleted file mode 100644 index e18283bd..00000000 --- a/res/layout/select_playlist.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/select_playlist_layout"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
-
- <View
- android:layout_width="fill_parent"
- android:layout_height="1px"
- android:background="@color/dividerColor"/>
-
- <include layout="@layout/tab_progress"/>
-
- <TextView
- android:id="@+id/select_playlist_empty"
- android:text="@string/select_playlist.empty"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:padding="10dip"
- android:visibility="gone"/>
-
- <ListView android:id="@+id/select_playlist_list"
- android:layout_width="fill_parent"
- android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"/>
-
-</LinearLayout>
-
diff --git a/res/layout/song_list_item.xml b/res/layout/song_list_item.xml index 90060894..3bf7ab44 100644 --- a/res/layout/song_list_item.xml +++ b/res/layout/song_list_item.xml @@ -48,12 +48,20 @@ android:visibility="gone"/>
<TextView
- android:id="@+id/song_status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center_vertical"
- android:drawablePadding="1dip"
- android:paddingRight="6dip"/>
+ android:id="@+id/song_status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|center_vertical"
+ android:drawablePadding="1dip"
+ android:paddingRight="2dip"/>
+
+ <ImageView
+ android:id="@+id/song_status_icon"
+ android:layout_width="24dip"
+ android:layout_height="24dip"
+ android:layout_gravity="center_vertical"
+ android:src="?attr/downloading"
+ android:visibility="gone"/>
</LinearLayout>
<LinearLayout android:orientation="horizontal"
@@ -87,10 +95,10 @@ <ImageView
android:id="@+id/artist_more"
- android:src="@drawable/list_item_more"
+ android:src="?attr/download_none"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="right|center_vertical"
- android:paddingRight="6dip"
+ android:paddingRight="10dip"
android:background="@drawable/menubar_button"/>
</LinearLayout>
|