#669 On Audio Books/Podcasts replace back/forward with rewind/fast forward

28 files changed, 60 insertions, 0 deletions

diff --git a/app/src/main/res/drawable-hdpi/media_fastforward_dark.png b/app/src/main/res/drawable-hdpi/media_fastforward_dark.png
new file mode 100644
index 00000000..eab0cdfd
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/media_fastforward_dark.png
diff --git a/app/src/main/res/drawable-hdpi/media_fastforward_light.png b/app/src/main/res/drawable-hdpi/media_fastforward_light.png
new file mode 100644
index 00000000..905faa9c
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/media_fastforward_light.png
diff --git a/app/src/main/res/drawable-hdpi/media_rewind_dark.png b/app/src/main/res/drawable-hdpi/media_rewind_dark.png
new file mode 100644
index 00000000..5d2d62a7
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/media_rewind_dark.png
diff --git a/app/src/main/res/drawable-hdpi/media_rewind_light.png b/app/src/main/res/drawable-hdpi/media_rewind_light.png
new file mode 100644
index 00000000..15bc91a8
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/media_rewind_light.png
diff --git a/app/src/main/res/drawable-mdpi/media_fastforward_dark.png b/app/src/main/res/drawable-mdpi/media_fastforward_dark.png
new file mode 100644
index 00000000..f999e0b8
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/media_fastforward_dark.png
diff --git a/app/src/main/res/drawable-mdpi/media_fastforward_light.png b/app/src/main/res/drawable-mdpi/media_fastforward_light.png
new file mode 100644
index 00000000..23107742
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/media_fastforward_light.png
diff --git a/app/src/main/res/drawable-mdpi/media_rewind_dark.png b/app/src/main/res/drawable-mdpi/media_rewind_dark.png
new file mode 100644
index 00000000..2ecda48a
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/media_rewind_dark.png
diff --git a/app/src/main/res/drawable-mdpi/media_rewind_light.png b/app/src/main/res/drawable-mdpi/media_rewind_light.png
new file mode 100644
index 00000000..f7c9b303
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/media_rewind_light.png
diff --git a/app/src/main/res/drawable-v21/notification_fastforward.xml b/app/src/main/res/drawable-v21/notification_fastforward.xml
new file mode 100644
index 00000000..d0ab76a2
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_fastforward.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:src="@drawable/media_fastforward_light"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/notification_rewind.xml b/app/src/main/res/drawable-v21/notification_rewind.xml
new file mode 100644
index 00000000..25a16a02
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_rewind.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:src="@drawable/media_rewind_light"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/media_fastforward_dark.png b/app/src/main/res/drawable-xhdpi/media_fastforward_dark.png
new file mode 100644
index 00000000..3c653286
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/media_fastforward_dark.png
diff --git a/app/src/main/res/drawable-xhdpi/media_fastforward_light.png b/app/src/main/res/drawable-xhdpi/media_fastforward_light.png
new file mode 100644
index 00000000..f105b458
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/media_fastforward_light.png
diff --git a/app/src/main/res/drawable-xhdpi/media_rewind_dark.png b/app/src/main/res/drawable-xhdpi/media_rewind_dark.png
new file mode 100644
index 00000000..08fdff06
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/media_rewind_dark.png
diff --git a/app/src/main/res/drawable-xhdpi/media_rewind_light.png b/app/src/main/res/drawable-xhdpi/media_rewind_light.png
new file mode 100644
index 00000000..3998f715
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/media_rewind_light.png
diff --git a/app/src/main/res/drawable-xxhdpi/media_fastforward_dark.png b/app/src/main/res/drawable-xxhdpi/media_fastforward_dark.png
new file mode 100644
index 00000000..90f045ea
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/media_fastforward_dark.png
diff --git a/app/src/main/res/drawable-xxhdpi/media_fastforward_light.png b/app/src/main/res/drawable-xxhdpi/media_fastforward_light.png
new file mode 100644
index 00000000..73f0fba4
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/media_fastforward_light.png
diff --git a/app/src/main/res/drawable-xxhdpi/media_rewind_dark.png b/app/src/main/res/drawable-xxhdpi/media_rewind_dark.png
new file mode 100644
index 00000000..ff5bda9a
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/media_rewind_dark.png
diff --git a/app/src/main/res/drawable-xxhdpi/media_rewind_light.png b/app/src/main/res/drawable-xxhdpi/media_rewind_light.png
new file mode 100644
index 00000000..c50c0825
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/media_rewind_light.png
diff --git a/app/src/main/res/drawable-xxxhdpi/media_fastforward_dark.png b/app/src/main/res/drawable-xxxhdpi/media_fastforward_dark.png
new file mode 100644
index 00000000..63ac58e0
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/media_fastforward_dark.png
diff --git a/app/src/main/res/drawable-xxxhdpi/media_fastforward_light.png b/app/src/main/res/drawable-xxxhdpi/media_fastforward_light.png
new file mode 100644
index 00000000..d2f7506b
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/media_fastforward_light.png
diff --git a/app/src/main/res/drawable-xxxhdpi/media_rewind_dark.png b/app/src/main/res/drawable-xxxhdpi/media_rewind_dark.png
new file mode 100644
index 00000000..e911b342
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/media_rewind_dark.png
diff --git a/app/src/main/res/drawable-xxxhdpi/media_rewind_light.png b/app/src/main/res/drawable-xxxhdpi/media_rewind_light.png
new file mode 100644
index 00000000..461118f1
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/media_rewind_light.png
diff --git a/app/src/main/res/drawable/notification_fastforward.xml b/app/src/main/res/drawable/notification_fastforward.xml
new file mode 100644
index 00000000..355c6a5b
--- /dev/null
+++ b/app/src/main/res/drawable/notification_fastforward.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:src="@drawable/media_fastforward_dark"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/notification_rewind.xml b/app/src/main/res/drawable/notification_rewind.xml
new file mode 100644
index 00000000..ab7827a9
--- /dev/null
+++ b/app/src/main/res/drawable/notification_rewind.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:src="@drawable/media_rewind_dark"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml
index 180cce97..462ee7ef 100644
--- a/app/src/main/res/layout/abstract_fragment_activity.xml
+++ b/app/src/main/res/layout/abstract_fragment_activity.xml
@@ -105,6 +105,13 @@
 
 					<ImageButton
 						style="@style/PlaybackControl.BottomBar"
