From ff5e91853f50349706943bf4f80431bd1d0cab37 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 13 Oct 2014 14:52:12 -0700
Subject: #386 Start of adding ability to toggle offline from Tasker

---
 res/layout/edit_play_action.xml | 19 +++++++++++++++++++
 res/values/arrays.xml           |  6 ++++++
 res/values/strings.xml          |  2 ++
 3 files changed, 27 insertions(+)

(limited to 'res')

diff --git a/res/layout/edit_play_action.xml b/res/layout/edit_play_action.xml
index 6eb3b651..1043e2e2 100644
--- a/res/layout/edit_play_action.xml
+++ b/res/layout/edit_play_action.xml
@@ -23,4 +23,23 @@
 			android:longClickable="true"
 			/>
 	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/edit_offline_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_server_offline"/>
+
+		<Spinner
+			android:id="@+id/edit_offline_spinner"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 3e85c982..19758562 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -235,4 +235,10 @@
 		<item>@string/settings.replay_gain_type.album</item>
 		<item>@string/settings.replay_gain_type.track</item>
 	</string-array>
+	
+	<string-array name="editServerOptions">
+		<item>@string/tasker.edit_do_nothing</item>
+		<item>@string/main.online</item>
+		<item>@string/main.offline</item>
+	</string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0fdb2361..15dc020d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -559,6 +559,8 @@
 	<string name="tasker.start_playing_shuffled">Start playing in Shuffle Mode</string>
 	<string name="tasker.start_playing_title">Tasker -> Start DSub</string>
 	<string name="tasker.edit_shuffle_mode">Start in shuffle mode: </string>
+	<string name="tasker.edit_server_offline">Toggle offline: </string>
+	<string name="tasker.edit_do_nothing">Do Nothing</string>
 
     <plurals name="select_album_n_songs">
         <item quantity="zero">No songs</item>
-- 
cgit v1.2.3


From 30847da1fd577f08bd02803b788c908df6f8c791 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 16 Oct 2014 19:10:04 -0700
Subject: #386 Add shuffle genre to Tasker options

---
 res/layout/edit_play_action.xml                    | 20 ++++++-
 res/values/strings.xml                             |  1 +
 .../dsub/activity/EditPlayActionActivity.java      | 70 ++++++++++++++++++++++
 3 files changed, 89 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/layout/edit_play_action.xml b/res/layout/edit_play_action.xml
index 1043e2e2..ef5408ee 100644
--- a/res/layout/edit_play_action.xml
+++ b/res/layout/edit_play_action.xml
@@ -10,7 +10,6 @@
 		android:layout_height="wrap_content">
 
 		<TextView
-			android:id="@+id/edit_shuffle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
@@ -30,7 +29,24 @@
 		android:layout_height="wrap_content">
 
 		<TextView
-			android:id="@+id/edit_offline_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_shuffle_genre"/>
+
+		<Button
+			android:id="@+id/edit_genre_spinner"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 15dc020d..8d7cc873 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -559,6 +559,7 @@
 	<string name="tasker.start_playing_shuffled">Start playing in Shuffle Mode</string>
 	<string name="tasker.start_playing_title">Tasker -> Start DSub</string>
 	<string name="tasker.edit_shuffle_mode">Start in shuffle mode: </string>
+	<string name="tasker.edit_shuffle_genre">Shuffle from genre:</string>
 	<string name="tasker.edit_server_offline">Toggle offline: </string>
 	<string name="tasker.edit_do_nothing">Do Nothing</string>
 
diff --git a/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java b/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java
index c59b679f..ef960822 100644
--- a/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java
+++ b/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java
@@ -16,21 +16,37 @@
 package github.daneren2005.dsub.activity;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.widget.DrawerLayout;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.Spinner;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Genre;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.service.OfflineException;
+import github.daneren2005.dsub.service.ServerTooOldException;
 import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.LoadingTask;
