Display season and episode on Now Playing screens.

Fixed display of media info on Wear.
Changed back/forward buttons on Now Playing screens, and adjusted element layout a bit.
[Wear] Fixed voice input when triggered from action button.

Author: Chris Bellew

mobile/src/main/java/com/atomjack/vcfp/activities/NowPlayingActivity.java

@@ -78,16 +78,21 @@ public void run() {
     }, 3000);
 
 
-    Logger.d("mClient: %s", mClient);
-    Logger.d("nowPlayingMedia: %s", nowPlayingMedia);
-    showNowPlaying();
-    seekBar = (SeekBar) findViewById(R.id.seekBar);
-    seekBar.setOnSeekBarChangeListener(NowPlayingActivity.this);
-    seekBar.setMax(nowPlayingMedia.duration);
-    seekBar.setProgress(Integer.parseInt(nowPlayingMedia.viewOffset));
-
-    setCurrentTimeDisplay(getOffset(nowPlayingMedia));
-    durationDisplay.setText(VoiceControlForPlexApplication.secondsToTimecode(nowPlayingMedia.duration / 1000));
+    if(nowPlayingMedia == null) {
+      VoiceControlForPlexApplication.getInstance().cancelNotification();
+      finish();
+    } else {
+      Logger.d("mClient: %s", mClient);
+      Logger.d("nowPlayingMedia: %s", nowPlayingMedia);
+      showNowPlaying();
+      seekBar = (SeekBar) findViewById(R.id.seekBar);
+      seekBar.setOnSeekBarChangeListener(NowPlayingActivity.this);
+      seekBar.setMax(nowPlayingMedia.duration);
+      seekBar.setProgress(Integer.parseInt(nowPlayingMedia.viewOffset));
+
+      setCurrentTimeDisplay(getOffset(nowPlayingMedia));
+      durationDisplay.setText(VoiceControlForPlexApplication.secondsToTimecode(nowPlayingMedia.duration / 1000));
+    }
 	}
 
 

mobile/src/main/java/com/atomjack/vcfp/activities/PlayerActivity.java

