aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android
diff options
context:
space:
mode:
Diffstat (limited to 'subsonic-android')
-rw-r--r--subsonic-android/res/menu/main.xml4
-rw-r--r--subsonic-android/res/menu/select_album.xml4
-rw-r--r--subsonic-android/res/menu/select_artist.xml4
-rw-r--r--subsonic-android/res/menu/select_playlist.xml2
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java36
5 files changed, 27 insertions, 23 deletions
diff --git a/subsonic-android/res/menu/main.xml b/subsonic-android/res/menu/main.xml
index a7642942..8edf5304 100644
--- a/subsonic-android/res/menu/main.xml
+++ b/subsonic-android/res/menu/main.xml
@@ -4,13 +4,13 @@
android:id="@+id/menu_search"
android:icon="@drawable/action_search"
android:title="@string/menu.search"
- android:showAsAction="ifRoom|withText"/>
+ android:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
android:icon="@drawable/action_shuffle"
android:title="@string/menu.shuffle"
- android:showAsAction="ifRoom|withText"/>
+ android:showAsAction="always|withText"/>
<item
android:id="@+id/menu_help"
diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml
index 87fbab3e..b725469a 100644
--- a/subsonic-android/res/menu/select_album.xml
+++ b/subsonic-android/res/menu/select_album.xml
@@ -4,13 +4,13 @@
android:id="@+id/menu_play_now"
android:icon="@drawable/action_play_all"
android:title="@string/menu.play"
- android:showAsAction="ifRoom|withText"/>
+ android:showAsAction="always|withText"/>
<item
android:id="@+id/menu_refresh"
android:icon="@drawable/action_refresh"
android:title="@string/menu.refresh"
- android:showAsAction="ifRoom|withText"/>
+ android:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml
index 84c0e370..06be773a 100644
--- a/subsonic-android/res/menu/select_artist.xml
+++ b/subsonic-android/res/menu/select_artist.xml
@@ -4,13 +4,13 @@
android:id="@+id/menu_refresh"
android:icon="@drawable/action_refresh"
android:title="@string/menu.refresh"
- android:showAsAction="ifRoom|withText"/>
+ android:showAsAction="always|withText"/>
<item
android:id="@+id/menu_shuffle"
android:icon="@drawable/action_shuffle"
android:title="@string/menu.shuffle"
- android:showAsAction="ifRoom|withText"/>
+ android:showAsAction="always|withText"/>
<item
android:id="@+id/menu_help"
diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml
index 3e0f33b6..a2c05a2f 100644
--- a/subsonic-android/res/menu/select_playlist.xml
+++ b/subsonic-android/res/menu/select_playlist.xml
@@ -4,7 +4,7 @@
android:id="@+id/menu_refresh"
android:icon="@drawable/action_refresh"
android:title="@string/menu.refresh"
- android:showAsAction="ifRoom|withText"/>
+ android:showAsAction="always|withText"/>
<item
android:id="@+id/menu_help"
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index 3e0c496a..abbfe67b 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -56,6 +56,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
private ListView entryList;
private View footer;
private View emptyView;
+ private com.actionbarsherlock.view.MenuItem selectAll;
private Button playLastButton;
private Button pinButton;
private Button unpinButton;
@@ -155,6 +156,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
public boolean onCreateOptionsMenu(Menu menu) {
com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater();
inflater.inflate(R.menu.select_album, menu);
+ selectAll = menu.findItem(R.id.menu_select);
return true;
}
@@ -503,23 +505,23 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
builder.setMessage(R.string.select_album_donate_dialog_message);
builder.setPositiveButton(R.string.select_album_donate_dialog_now,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.DONATION_URL)));
- }
- });
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.DONATION_URL)));
+ }
+ });
builder.setNegativeButton(R.string.select_album_donate_dialog_later,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialogInterface, int i) {
- dialogInterface.dismiss();
- if (onValid != null) {
- onValid.run();
- }
- }
- });
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ dialogInterface.dismiss();
+ if (onValid != null) {
+ onValid.run();
+ }
+ }
+ });
builder.create().show();
}
@@ -558,7 +560,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
pinButton.setVisibility(View.VISIBLE);
unpinButton.setVisibility(View.VISIBLE);
deleteButton.setVisibility(View.VISIBLE);
- }
+ } else {
+ selectAll.setVisible(false);
+ }
emptyView.setVisibility(entries.isEmpty() ? View.VISIBLE : View.GONE);
entryList.setAdapter(new EntryAdapter(SelectAlbumActivity.this, getImageLoader(), entries, true));