diff options
author | Scott Jackson <daneren2005@gmail.com> | 2012-09-11 21:36:52 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2012-09-11 21:36:52 -0700 |
commit | 5eadac48eb97f7480e2629e46a6159cdcb21e1a2 (patch) | |
tree | 00a6d5084031cee25a3b6971f889fc5027382545 /subsonic-android/res | |
parent | 959c6551d2ca834c88813e775c1209565d95a3e1 (diff) | |
download | dsub-5eadac48eb97f7480e2629e46a6159cdcb21e1a2.tar.gz dsub-5eadac48eb97f7480e2629e46a6159cdcb21e1a2.tar.bz2 dsub-5eadac48eb97f7480e2629e46a6159cdcb21e1a2.zip |
Merged Play Now/Shuffle/Select All into action bar, updated help/settings/exist icons for all menus
Diffstat (limited to 'subsonic-android/res')
-rw-r--r-- | subsonic-android/res/drawable-hdpi-v4/action_select.png (renamed from subsonic-android/res/drawable-hdpi-v4/action_playlists.png) | bin | 1158 -> 1158 bytes | |||
-rw-r--r-- | subsonic-android/res/layout/select_album.xml | 45 | ||||
-rw-r--r-- | subsonic-android/res/menu/main.xml | 6 | ||||
-rw-r--r-- | subsonic-android/res/menu/select_album.xml | 18 | ||||
-rw-r--r-- | subsonic-android/res/menu/select_artist.xml | 2 | ||||
-rw-r--r-- | subsonic-android/res/menu/select_playlist.xml | 2 | ||||
-rw-r--r-- | subsonic-android/res/values/strings.xml | 1 |
7 files changed, 24 insertions, 50 deletions
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_playlists.png b/subsonic-android/res/drawable-hdpi-v4/action_select.png Binary files differindex e9e83e3d..e9e83e3d 100644 --- a/subsonic-android/res/drawable-hdpi-v4/action_playlists.png +++ b/subsonic-android/res/drawable-hdpi-v4/action_select.png diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml index d5a4d0d1..59860e28 100644 --- a/subsonic-android/res/layout/select_album.xml +++ b/subsonic-android/res/layout/select_album.xml @@ -62,47 +62,8 @@ android:layout_width="0dp"
android:layout_height="fill_parent"
android:visibility="gone"/>
-
- </LinearLayout>
-
- <LinearLayout android:orientation="horizontal"
- android:layout_marginTop="6dp"
- android:layout_marginBottom="3dp"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
- <Button android:id="@+id/select_album_select"
- android:text="@string/select_album.select"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"/>
-
- <Button android:id="@+id/select_album_play_now"
- android:text="@string/common.play_now"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"/>
-
- <Button android:id="@+id/select_album_play_shuffled"
- android:text="@string/common.play_shuffled"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"/>
-
- <Button android:id="@+id/select_album_play_last"
+ <Button android:id="@+id/select_album_play_last"
android:text="@string/common.play_last"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone"
@@ -111,8 +72,8 @@ android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="fill_parent"/>
-
- </LinearLayout>
+
+ </LinearLayout>
<include layout="@layout/button_bar"/>
diff --git a/subsonic-android/res/menu/main.xml b/subsonic-android/res/menu/main.xml index af6a5a7d..a7642942 100644 --- a/subsonic-android/res/menu/main.xml +++ b/subsonic-android/res/menu/main.xml @@ -14,17 +14,17 @@ <item android:id="@+id/menu_help" - android:icon="@drawable/ic_menu_help" + android:icon="@drawable/action_help" android:title="@string/menu.help"/> <item android:id="@+id/menu_settings" - android:icon="@drawable/ic_menu_settings" + android:icon="@drawable/action_settings" android:title="@string/menu.settings"/> <item android:id="@+id/menu_exit" - android:icon="@drawable/ic_menu_exit" + android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> </menu> diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml index a5f2a3a9..87fbab3e 100644 --- a/subsonic-android/res/menu/select_album.xml +++ b/subsonic-android/res/menu/select_album.xml @@ -1,16 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/menu_play_all" + android:id="@+id/menu_play_now" android:icon="@drawable/action_play_all" android:title="@string/menu.play" android:showAsAction="ifRoom|withText"/> - + <item android:id="@+id/menu_refresh" android:icon="@drawable/action_refresh" android:title="@string/menu.refresh" android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_shuffle" + android:icon="@drawable/action_shuffle" + android:title="@string/menu.shuffle" + android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_select" + android:icon="@drawable/action_select" + android:title="@string/menu.select" + android:showAsAction="ifRoom|withText"/> <item android:id="@+id/menu_help" @@ -24,7 +36,7 @@ <item android:id="@+id/menu_exit" - android:icon="@drawable/ic_menu_exit" + android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> </menu> diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml index 42916622..84c0e370 100644 --- a/subsonic-android/res/menu/select_artist.xml +++ b/subsonic-android/res/menu/select_artist.xml @@ -24,7 +24,7 @@ <item android:id="@+id/menu_exit" - android:icon="@drawable/ic_menu_exit" + android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> </menu> diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml index 46d863cd..3e0f33b6 100644 --- a/subsonic-android/res/menu/select_playlist.xml +++ b/subsonic-android/res/menu/select_playlist.xml @@ -18,7 +18,7 @@ <item android:id="@+id/menu_exit" - android:icon="@drawable/ic_menu_exit" + android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> </menu> diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml index ea926fd9..a3b6f604 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -36,6 +36,7 @@ <string name="menu.search">Search</string>
<string name="menu.shuffle">Shuffle</string>
<string name="menu.refresh">Refresh</string>
+ <string name="menu.select">Select All</string>
<string name="menu.play">Play</string>
<string name="menu.exit">Exit</string>
<string name="menu.settings">Settings</string>
|