Added option to choose feedback style (voice/toast).

Author: Chris Bellew

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.atomjack.googlesearchplexcontrol"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="2"
+    android:versionName="1.1" >
 
     <uses-permission android:name="com.mohammadag.googlesearchapi.permission.ACCESS_GGOGLE_SEARCH_API" />
     <uses-permission android:name="android.permission.INTERNET" />

res/values/strings.xml

@@ -18,5 +18,7 @@
     <string name="menu_about">About</string>
     <string name="about_text">Voice Control for Plex  Home Theater\n© 2013 Chris Bellew\nLicensed under GPLv3\n\nPlex Home Theater is copyright Plex, Inc.</string>
     <string name="menu_donate">Donate</string>
+    <string name="feedback_voice">Voice</string>
+    <string name="feedback_toast">Toast</string>
 
 </resources>

src/com/atomjack/vcfpht/GoogleSearchReceiver.java

@@ -211,8 +211,7 @@ private void playSpecificEpisode() {
 		if(videos.size() == 1) {
 			playVideo(videos.get(0));
 		} else {
-			doToast("Sorry, I found more than one match. Try to be more specific?");
-			GoogleSearchApi.speak(context, "Sorry, I found more than one match. Try to be more specific?");
+			feedback("Sorry, I found more than one match. Try to be more specific?");
 		}
 	}
 