+import github.daneren2005.dsub.util.Util;
 
 public class EditPlayActionActivity extends SubsonicActivity {
 	private CheckBox shuffleCheckbox;
+	private Button genreButton;
 	private Spinner offlineSpinner;
 
 	@Override
@@ -38,12 +54,66 @@ public class EditPlayActionActivity extends SubsonicActivity {
 		super.onCreate(savedInstanceState);
 		setTitle(R.string.tasker_start_playing_title);
 		setContentView(R.layout.edit_play_action);
+		final Activity context = this;
 
 		shuffleCheckbox = (CheckBox) findViewById(R.id.edit_shuffle_checkbox);
 		if(getIntent().getBundleExtra(Constants.TASKER_EXTRA_BUNDLE) != null && getIntent().getBundleExtra(Constants.TASKER_EXTRA_BUNDLE).getBoolean(Constants.INTENT_EXTRA_NAME_SHUFFLE)) {
 			shuffleCheckbox.setChecked(true);
 		}
 
+		genreButton = (Button) findViewById(R.id.edit_genre_spinner);
+		genreButton.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View v) {
+				new LoadingTask<List<Genre>>(context, true) {
+					@Override
+					protected List<Genre> doInBackground() throws Throwable {
+						MusicService musicService = MusicServiceFactory.getMusicService(context);
+						return musicService.getGenres(false, context, this);
+					}
+
+					@Override
+					protected void done(final List<Genre> genres) {
+						List<String> names = new ArrayList<String>();
+						String blank = context.getResources().getString(R.string.select_genre_blank);
+						String doNothing = context.getResources().getString(R.string.tasker_edit_do_nothing);
+						names.add(doNothing);
+						names.add(blank);
+						for(Genre genre: genres) {
+							names.add(genre.getName());
+						}
+						final List<String> finalNames = names;
+
+						AlertDialog.Builder builder = new AlertDialog.Builder(context);
+						builder.setTitle(R.string.shuffle_pick_genre)
+								.setItems(names.toArray(new CharSequence[names.size()]), new DialogInterface.OnClickListener() {
+									public void onClick(DialogInterface dialog, int which) {
+										if(which == 1) {
+											genreButton.setText("");
+										} else {
+											genreButton.setText(finalNames.get(which));
+										}
+									}
+								});
+						AlertDialog dialog = builder.create();
+						dialog.show();
+					}
+
+					@Override
+					protected void error(Throwable error) {
+						String msg;
+						if (error instanceof OfflineException || error instanceof ServerTooOldException) {
+							msg = getErrorMessage(error);
+						} else {
+							msg = context.getResources().getString(R.string.playlist_error) + " " + getErrorMessage(error);
+						}
+
+						Util.toast(context, msg, false);
+					}
+				}.execute();
+			}
+		});
+		genreButton.setText("Do Nothing");
+
 		offlineSpinner = (Spinner) findViewById(R.id.edit_offline_spinner);
 		ArrayAdapter<CharSequence> offlineAdapter = ArrayAdapter.createFromResource(this, R.array.editServerOptions, android.R.layout.simple_spinner_item);
 		offlineAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-- 
cgit v1.2.3


From d78618c064085a852a3ebba0064eeb22c83dfc97 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 16 Oct 2014 19:26:29 -0700
Subject:  #386 Add shuffle year to Tasker options

---
 res/layout/edit_play_action.xml                    | 57 +++++++++++++++++++++-
 res/values/strings.xml                             |  2 +
 .../dsub/activity/EditPlayActionActivity.java      | 10 ++++
 3 files changed, 68 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout/edit_play_action.xml b/res/layout/edit_play_action.xml