+						android:id="@+id/download_rewind"
+						android:src="?attr/actionbar_rewind"
+						android:padding="2dp"
+						android:visibility="gone"/>
+
+					<ImageButton
+						style="@style/PlaybackControl.BottomBar"
 						android:id="@+id/download_previous"
 						android:src="?attr/actionbar_backward"
 						android:padding="2dp"/>
@@ -119,6 +126,13 @@
 						android:id="@+id/download_next"
 						android:src="?attr/actionbar_forward"
 						android:padding="2dp"/>
+
+					<ImageButton
+						style="@style/PlaybackControl.BottomBar"
+						android:id="@+id/download_fastforward"
+						android:src="?attr/actionbar_fastforward"
+						android:padding="2dp"
+						android:visibility="gone"/>
 				</LinearLayout>
 			</LinearLayout>
 		</FrameLayout>
diff --git a/app/src/main/res/layout/download_media_buttons.xml b/app/src/main/res/layout/download_media_buttons.xml
index 58fda5c0..0610c5f9 100644
--- a/app/src/main/res/layout/download_media_buttons.xml
+++ b/app/src/main/res/layout/download_media_buttons.xml
@@ -21,6 +21,14 @@
             android:layout_centerVertical="true"
             />
 
+	<github.daneren2005.dsub.view.AutoRepeatButton
+		style="@style/PlaybackControl.Large"
+		android:id="@+id/download_rewind"
+		android:src="?attr/media_button_rewind"
+		android:layout_toLeftOf="@+id/download_pause"
+		android:layout_centerVertical="true"
+		android:visibility="invisible"/>
+
     <ImageButton
             style="@style/PlaybackControl.Large"
             android:id="@+id/download_pause"
@@ -44,6 +52,14 @@
             android:layout_centerInParent="true"
             />
 
