[Chromecast] Fixed next/previous track buttons.

Chris Bellew · Chris Bellew · commit 7715553c76a1 · 2014-12-28T14:56:45.000-08:00
Fixed vertical alignment of controls on now playing screens.
diff --git a/Voice Control For Plex/src/main/java/com/atomjack/vcfp/CastPlayerManager.java b/Voice Control For Plex/src/main/java/com/atomjack/vcfp/CastPlayerManager.java
@@ -55,6 +55,8 @@ public static final class PARAMS {
     public static final String ACTION_STOP = "stop";
     public static final String ACTION_SEEK = "seek";
     public static final String ACTION_GET_PLAYBACK_STATE = "getPlaybackState";
+    public static final String ACTION_NEXT = "next";
+    public static final String ACTION_PREV = "prev";
 
     public static final String PLEX_USERNAME = "plexUsername";
 
@@ -114,7 +116,8 @@ public boolean isSubscribed() {
   public void unsubscribe() {
     try {
       Logger.d("is connected: %s", castManager.isConnected());
-      castManager.stopApplication();
+      if(castManager.isConnected())
+        castManager.stopApplication();
     } catch (Exception ex) {
       ex.printStackTrace();
     }
@@ -178,6 +181,26 @@ public void seekTo(int seconds) {
 
   }
 
+  public void doNext() {
+    JSONObject obj = new JSONObject();
+    try {
+      obj.put(PARAMS.ACTION, PARAMS.ACTION_NEXT);
+      sendMessage(obj);
+    } catch (Exception ex) {
+      ex.printStackTrace();
+    }
+  }
+
+  public void doPrevious() {
+    JSONObject obj = new JSONObject();
+    try {
+      obj.put(PARAMS.ACTION, PARAMS.ACTION_PREV);
+      sendMessage(obj);
+    } catch (Exception ex) {
+      ex.printStackTrace();
+    }
+  }
+
   private void sendMessage(String action) {
     JSONObject message = new JSONObject();
     try {
diff --git a/Voice Control For Plex/src/main/java/com/atomjack/vcfp/PlexSubscription.java b/Voice Control For Plex/src/main/java/com/atomjack/vcfp/PlexSubscription.java
@@ -321,10 +321,6 @@ public void run() {
         Logger.d("PlexSubscription onSubscribed, client: %s, listener: %s", mClient, listener);
         if (listener != null && mClient != null) {
           listener.onSubscribed(mClient);
-//          Logger.d("Sending broadcast");
-//          Intent subscribedBroadcast = new Intent(ACTION_SUBSCRIBED);
-//          subscribedBroadcast.putExtra(EXTRA_CLIENT, mClient);
-//          LocalBroadcastManager.getInstance(listener).sendBroadcast(subscribedBroadcast);
         }
       }
     });
diff --git a/Voice Control For Plex/src/main/java/com/atomjack/vcfp/activities/CastActivity.java b/Voice Control For Plex/src/main/java/com/atomjack/vcfp/activities/CastActivity.java
@@ -20,7 +20,6 @@
 import com.atomjack.vcfp.model.PlexMedia;
 import com.google.sample.castcompanionlibrary.cast.VideoCastManager;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -145,8 +144,8 @@ private void hideConnectingDialog() {
   }
 
 	private void beginPlayback() {
-		String url = castPlayerManager.getTranscodeUrl(nowPlayingMedia);
-		Logger.d("url: %s", url);
+//		String url = castPlayerManager.getTranscodeUrl(nowPlayingMedia);
+//		Logger.d("url: %s", url);
 		Logger.d("duration: %s", nowPlayingMedia.duration);
 
 		Logger.d("offset is %d", getOffset(nowPlayingMedia));
@@ -262,6 +261,16 @@ public void doStop(View v) {
 		}
 	}
 
+  public void doNext(View v) {
+    Logger.d("doNext");
+    castPlayerManager.doNext();
+  }
+
+  public void doPrevious(View v) {
+    Logger.d("doPrevious");
+    castPlayerManager.doPrevious();
+  }
+
 	@Override
 	public void onStopTrackingTouch(SeekBar _seekBar) {
 		Logger.d("stopped changing progress: %d", _seekBar.getProgress());
diff --git a/Voice Control For Plex/src/main/java/com/atomjack/vcfp/activities/NowPlayingActivity.java b/Voice Control For Plex/src/main/java/com/atomjack/vcfp/activities/NowPlayingActivity.java
@@ -46,11 +46,11 @@ protected void onCreate(Bundle savedInstanceState) {
 			Logger.d("found saved instance state");
 			nowPlayingMedia = savedInstanceState.getParcelable(VoiceControlForPlexApplication.Intent.EXTRA_MEDIA);
       mClient = savedInstanceState.getParcelable(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT);
-      Logger.d("[NowPlaying] set mClient: %s", mClient);
+      Logger.d("[NowPlaying] set client: %s", mClient);
 		} else {
 			nowPlayingMedia = getIntent().getParcelableExtra(VoiceControlForPlexApplication.Intent.EXTRA_MEDIA);
       mClient = getIntent().getParcelableExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT);
-      Logger.d("[NowPlayingActivity] 2 set mClient: %s", mClient);
+      Logger.d("[NowPlayingActivity] 2 set client: %s", mClient);
 		}
 
 		if(mClient == null || nowPlayingMedia == null)
diff --git a/Voice Control For Plex/src/main/res/layout/playback.xml b/Voice Control For Plex/src/main/res/layout/playback.xml
@@ -13,7 +13,8 @@
         android:gravity="center_vertical"
         android:maxLines="1"
         android:layout_weight="1"
-        android:paddingLeft="15sp" />
+        android:paddingLeft="15sp"
+        android:layout_marginTop="10dp"/>
     <ImageButton
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -60,5 +61,6 @@
         android:text="00:00"
         android:id="@+id/durationView"
         android:maxLines="1"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:layout_marginTop="10dp"/>
 </LinearLayout>
diff --git a/Voice Control For Plex/src/main/res/layout/playback_music.xml b/Voice Control For Plex/src/main/res/layout/playback_music.xml
@@ -13,35 +13,40 @@
         android:gravity="center_vertical"
         android:maxLines="1"
         android:layout_weight="1"
-        android:paddingLeft="15sp" />
+        android:paddingLeft="15sp"
+        android:layout_marginTop="10dp"/>
     <ImageButton
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:onClick="doPrevious"
         android:id="@+id/rewindButton" android:src="@drawable/button_previous"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:layout_marginTop="10dp"/>
     <ImageButton
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:onClick="doPlayPause"
         android:id="@+id/playPauseButton" android:src="@drawable/button_play"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:layout_marginTop="10dp"/>
     <ImageButton
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:onClick="doStop"
         android:id="@+id/stopButton" android:src="@drawable/button_stop"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:layout_marginTop="10dp"/>
     <ImageButton
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:onClick="doNext"
         android:id="@+id/forwardButton" android:src="@drawable/button_next"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:layout_marginTop="10dp"/>
     <ImageButton
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -56,5 +61,6 @@
         android:text="00:00"
         android:id="@+id/durationView"
         android:maxLines="1"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        android:layout_marginTop="10dp"/>
 </LinearLayout>

Original file line number	Diff line number	Diff line change
`@@ -321,10 +321,6 @@ public void run() {`
`321`	`321`	`Logger.d("PlexSubscription onSubscribed, client: %s, listener: %s", mClient, listener);`
`322`	`322`	`if (listener != null && mClient != null) {`
`323`	`323`	`listener.onSubscribed(mClient);`
`324`		`-// Logger.d("Sending broadcast");`
`325`		`-// Intent subscribedBroadcast = new Intent(ACTION_SUBSCRIBED);`
`326`		`-// subscribedBroadcast.putExtra(EXTRA_CLIENT, mClient);`
`327`		`-// LocalBroadcastManager.getInstance(listener).sendBroadcast(subscribedBroadcast);`
`328`	`324`	`}`
`329`	`325`	`}`
`330`	`326`	`});`