index ef5408ee..346f34c3 100644
--- a/res/layout/edit_play_action.xml
+++ b/res/layout/edit_play_action.xml
@@ -23,6 +23,60 @@
 			/>
 	</LinearLayout>
 
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_shuffle_start_year" />
+
+		<CheckBox
+			android:id="@+id/edit_start_year_checkbox"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:longClickable="true"/>
+
+		<EditText
+			android:id="@+id/edit_start_year"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="number"
+			android:hint="@string/shuffle.startYear"
+			android:enabled="false"/>
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_shuffle_end_year" />
+
+		<CheckBox
+			android:id="@+id/edit_end_year_checkbox"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:longClickable="true"/>
+
+		<EditText
+			android:id="@+id/edit_end_year"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="number"
+			android:hint="@string/shuffle.endYear"
+			android:enabled="false"/>
+	</LinearLayout>
+
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="fill_parent"
@@ -38,7 +92,8 @@
 		<Button
 			android:id="@+id/edit_genre_spinner"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+			android:layout_height="wrap_content"
+			style="?android:attr/spinnerStyle"/>
 	</LinearLayout>
 
 	<LinearLayout
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8d7cc873..33a40981 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -559,6 +559,8 @@
 	<string name="tasker.start_playing_shuffled">Start playing in Shuffle Mode</string>
 	<string name="tasker.start_playing_title">Tasker -> Start DSub</string>
 	<string name="tasker.edit_shuffle_mode">Start in shuffle mode: </string>
+	<string name="tasker.edit_shuffle_start_year">Shuffle start year:</string>
+	<string name="tasker.edit_shuffle_end_year">Shuffle end year:</string>
 	<string name="tasker.edit_shuffle_genre">Shuffle from genre:</string>
 	<string name="tasker.edit_server_offline">Toggle offline: </string>
 	<string name="tasker.edit_do_nothing">Do Nothing</string>
diff --git a/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java b/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java
index ef960822..2ec0b6e8 100644
--- a/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java
+++ b/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java
@@ -29,6 +29,7 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.EditText;
 import android.widget.Spinner;
 
 import java.util.ArrayList;
