aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2012-09-26 21:29:38 -0700
committerScott Jackson <daneren2005@gmail.com>2012-09-26 21:29:38 -0700
commitfbbbc3831fcfd7141ad7fa77f0fcbe3a8f089caa (patch)
tree0e77583bc2066e92bb1994e38fff853c010f23e9
parent2f46ed0305791d4ab38ba51087d5602ed10280b6 (diff)
downloaddsub-fbbbc3831fcfd7141ad7fa77f0fcbe3a8f089caa.tar.gz
dsub-fbbbc3831fcfd7141ad7fa77f0fcbe3a8f089caa.tar.bz2
dsub-fbbbc3831fcfd7141ad7fa77f0fcbe3a8f089caa.zip
Added download option on top of cache which doesn't 'pin' song
-rw-r--r--subsonic-android/res/menu/select_album.xml6
-rw-r--r--subsonic-android/res/values/strings.xml1
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java7
3 files changed, 14 insertions, 0 deletions
diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml
index 0d7fed68..204461b2 100644
--- a/subsonic-android/res/menu/select_album.xml
+++ b/subsonic-android/res/menu/select_album.xml
@@ -25,6 +25,12 @@
android:showAsAction="ifRoom|withText"/>
<item
+ android:id="@+id/menu_download"
+ android:icon="@drawable/action_save"
+ android:title="@string/common.download"
+ android:showAsAction="ifRoom|withText"/>
+
+ <item
android:id="@+id/menu_cache"
android:icon="@drawable/action_save"
android:title="@string/common.pin"
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index b183c95c..5ff31e79 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -9,6 +9,7 @@
<string name="common.play_shuffled">Play shuffled</string>
<string name="common.play_next">Play next</string>
<string name="common.play_last">Play last</string>
+ <string name="common.download">Download</string>
<string name="common.pin">Cache</string>
<string name="common.delete">Delete</string>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index d5312375..12653d3d 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -58,6 +58,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
private View emptyView;
private boolean hideButtons = false;
private com.actionbarsherlock.view.MenuItem selectAll;
+ private com.actionbarsherlock.view.MenuItem download;
private com.actionbarsherlock.view.MenuItem cache;
private com.actionbarsherlock.view.MenuItem delete;
private com.actionbarsherlock.view.MenuItem playLast;
@@ -120,6 +121,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater();
inflater.inflate(R.menu.select_album, menu);
selectAll = menu.findItem(R.id.menu_select);
+ download = menu.findItem(R.id.menu_download);
cache = menu.findItem(R.id.menu_cache);
delete = menu.findItem(R.id.menu_delete);
playLast = menu.findItem(R.id.menu_play_last);
@@ -153,6 +155,10 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
case R.id.menu_refresh:
refresh();
return true;
+ case R.id.menu_download:
+ downloadBackground(false);
+ selectAll(false, false);
+ return true;
case R.id.menu_cache:
downloadBackground(true);
selectAll(false, false);
@@ -534,6 +540,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
entryList.addFooterView(footer);
} else if(selectAll != null) {
selectAll.setVisible(false);
+ download.setVisible(false);
cache.setVisible(false);
delete.setVisible(false);
playLast.setVisible(false);