Big update to allow scanning of all available servers, specify client while speaking query, redo settings screen, add now playing screen.

Author: Chris Bellew

AndroidManifest.xml

@@ -2,12 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.atomjack.vcfpht"
     android:versionCode="2"
-    android:versionName="1.1" >
+    android:versionName="1.2" >
 
     <uses-permission android:name="com.mohammadag.googlesearchapi.permission.ACCESS_GGOGLE_SEARCH_API" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    
+
     <uses-sdk
         android:minSdkVersion="16"
         android:targetSdkVersion="19" />
@@ -26,18 +26,29 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        
+        <activity
+            android:name="com.atomjack.vcfpht.PlayMediaActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <service
             android:name="com.atomjack.vcfpht.GDMService"
             android:exported="false" />
-        
+
         <receiver
             android:name="com.atomjack.vcfpht.GoogleSearchReceiver"
             android:exported="true" >
             <intent-filter>
                 <action android:name="com.mohammadag.googlesearchapi.NEW_SEARCH" />
             </intent-filter>
         </receiver>
+
     </application>
 
 </manifest>

README.md

@@ -11,7 +11,7 @@ Running the application for the first time will immediately start scanning for P
 
 ## Usage
 
-Below are examples of what to say to Google Now to trigger playback. Sentence fragments in bold are required **AS IS**, while fragments in italics depend on the show, season and episode you wish to watch.
+Below are examples of what to say to Google Now to trigger playback. Sentence fragments in bold are required **AS IS**, while fragments in italics depend on the show, season and episode you wish to watch. If "Resume if in progress" is not checked, you can resume playback by speaking "Resume watching" instead of "Watch" (e.g. "Resume watching Inception")
 
 ### For movies:
 "**Watch** *Aliens*"
@@ -24,9 +24,11 @@ Below are examples of what to say to Google Now to trigger playback. Sentence fr
 
 "**Watch** *Homeland* **Season** *1* **Episode** *1*"
 
-"**Watch** *Orange Is The New Black* **Season** *1* **Episode** *5*"
+"**Watch** *Breaking Bad* **Season** *5* **Episode** *8*"
 
 "**Watch episode** *Once More With Feeling* **of** *Buffy The Vampire Slayer*"
 
+"**Watch** *Game of Thrones* **episode** *The Rains of Castamere*"
+
 "**Watch the latest episode of** *The Walking Dead*" - uses Plex's "on deck"
 

res/layout/main_setting_item_row.xml

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:descendantFocusability="blocksDescendants" 
     android:orientation="vertical" >
 
     <!-- 
@@ -27,20 +28,35 @@
         android:id="@+id/mainSettingItem1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:textSize="20sp"
-        android:text="item1" />
+        android:layout_marginBottom="5dp"
+        android:layout_toLeftOf="@+id/settingRowHelpButton"
+        android:text=""
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/mainSettingItem2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignRight="@+id/mainSettingItem1"
+        android:layout_below="@+id/mainSettingItem1"
+        android:textSize="20sp" />
+
+    <ImageButton
+        android:id="@+id/settingRowHelpButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/mainSettingItem2"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:textSize="20sp"
-        android:text="item2" />
+        android:paddingRight="10dp"
+        android:paddingLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:onClick="settingRowHelpButtonClicked"
+        android:background="?android:selectableItemBackground"
+        android:contentDescription="@string/help_button_desc"
+        android:src="@drawable/help_icon" />
 
 </RelativeLayout>

res/layout/main_with_server.xml

@@ -8,17 +8,23 @@
     <string name="stream_video_from_server">Stream video from the server</string>
     <string name="to_the_client">to the Client</string>
     <string name="resume_if_in_progress">Resume if in progress</string>
-    <string name="help_text1">Here are some examples to trigger playback:</string>
-    <string name="help_text2">&quot;Watch V For Vendetta&quot;</string>
-    <string name="help_text3">Watch Season 1 Episode 1 of Homeland</string>
-    <string name="help_text4">Watch Orange Is The New Black Season 1 Episode 5</string>
-    <string name="help_text5">Watch episode Once More With Feeling of Buffy The Vampire Slayer</string>
-    <string name="help_text6">Watch the latest episode of The Walking Dead</string>
     <string name="search">Search</string>
     <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>