@@ -46,6 +47,10 @@ import github.daneren2005.dsub.util.Util;
 
 public class EditPlayActionActivity extends SubsonicActivity {
 	private CheckBox shuffleCheckbox;
+	private CheckBox startYearCheckbox;
+	private EditText startYearBox;
+	private CheckBox endYearCheckbox;
+	private EditText endYearBox;
 	private Button genreButton;
 	private Spinner offlineSpinner;
 
@@ -61,6 +66,11 @@ public class EditPlayActionActivity extends SubsonicActivity {
 			shuffleCheckbox.setChecked(true);
 		}
 
+		startYearCheckbox = (CheckBox) findViewById(R.id.edit_start_year_checkbox);
+		startYearBox = (EditText) findViewById(R.id.edit_start_year);
+		endYearCheckbox = (CheckBox) findViewById(R.id.edit_end_year_checkbox);
+		endYearBox = (EditText) findViewById(R.id.edit_end_year);
+
 		genreButton = (Button) findViewById(R.id.edit_genre_spinner);
 		genreButton.setOnClickListener(new View.OnClickListener() {
 			public void onClick(View v) {
-- 
cgit v1.2.3


From 07b90a9663d4becac54efef2463f87d22e8a57c3 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 17 Oct 2014 18:26:26 -0700
Subject: #386 Fix saving options

---
 res/layout/edit_play_action.xml                       |  9 ++++++---
 .../dsub/activity/EditPlayActionActivity.java         | 19 ++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'res')

diff --git a/res/layout/edit_play_action.xml b/res/layout/edit_play_action.xml
index 346f34c3..a1115da6 100644
--- a/res/layout/edit_play_action.xml
+++ b/res/layout/edit_play_action.xml
@@ -39,7 +39,8 @@
 			android:id="@+id/edit_start_year_checkbox"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:longClickable="true"/>
+			android:longClickable="true"
+			android:enabled="false"/>
 
 		<EditText
 			android:id="@+id/edit_start_year"
@@ -66,7 +67,8 @@
 			android:id="@+id/edit_end_year_checkbox"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:longClickable="true"/>
+			android:longClickable="true"
+			android:enabled="false"/>
 
 		<EditText
 			android:id="@+id/edit_end_year"
@@ -93,7 +95,8 @@
 			android:id="@+id/edit_genre_spinner"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			style="?android:attr/spinnerStyle"/>
+			style="?android:attr/spinnerStyle"
+			android:enabled="false"/>
 	</LinearLayout>
 
 	<LinearLayout
diff --git a/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java b/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java
index 609f1939..64439289 100644
--- a/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java
+++ b/src/github/daneren2005/dsub/activity/EditPlayActionActivity.java
@@ -29,6 +29,7 @@ import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.Spinner;
 
@@ -67,7 +68,7 @@ public class EditPlayActionActivity extends SubsonicActivity {
 		shuffleCheckbox = (CheckBox) findViewById(R.id.edit_shuffle_checkbox);
 		shuffleCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 			@Override
-			public void onCheckedChange(CompoundView view, boolean isChecked) {
+			public void onCheckedChanged(CompoundButton view, boolean isChecked) {
 				startYearCheckbox.setEnabled(isChecked);
 				endYearCheckbox.setEnabled(isChecked);
 				genreButton.setEnabled(isChecked);
@@ -79,7 +80,7 @@ public class EditPlayActionActivity extends SubsonicActivity {
 		// Disable/enable number box if checked
 		startYearCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 			@Override
-			public void onCheckedChange(CompoundView view, boolean isChecked) {
+			public void onCheckedChanged(CompoundButton view, boolean isChecked) {
 				startYearBox.setEnabled(isChecked);
 			}
 		});
@@ -88,7 +89,7 @@ public class EditPlayActionActivity extends SubsonicActivity {
 		endYearBox = (EditText) findViewById(R.id.edit_end_year);
 		endYearCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
 			@Override
-			public void onCheckedChange(CompoundView view, boolean isChecked) {
+			public void onCheckedChanged(CompoundButton view, boolean isChecked) {
 				endYearBox.setEnabled(isChecked);
 			}
 		});
@@ -169,13 +170,13 @@ public class EditPlayActionActivity extends SubsonicActivity {
 			}
 			
 			String genre = extras.getString(Constants.PREFERENCES_KEY_SHUFFLE_GENRE, doNothing);
-			if(genre != null)
+			if(genre != null) {
 				genreButton.setText(genre);
 			}
 			
-			short offline = extras.getShort(Constants.PREFERENCES_KEY_OFFLINE, 0);
+			short offline = extras.getShort(Constants.PREFERENCES_KEY_OFFLINE, (short) 0);
 			if(offline != 0) {
-				offline.setSelection((int) offline);
+				offlineSpinner.setSelection((int) offline);
 			}
 		}
 
@@ -217,12 +218,12 @@ public class EditPlayActionActivity extends SubsonicActivity {
 		data.putBoolean(Constants.INTENT_EXTRA_NAME_SHUFFLE, shuffle);
 		if(shuffle) {
 			if(startYearCheckbox.isChecked()) {
-				data.putString(Constants.PREFERENCES_KEY_SHUFFLE_START_YEAR, startYearBox.getText());
+				data.putString(Constants.PREFERENCES_KEY_SHUFFLE_START_YEAR, startYearBox.getText().toString());
 			}
 			if(endYearCheckbox.isChecked()) {
-				data.putString(Constants.PREFERENCES_KEY_SHUFFLE_END_YEAR, endYearBox.getText());
+				data.putString(Constants.PREFERENCES_KEY_SHUFFLE_END_YEAR, endYearBox.getText().toString());
 			}
-			String genre = genreButton.getText();
+			String genre = genreButton.getText().toString();
 			if(!genre.equals(doNothing)) {
 				data.putString(Constants.PREFERENCES_KEY_SHUFFLE_GENRE, genre);
 			}
-- 
cgit v1.2.3