@@ -257,8 +256,7 @@ private void doEpisodeSearch(String queryTerm, final String season, final String
 		Log.v(MainActivity.TAG, "Found shows: " + shows.size());
 
 		if(shows.size() == 0) {
-			GoogleSearchApi.speak(context, "Sorry, I couldn't find " + queryTerm);
-			Log.e(TAG, "Sorry, I couldn't find " + queryTerm);
+			feedback("Sorry, I couldn't find " + queryTerm);
 		} else if(shows.size() == 1) {
 			PlexDirectory show = shows.get(0);
 			Log.v(TAG, "Show key: " + show.getKey());
@@ -288,8 +286,7 @@ public void onSuccess(String response) {
 
 			            if(foundSeason == null) {
 			            	Log.e(TAG, "Sorry, I couldn't find that season.");
-			            	GoogleSearchApi.speak(context, "Sorry, I couldn't find that season.");
-			            	doToast("Sorry, I couldn't find that season.");
+			            	feedback("Sorry, I couldn't find that season.");
 			            } else {
 			            	try {
 			    			    String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "" + foundSeason.getKey();
@@ -318,8 +315,7 @@ public void onSuccess(String response) {
 			    			            }
 			    			            Log.v(TAG, "foundEpisode = " + foundEpisode);
 			    			            if(foundEpisode == false) {
-			    			            	GoogleSearchApi.speak(context, "Sorry, I couldn't find that episode.");
-			    			            	doToast("Sorry, I couldn't find that episode.");
+			    			            	feedback("Sorry, I couldn't find that episode.");
 			    			            }
 			    			        }
 			    			    });
@@ -376,7 +372,7 @@ public void onSuccess(String response) {
 
 	private void onFinishedLatestEpisodeSearch(String queryTerm) {
 		if(videos.size() == 0) {
-			GoogleSearchApi.speak(context, "Sorry, I couldn't find " + queryTerm);
+			feedback("Sorry, I couldn't find " + queryTerm);
 		} else {
 			// For now, just take the first one
 			playVideo(videos.get(0));
@@ -432,19 +428,23 @@ private void onMovieSearchFinished(String queryTerm) {
 
 		if(chosenVideo != null) {
 			Log.v(MainActivity.TAG, "Chosen video: " + chosenVideo.getTitle());
-			GoogleSearchApi.speak(context, "Now watching " + chosenVideo.getTitle() + " on " + client.getName());
+			feedback("Now watching " + chosenVideo.getTitle() + " on " + client.getName());
 
 			playVideo(chosenVideo);
 		} else {
 			Log.v(MainActivity.TAG, "Didn't find a video");
-			GoogleSearchApi.speak(context, "Sorry, I couldn't find a video to play.");
-			doToast("Sorry, I couldn't find a video to play.");
+			feedback("Sorry, I couldn't find a video to play.");
 		}
 	}
 
-	private void doToast(String text) {
-		Toast.makeText(context, text, Toast.LENGTH_SHORT).show();
+	private void feedback(String text) {
+		if(mPrefs.getInt("feedback", MainActivity.FEEDBACK_VOICE) == MainActivity.FEEDBACK_VOICE) {
+			GoogleSearchApi.speak(context, text);
+		} else {
+			Toast.makeText(context, text, Toast.LENGTH_SHORT).show();
+		}
 	}
+	
 	private void playVideo(PlexVideo video) {
 		try {
 		    String url = "http://" + client.getHost() + ":" + client.getPort() + "/player/playback/playMedia?machineIdentifier=" + server.getMachineIdentifier() + "&key=" + video.getKey();

src/com/atomjack/vcfpht/MainActivity.java

@@ -44,6 +44,9 @@ public class MainActivity extends Activity {
 	public final static String TAG = "GoogleSearchPlexControl";
 	public final static String SEARCH_TYPE = "com.atomjack.googlesearchplexcontrol.SEARCH_TYPE";
 
+	public final static int FEEDBACK_VOICE = 0;
+	public final static int FEEDBACK_TOAST = 1;
+	
 	Button serverSelectButton = null;
 	Button clientSelectButton = null;
 
@@ -83,9 +86,6 @@ public void onClick(View view) {
 					searchForPlexServers();
 				}
 			});
-			
-			
-			
 		} else {
 			this.server = s;
 			this.client = (PlexClient)gson.fromJson(mPrefs.getString("Client", ""), PlexClient.class);
@@ -129,7 +129,8 @@ private void initMainWithServer() {
 
 		MainSetting setting_data[] = new MainSetting[] {
 			new MainSetting("Stream from the server", this.server.getName()),
-			new MainSetting("To the client", this.client.getName())
+			new MainSetting("To the client", this.client.getName()),
+			new MainSetting("Feedback", mPrefs.getInt("feedback", 0) == FEEDBACK_VOICE ? "Voice" : "Toast")
 		};
 
 		MainListAdapter adapter = new MainListAdapter(this, R.layout.main_setting_item_row, setting_data);
@@ -145,6 +146,8 @@ public void onItemClick(AdapterView<?> adapter, View view, int position,
 					searchForPlexServers();
 				} else if(position == 1) {
 					getClients();
+				} else if(position == 2) {
+					selectFeedback();
 				}
 			}
 		});
@@ -154,6 +157,29 @@ public void onItemClick(AdapterView<?> adapter, View view, int position,
 		resumeCheckbox.setChecked(mPrefs.getBoolean("resume", false));
 	}
 
+	private void selectFeedback() {
+		AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+		builder.setTitle("Feedback");
+		builder.setCancelable(false)
+			.setPositiveButton(R.string.feedback_voice, new DialogInterface.OnClickListener() {
+		        public void onClick(DialogInterface dialog, int id) {
+		        	mPrefsEditor.putInt("feedback", FEEDBACK_VOICE);
+		        	mPrefsEditor.commit();
+		        	initMainWithServer();
+//		            dialog.cancel();
+		        }
+			}).setNegativeButton(R.string.feedback_toast, new DialogInterface.OnClickListener() {
+		        public void onClick(DialogInterface dialog, int id) {
+		        	mPrefsEditor.putInt("feedback", FEEDBACK_TOAST);
+		        	mPrefsEditor.commit();
+		        	initMainWithServer();
+//		            dialog.cancel();
+		        }
+			});
+		AlertDialog d = builder.create();
+		d.show();
+	}
+	
 	private void searchForPlexServers() {
 		searchDialog = new Dialog(this);