+    <string name="now_playing_on">Now Playing On</string>
+    <string name="voice">Voice</string>
+    <string name="toast">Toast</string>
+    <string name="scan_all">Scan All</string>
+    <string name="not_set">Not Set</string>
+    <string name="feedback">Feedback</string>
+    <string name="help_server">Select a Plex Media Server to stream from. If you have more than one media server, select &quot;Scan All&quot; to search all available servers for media. If you only have one, you should select it here as scanning all servers each time will take longer to trigger playback.</string>
+    <string name="help_client">Select the default client to stream media to. You can easily stream to a different client by ending your search query with \&quot;on &lt;client name&gt;\&quot;, where &lt;client name&gt; is the name of the PHT Client.</string>
+    <string name="help_feedback">Select which type of feedback I should give you.</string>
+    <string name="help_button_desc">Help Button</string>
+    <string name="help_usage">Here are some examples to trigger playback:\n\nWatch V For Vendetta\nWatch Season 1 Episode 1 of Homeland\nWatch Breaking Bad Season 5 Episode 8\nWatch episode Once More With Feeling of Buffy The Vampire Slayer\nWatch the latest episode of The Walking Dead\n\nIf you don\'t have \&quot;Resume if in progress\&quot; checked, you can selectively resume by saying \&quot;Resume watching\&quot; instead of \&quot;Watch\&quot;\n\nYou can also specify a client by adding \&quot;on &lt;client name&gt;\&quot; to your spoken query.</string>
+    <string name="help_usage_button">Usage Examples</string>
 
 </resources>

res/values/strings.xml

@@ -16,5 +16,10 @@
     <style name="AppTheme" parent="AppBaseTheme">
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
     </style>
+    <style name="Line">
+	    <item name="android:layout_width">fill_parent</item>
+	    <item name="android:layout_height">1dp</item>
+	    <item name="android:background">#bfbfbf</item>
+	</style>
 
 </resources>

res/values/styles.xml

@@ -25,6 +25,8 @@ public GDMService() {
     protected void onHandleIntent(Intent intent) {
   	try
 		{
+  			String origin = intent.getStringExtra("ORIGIN") == null ? "" : intent.getStringExtra("ORIGIN");
+  			String queryText = intent.getStringExtra("queryText");
 			DatagramSocket socket = new DatagramSocket(32414);
 			socket.setBroadcast(true);
 			String data = "M-SEARCH * HTTP/1.0";
@@ -49,6 +51,7 @@ protected void onHandleIntent(Intent intent) {
 						Intent packetBroadcast = new Intent(GDMService.MSG_RECEIVED);
 						packetBroadcast.putExtra("data", packetData);
 						packetBroadcast.putExtra("ipaddress", packet.getAddress().toString());
+						packetBroadcast.putExtra("ORIGIN", origin);
 						LocalBroadcastManager.getInstance(this).sendBroadcast(packetBroadcast);
 					}
 				}
@@ -58,6 +61,10 @@ protected void onHandleIntent(Intent intent) {
 					socket.close();
 					listening = false;
 					Intent socketBroadcast = new Intent(GDMService.SOCKET_CLOSED);
+					socketBroadcast.putExtra("ORIGIN", origin);
+					if(queryText != null) {
+						socketBroadcast.putExtra("queryText", queryText);
+					}
 					LocalBroadcastManager.getInstance(this).sendBroadcast(socketBroadcast);
 				}
 

src/com/atomjack/vcfpht/GDMService.java

@@ -23,11 +23,15 @@ public static ConcurrentHashMap<String, PlexServer> getPlexMediaServers() {
     private static Serializer serial = new Persister();
 
     public static void addPlexServer(final PlexServer server) {
+    	Log.v(MainActivity.TAG, "ADDING PLEX SERVER: " + server);
+    	if(server.getName().equals("") || server.getIPAddress().equals("")) {
+    		return;
+    	}
     	if (!plexmediaServers.containsKey(server.getName())) {
     		try {
     		    String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "/library/sections/";
-    		    AsyncHttpClient client = new AsyncHttpClient();
-    		    client.get(url, new AsyncHttpResponseHandler() {
+    		    AsyncHttpClient httpClient = new AsyncHttpClient();
+    		    httpClient.get(url, new AsyncHttpResponseHandler() {
     		        @Override
     		        public void onSuccess(String response) {
     		            Log.v(MainActivity.TAG, "HTTP REQUEST: " + response);
@@ -40,7 +44,6 @@ public void onSuccess(String response) {
     		                e.printStackTrace();
     		            }
     		            for(int i=0;i<mc.directories.size();i++) {
-    		            	Log.v(MainActivity.TAG, "Directory type: " + mc.directories.get(i).getType());
     		            	if(mc.directories.get(i).getType().equals("movie")) {
     		            		server.addMovieSection(mc.directories.get(i).getKey());
     		            	}
@@ -53,8 +56,9 @@ public void onSuccess(String response) {
     		            	Log.v(MainActivity.TAG, "Directories: " + mc.directories.size());
     		            else
     		            	Log.v(MainActivity.TAG, "No directories found!");
-    		            plexmediaServers.putIfAbsent(server.getName(), server);
-//    		            getClients(mc);
+    		            if(!server.getName().equals("") && !server.getIPAddress().equals("")) {
+    		            	plexmediaServers.putIfAbsent(server.getName(), server);
+    		            }
     		        }
     		    });