0.2.72 - Magic button, Next up fixes

app/src/main/res/drawable/ic_player_magic.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- A wand and its sparks, for "put something on and don't ask me what". Deliberately not a
+     shuffle glyph, which on a player means reordering a queue the viewer can see; this makes
+     a choice on their behalf out of a library they cannot. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M14.06,7.52l2.42,2.42L6.42,20H4v-2.42L14.06,7.52zM15.47,6.11l1.71,-1.71 2.42,2.42 -1.71,1.71 -2.42,-2.42z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M5,3l0.62,1.88L7.5,5.5 5.62,6.12 5,8 4.38,6.12 2.5,5.5 4.38,4.88 5,3zM19,13l0.62,1.88 1.88,0.62 -1.88,0.62L19,18l-0.62,-1.88 -1.88,-0.62 1.88,-0.62L19,13z" />
+</vector>

app/src/main/res/drawable/ic_player_next_episode.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Skip-to-next: a triangle against a bar. The transport's own "fast forward" glyph is a
+     double chevron and means "move through this programme"; this means "leave it", so the
+     bar is the load-bearing half of the shape and is drawn at full weight. -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" />
+</vector>

app/src/main/res/layout/memby_player_controls.xml

@@ -226,6 +226,18 @@
                     android:contentDescription="@string/exo_controls_fastforward_description"
                     android:src="@drawable/exo_icon_fastforward"
                     tools:ignore="PrivateResource" />
+
+                <!-- In the transport group rather than out with the panels, because it moves
+                     the programme on in the way rewind and fast-forward do: it is the last
+                     step of the same journey. Gone rather than disabled when there is no next
+                     episode, so a film's transport row is the three controls it has always
+                     been and the D-pad never lands on a dead target. -->
+                <ImageButton
+                    android:id="@+id/player_next_episode"
+                    style="@style/MembyPlayerControlButton"
+                    android:contentDescription="@string/player_next_episode"
+                    android:src="@drawable/ic_player_next_episode"
+                    android:visibility="gone" />
             </LinearLayout>
 
             <LinearLayout
@@ -235,6 +247,16 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
+                <!-- Withheld for episodic content: Next Episode already answers "what now?"
+                     there, and the server's picker is films only. Gone rather than disabled
+                     for the same reason as Next Episode. -->
+                <ImageButton
+                    android:id="@+id/player_magic"
+                    style="@style/MembyPlayerControlButton"
+                    android:contentDescription="@string/player_magic"
+                    android:src="@drawable/ic_player_magic"
+                    android:visibility="gone" />
+
                 <ImageButton
                     android:id="@id/exo_subtitle"
                     style="@style/MembyPlayerControlButton"

app/src/main/res/values/strings.xml

@@ -55,6 +55,14 @@
     <string name="player_subtitle_disabled">Subtitles off</string>
     <string name="player_subtitle_generic">Selected</string>
     <string name="player_cast_open">Cast</string>
+    <string name="player_next_episode">Next episode</string>
+    <string name="player_magic">Play something else</string>
+    <string name="player_magic_finding">Finding something to watch…</string>
+    <string name="player_magic_pick_hint">Choosing from your library</string>
+    <!-- Says what was chosen before the picture changes: a button that silently replaces the
+         programme is one nobody presses twice. -->
+    <string name="player_magic_selected">Playing %1$s</string>
+    <string name="player_magic_empty">Nothing new to suggest just now</string>
     <string name="player_back_to_close">BACK  ·  CLOSE</string>
     <string name="player_ends_at">Ends at %1$s</string>
     <string name="player_preroll_countdown_initial">Starting in 7 seconds…</string>