@@ -111,7 +111,7 @@ public void showNowPlaying(boolean setView) {
         TextView showTitle = (TextView)findViewById(R.id.nowPlayingShowTitle);
         showTitle.setText(video.grandparentTitle);
         TextView episodeTitle = (TextView)findViewById(R.id.nowPlayingEpisodeTitle);
-        episodeTitle.setText(video.title);
+        episodeTitle.setText(String.format("%s (s%02de%02d)", video.title, Integer.parseInt(video.parentIndex), Integer.parseInt(video.index)));
         TextView year = (TextView)findViewById(R.id.nowPlayingYear);
         year.setText(video.year);
         TextView duration = (TextView)findViewById(R.id.nowPlayingDuration);

mobile/src/main/java/com/atomjack/vcfp/activities/VCFPActivity.java

@@ -911,6 +911,7 @@ public void sendWearPlaybackChange() {
           msg = WearConstants.MEDIA_STOPPED;
         } else if (mCurrentState == PlayerState.PAUSED) {
           msg = WearConstants.MEDIA_PAUSED;
+          VoiceControlForPlexApplication.SetWearMediaTitles(data, nowPlayingMedia);
         }
         if (msg != null) {
           if (msg.equals(WearConstants.MEDIA_PLAYING)) {

mobile/src/main/java/com/atomjack/vcfp/model/PlexVideo.java

@@ -17,6 +17,8 @@
 public class PlexVideo extends PlexMedia {
 	@Attribute(required=false)
 	public String index;
+  @Attribute(required=false)
+  public String parentIndex;
 
 
 	@Attribute(required=false)
@@ -103,6 +105,7 @@ public String getDuration() {
 	public void writeToParcel(Parcel out, int flags) {
     super.writeToParcel(out, flags);
 		out.writeString(index);
+    out.writeString(parentIndex);
 		out.writeString(type);
 		out.writeString(year);
 		out.writeString(summary);
@@ -114,6 +117,7 @@ public void writeToParcel(Parcel out, int flags) {
 	public PlexVideo(Parcel in) {
     super(in);
 		index = in.readString();
+    parentIndex = in.readString();
 		type = in.readString();
 		year = in.readString();
 		summary = in.readString();

mobile/src/main/java/com/atomjack/vcfp/services/WearListenerService.java

@@ -147,7 +147,7 @@ public void onMessageReceived(MessageEvent messageEvent) {
 
           if(listener != null && listener.getNowPlayingMedia() != null) {
             Logger.d("now playing: %s", listener.getNowPlayingMedia().title);
-            dataMap.putString(WearConstants.MEDIA_TITLE, listener.getNowPlayingMedia().title);
+            VoiceControlForPlexApplication.SetWearMediaTitles(dataMap, listener.getNowPlayingMedia());
             dataMap.putString(WearConstants.MEDIA_TYPE, listener.getNowPlayingMedia().getType());
             final PlexMedia media = plexSubscription.getListener().getNowPlayingMedia();
             VoiceControlForPlexApplication.getWearMediaImage(media, new BitmapHandler() {

mobile/src/main/res/layout/now_playing_movie.xml

@@ -88,7 +88,7 @@
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="110dp"
+        android:layout_height="120dp"
         android:orientation="vertical"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
@@ -97,7 +97,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/seekBar"
-            android:layout_alignParentBottom="true"/>
+            android:paddingBottom="10dp"/>
         <include layout="@layout/playback" />
     </LinearLayout>
 

mobile/src/main/res/layout/now_playing_music.xml

@@ -67,7 +67,7 @@
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="110dp"
+        android:layout_height="120dp"
         android:orientation="vertical"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
@@ -76,7 +76,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/seekBar"
-            android:layout_alignParentBottom="true"/>
+            android:paddingBottom="10dp"/>
         <include layout="@layout/playback_music" />
     </LinearLayout>
 

mobile/src/main/res/layout/now_playing_show.xml

@@ -89,7 +89,7 @@
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="110dp"
+        android:layout_height="120dp"
         android:orientation="vertical"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
@@ -98,7 +98,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/seekBar"
-            android:layout_alignParentBottom="true"/>
+            android:paddingBottom="10dp"/>
         <include layout="@layout/playback" />
     </LinearLayout>
 

mobile/src/main/res/layout/playback.xml

@@ -14,15 +14,15 @@
         android:maxLines="1"
         android:layout_weight="1"
         android:paddingLeft="15sp"
-        android:layout_marginTop="10dp"/>
+        android:layout_marginTop="18dp"/>
     <ImageButton
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:onClick="doRewind"
-        android:id="@+id/rewindButton" android:src="@drawable/button_rewind"
+        android:id="@+id/rewindButton" android:src="@drawable/notif_back15"
         android:layout_weight="1"
-        android:layout_marginTop="10dp"/>
+        android:layout_marginTop="13dp"/>
     <ImageButton
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -44,9 +44,9 @@
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:onClick="doForward"
-        android:id="@+id/forwardButton" android:src="@drawable/button_forward"
+        android:id="@+id/forwardButton" android:src="@drawable/notif_ff30"
         android:layout_weight="1"
-        android:layout_marginTop="10dp"/>
+        android:layout_marginTop="13dp"/>
     <ImageButton
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -62,5 +62,5 @@
         android:id="@+id/durationView"
         android:maxLines="1"
         android:layout_weight="1"
-        android:layout_marginTop="10dp"/>
+        android:layout_marginTop="18dp"/>
 </LinearLayout>

wear/src/main/java/com/atomjack/wear/MainActivity.java

@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.NotificationManager;
+import android.app.RemoteInput;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -25,6 +26,8 @@
 import com.google.gson.JsonSerializer;
 
 import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -34,6 +37,8 @@ public class MainActivity extends Activity implements
   public static final String SHOW_WEAR_UNAUTHORIZED = "com.atomjack.vcfp.intent.show_wear_unauthorized";
   public static final String FINISH = "com.atomjack.vcfp.intent.finish";
   public static final String START_SPEECH_RECOGNITION = "com.atomjack.vcfp.intent.start_speech_recognition";
+  public static final String RECEIVE_VOICE_INPUT = "com.atomjack.vcfp.intent.receive_voice_input";
+
   private static final int SPEECH_RECOGNIZER_REQUEST_CODE = 0;
 
   GoogleApiClient googleApiClient;
@@ -42,7 +47,7 @@ public class MainActivity extends Activity implements
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    Logger.d("[MainActivity] onCreate: %s", savedInstanceState);
+    Logger.d("[MainActivity] onCreate: %s", getIntent().getAction());
 
     setMainView();
 
@@ -61,10 +66,24 @@ protected void onCreate(Bundle savedInstanceState) {
       } else if(action.equals(WearConstants.SET_INFO)) {
         Logger.d("[MainActivity] setting info to %s", getIntent().getStringExtra(WearConstants.INFORMATION));
         setInformationView(getIntent().getStringExtra(WearConstants.INFORMATION));
+      } else if(action.equals(RECEIVE_VOICE_INPUT)) {
+        String query = getMessageText(getIntent());
+        DataMap dataMap = new DataMap();
+        dataMap.putStringArrayList(WearConstants.SPEECH_QUERY, new ArrayList<>(Arrays.asList(query)));
+        new SendToDataLayerThread(WearConstants.SPEECH_QUERY, dataMap, this).start();
+        finish();
       }
     }
   }
 
+  private String getMessageText(Intent intent) {
+    Bundle remoteInput = RemoteInput.getResultsFromIntent(intent);
+    if (remoteInput != null) {
+      CharSequence charSequence = remoteInput.getCharSequence(WearConstants.SPEECH_QUERY);
+      return new StringBuilder(charSequence.length()).append(charSequence).toString();
+    }
+    return null;
+  }
   @Override
   protected void onPause() {
     super.onPause();