From 9aaaf205773d6c2f637efff7b02ccfbb34700e9d Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 13 Jan 2019 17:57:15 +0100
Subject: [PATCH] Replace pause and play buttons with combined pause/play

The separate pause and play buttons necessitated changing between them
to signal that state had changed. Replacing it with a combined
pause/play button sidesteps all the issues in syncing up when which icon
should be shown.
---
 src/res/qml/media_keys/MediaControllerKeys.qml  | 17 ++---------------
 .../qml/media_keys/outline_pause_white_24dp.svg |  1 -
 .../outline_play_arrow_white_24dp.svg           |  1 -
 .../outline_play_pause_white_24dp.svg           | 12 ++++++++++++
 4 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 src/res/qml/media_keys/outline_pause_white_24dp.svg
 delete mode 100644 src/res/qml/media_keys/outline_play_arrow_white_24dp.svg
 create mode 100644 src/res/qml/media_keys/outline_play_pause_white_24dp.svg

diff --git a/src/res/qml/media_keys/MediaControllerKeys.qml b/src/res/qml/media_keys/MediaControllerKeys.qml
index 3381950..d81da5f 100644
--- a/src/res/qml/media_keys/MediaControllerKeys.qml
+++ b/src/res/qml/media_keys/MediaControllerKeys.qml
@@ -26,10 +26,7 @@ GroupBox {
         }
 
         RowLayout {
-            property bool playButtonIsPlay: false
-
-            property string playButtonPath: "outline_play_arrow_white_24dp.svg"
-            property string pauseButtonPath: "outline_pause_white_24dp.svg"
+            property string playPauseButtonPath: "outline_play_pause_white_24dp.svg"
             property string stopButtonPath: "outline_stop_white_24dp.svg"
             property string previousButtonPath: "outline_skip_previous_white_24dp.svg"
             property string nextButtonPath: "outline_skip_next_white_24dp.svg"
@@ -47,24 +44,14 @@ GroupBox {
                 imagePath: parent.stopButtonPath
                 onClicked: {
                     UtilitiesTabController.sendMediaStopSong()
-                    playPauseSongButton.contentItem.source = parent.playButtonPath
-                    parent.playButtonIsPlay = true
                 }
             }
 
             MediaButton {
                 id: playPauseSongButton
-                imagePath: parent.pauseButtonPath
+                imagePath: parent.playPauseButtonPath
                 onClicked: {
                     UtilitiesTabController.sendMediaPausePlay()
-                    if (parent.playButtonIsPlay) {
-                        playPauseSongButton.contentItem.source = parent.pauseButtonPath
-                        parent.playButtonIsPlay = false
-                    } else {
-                        playPauseSongButton.contentItem.source = parent.playButtonPath
-                        parent.playButtonIsPlay = true
-                    }
-
                 }
             }
 
diff --git a/src/res/qml/media_keys/outline_pause_white_24dp.svg b/src/res/qml/media_keys/outline_pause_white_24dp.svg
deleted file mode 100644
index f59d7c9..0000000
--- a/src/res/qml/media_keys/outline_pause_white_24dp.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path fill="white" d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/></svg>
\ No newline at end of file
diff --git a/src/res/qml/media_keys/outline_play_arrow_white_24dp.svg b/src/res/qml/media_keys/outline_play_arrow_white_24dp.svg
deleted file mode 100644
index 2b248b9..0000000
--- a/src/res/qml/media_keys/outline_play_arrow_white_24dp.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path fill="white" d="M10 8.64L15.27 12 10 15.36V8.64M8 5v14l11-7L8 5z"/></svg>
\ No newline at end of file
diff --git a/src/res/qml/media_keys/outline_play_pause_white_24dp.svg b/src/res/qml/media_keys/outline_play_pause_white_24dp.svg
new file mode 100644
index 0000000..03a3ca1
--- /dev/null
+++ b/src/res/qml/media_keys/outline_play_pause_white_24dp.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M0,0h24v24H0V0z"/>
+<path class="st1" d="M5,8.6l5.3,3.4L5,15.4V8.6 M3,5v14l11-7L3,5z"/>
+<path class="st1" d="M14,19h2.3V5H14V19z M18.7,5v14H21V5H18.7z"/>
+</svg>