+	<github.daneren2005.dsub.view.AutoRepeatButton
+		style="@style/PlaybackControl.Large"
+		android:id="@+id/download_fastforward"
+		android:src="?attr/media_button_fastforward"
+		android:layout_toRightOf="@+id/download_start"
+		android:layout_centerVertical="true"
+		android:visibility="invisible"/>
+
     <github.daneren2005.dsub.view.AutoRepeatButton
             style="@style/PlaybackControl.Small"
             android:id="@+id/download_next"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c8553dc0..2d3794d6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,6 +3,8 @@
     <attr name="offline_icon" format="reference"/>
     <attr name="media_button_backward" format="reference"/>
     <attr name="media_button_forward" format="reference"/>
+	<attr name="media_button_rewind" format="reference"/>
+	<attr name="media_button_fastforward" format="reference"/>
     <attr name="media_button_pause" format="reference"/>
     <attr name="media_button_repeat_off" format="reference"/>
 	<attr name="media_button_repeat_single" format="reference"/>
@@ -14,6 +16,8 @@
 	<attr name="actionbar_pause" format="reference"/>
 	<attr name="actionbar_start" format="reference"/>
 	<attr name="actionbar_stop" format="reference"/>
+	<attr name="actionbar_rewind" format="reference"/>
+	<attr name="actionbar_fastforward" format="reference"/>
 	<attr name="chat_send" format="reference"/>
 	<attr name="add" format="reference"/>
 	<attr name="download_none" format="reference"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4915c012..e86084b0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,6 +4,8 @@
 		<item name="offline_icon">@drawable/main_offline_light</item>
 		<item name="media_button_backward">@drawable/media_backward_light</item>
 		<item name="media_button_forward">@drawable/media_forward_light</item>
+		<item name="media_button_rewind">@drawable/media_rewind_light</item>
+		<item name="media_button_fastforward">@drawable/media_fastforward_light</item>
 		<item name="media_button_pause">@drawable/media_pause_light</item>
 		<item name="media_button_repeat_off">@drawable/media_repeat_off_light</item>
 		<item name="media_button_repeat_single">@drawable/media_repeat_single_light</item>
@@ -15,6 +17,8 @@
 		<item name="actionbar_pause">@drawable/media_pause_dark</item>
 		<item name="actionbar_start">@drawable/media_start_dark</item>
 		<item name="actionbar_stop">@drawable/media_stop_dark</item>
+		<item name="actionbar_rewind">@drawable/media_rewind_dark</item>
+		<item name="actionbar_fastforward">@drawable/media_fastforward_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_light</item>
 		<item name="add">@drawable/ic_action_add_dark</item>
 		<item name="download_none">@drawable/download_none_light</item>
@@ -70,6 +74,8 @@
 		<item name="offline_icon">@drawable/main_offline_dark</item>
 		<item name="media_button_backward">@drawable/media_backward_dark</item>
 		<item name="media_button_forward">@drawable/media_forward_dark</item>
+		<item name="media_button_rewind">@drawable/media_rewind_dark</item>
+		<item name="media_button_fastforward">@drawable/media_fastforward_dark</item>
 		<item name="media_button_pause">@drawable/media_pause_dark</item>
 		<item name="media_button_repeat_off">@drawable/media_repeat_off_dark</item>
 		<item name="media_button_repeat_single">@drawable/media_repeat_single_dark</item>
@@ -81,6 +87,8 @@
 		<item name="actionbar_pause">@drawable/media_pause_dark</item>
 		<item name="actionbar_start">@drawable/media_start_dark</item>
 		<item name="actionbar_stop">@drawable/media_stop_dark</item>
+		<item name="actionbar_rewind">@drawable/media_rewind_dark</item>
+		<item name="actionbar_fastforward">@drawable/media_fastforward_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
 		<item name="add">@drawable/ic_action_add_dark</item>
 		<item name="download_none">@drawable/download_none_dark</item>
@@ -183,6 +191,8 @@
 		<item name="actionbar_pause">@drawable/media_pause_light</item>
 		<item name="actionbar_start">@drawable/media_start_light</item>
 		<item name="actionbar_stop">@drawable/media_stop_light</item>
+		<item name="actionbar_rewind">@drawable/media_rewind_light</item>
+		<item name="actionbar_fastforward">@drawable/media_fastforward_light</item>
 		<item name="add">@drawable/ic_action_add_light</item>
 		<item name="shuffle">@drawable/ic_menu_shuffle_light</item>
 		<item name="refresh">@drawable/ic_menu_refresh_light</item>