aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2012-11-10 10:21:58 -0800
committerScott Jackson <daneren2005@gmail.com>2012-11-10 10:21:58 -0800
commitf068c1c71f4115bb4c73b6ad9bb807666270ff97 (patch)
treea23eea236c6d16b3192fb49f6313992f097a6a77 /subsonic-android/res
parentc629960b135718cfbf62711910493013eb3143c0 (diff)
downloaddsub-f068c1c71f4115bb4c73b6ad9bb807666270ff97.tar.gz
dsub-f068c1c71f4115bb4c73b6ad9bb807666270ff97.tar.bz2
dsub-f068c1c71f4115bb4c73b6ad9bb807666270ff97.zip
Rework of now playing tab to have larger image like Subsonic
Diffstat (limited to 'subsonic-android/res')
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/media_repeat_all.pngbin1428 -> 5090 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/media_repeat_off.pngbin1552 -> 1079 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/media_repeat_single.pngbin1889 -> 5564 bytes
-rw-r--r--subsonic-android/res/layout-land/download.xml13
-rw-r--r--subsonic-android/res/layout-port/download.xml145
-rw-r--r--subsonic-android/res/layout/download_media_buttons.xml4
-rw-r--r--subsonic-android/res/values/colors.xml2
7 files changed, 79 insertions, 85 deletions
diff --git a/subsonic-android/res/drawable-hdpi-v4/media_repeat_all.png b/subsonic-android/res/drawable-hdpi-v4/media_repeat_all.png
index f8012f9f..c2255058 100644
--- a/subsonic-android/res/drawable-hdpi-v4/media_repeat_all.png
+++ b/subsonic-android/res/drawable-hdpi-v4/media_repeat_all.png
Binary files differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/media_repeat_off.png b/subsonic-android/res/drawable-hdpi-v4/media_repeat_off.png
index caf2cdfb..10315ab3 100644
--- a/subsonic-android/res/drawable-hdpi-v4/media_repeat_off.png
+++ b/subsonic-android/res/drawable-hdpi-v4/media_repeat_off.png
Binary files differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/media_repeat_single.png b/subsonic-android/res/drawable-hdpi-v4/media_repeat_single.png
index 99d534cb..6d280e7a 100644
--- a/subsonic-android/res/drawable-hdpi-v4/media_repeat_single.png
+++ b/subsonic-android/res/drawable-hdpi-v4/media_repeat_single.png
Binary files differ
diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml
index 8be7b430..6a9ccc5f 100644
--- a/subsonic-android/res/layout-land/download.xml
+++ b/subsonic-android/res/layout-land/download.xml
@@ -21,7 +21,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:scaleType="centerCrop"/>
+ android:scaleType="fitXY"/>
<include layout="@layout/download_playlist"/>
@@ -42,13 +42,6 @@
android:layout_gravity="center_horizontal">
<ImageButton
- android:id="@+id/download_repeat"
- android:src="@drawable/media_repeat_off"
- android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="9dip"/>
- <ImageButton
android:id="@+id/download_star"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -125,13 +118,13 @@
android:textColor="?android:textColorPrimary" />
<include layout="@layout/download_media_buttons"/>
+
+ <include layout="@layout/download_slider"/>
</LinearLayout>
</LinearLayout>
- <include layout="@layout/download_slider"/>
-
<include layout="@layout/button_bar"/>
</LinearLayout>
diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml
index e3d315c1..697067fa 100644
--- a/subsonic-android/res/layout-port/download.xml
+++ b/subsonic-android/res/layout-port/download.xml
@@ -18,78 +18,79 @@
android:layout_weight="1"
android:background="@android:color/transparent">
- <ImageButton
- android:id="@+id/download_repeat"
- android:src="@drawable/media_repeat_off"
- android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top|right"
- android:paddingTop="24dip"
- android:paddingLeft="8dip"
- android:paddingBottom="12dip"/>
-
- <Button
- android:id="@+id/download_jukebox"
- android:text="RC"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top|right"
- android:layout_below="@+id/download_repeat"
- android:paddingTop="12dip"
- android:paddingLeft="14dip"
- android:paddingBottom="15dip"/>
-
- <Button
- android:id="@+id/download_equalizer"
- android:text="EQ"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top|right"
- android:layout_alignParentRight="true"
- android:paddingTop="24dip"
- android:paddingRight="16dip"
- android:paddingBottom="12dip"/>
-
- <Button
- android:id="@+id/download_visualizer"
- android:text="VIS"
- android:textStyle="bold"
- android:textSize="22sp"
- android:background="@android:color/transparent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top|right"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/download_equalizer"
- android:layout_alignBottom="@+id/download_jukebox"
- android:paddingTop="12dip"
- android:paddingRight="12dip"
- android:paddingBottom="12dip"/>
-
- <ImageButton
- android:id="@+id/download_star"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignRight="@+id/download_repeat"
- android:layout_below="@+id/download_jukebox"
- android:background="@null"
- android:src="@android:drawable/star_big_off"/>
-
- <ImageView
- android:id="@+id/download_album_art_image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_alignParentTop="true"
- android:layout_marginTop="24dip"
- android:scaleType="fitCenter"/>
+ <RelativeLayout android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_weight="1"
+ android:layout_above="@+id/download_visualizer_view_layout">
+
+ <ImageView
+ android:id="@+id/download_album_art_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentTop="true"
+ android:scaleType="centerCrop"/>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/download_overlay_buttons"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ 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="@android:color/transparent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:paddingTop="12dip"
+ android:paddingLeft="14dip"
+ android:paddingBottom="12dip"/>
+
+ <Button
+ android:id="@+id/download_equalizer"
+ android:text="EQ"
+ android:textStyle="bold"
+ android:textSize="22sp"
+ android:background="@android:color/transparent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:paddingTop="12dip"
+ android:paddingLeft="14dip"
+ android:paddingBottom="12dip"/>
+
+ <Button
+ android:id="@+id/download_visualizer"
+ android:text="VIS"
+ android:textStyle="bold"
+ android:textSize="22sp"
+ android:background="@android:color/transparent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:paddingTop="12dip"
+ android:paddingLeft="14dip"
+ android:paddingBottom="12dip"/>
+
+ <ImageButton
+ android:id="@+id/download_star"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/download_jukebox"
+ android:background="@android:color/transparent"
+ android:src="@android:drawable/star_big_off"
+ android:paddingTop="12dip"
+ android:paddingLeft="14dip"
+ android:paddingBottom="12dip"/>
+ </LinearLayout>
+ </RelativeLayout>
<TextView
android:id="@+id/download_status"
diff --git a/subsonic-android/res/layout/download_media_buttons.xml b/subsonic-android/res/layout/download_media_buttons.xml
index f0ceabcf..bc2b5c35 100644
--- a/subsonic-android/res/layout/download_media_buttons.xml
+++ b/subsonic-android/res/layout/download_media_buttons.xml
@@ -8,8 +8,8 @@
<ImageButton
style="@style/PlaybackControl.Small"
- android:id="@+id/download_shuffle"
- android:src="@drawable/action_shuffle"
+ android:id="@+id/download_repeat"
+ android:src="@drawable/media_repeat_off"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
/>
diff --git a/subsonic-android/res/values/colors.xml b/subsonic-android/res/values/colors.xml
index 625810ff..d17486a1 100644
--- a/subsonic-android/res/values/colors.xml
+++ b/subsonic-android/res/values/colors.xml
@@ -8,7 +8,7 @@
<color name="notificationArtist">#434343</color>
<color name="notificationTitle">#000000</color>
<color name="background_holo_light">#ff33b5e5</color>
-
+ <color name="overlayColor">#80000000</color>
<color name="ics_opaque">#8033b5e5</color>
<color name="cyan">#ff0099cc</color>
</resources> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 10:18:15 +0000