From a06cb85f9ea4ae1aaeed15b9731801da0f882b0b Mon Sep 17 00:00:00 2001
From: RebeccaStankus <Rebecca@highfidelity.io>
Date: Thu, 15 Aug 2019 17:20:27 -0700
Subject: [PATCH] Indicator image swapping

---
 .../simplifiedUI/simplifiedEmote/simplifiedEmote.js |  8 ++++++++
 .../ui/qml/SimplifiedEmoteIndicator.qml             | 13 +++++++------
 .../qml/images/{clap_Icon.svg => applaud_Icon.svg}  |  0
 .../qml/images/{sad_Icon.svg => negative_Icon.svg}  |  0
 .../images/{happy_Icon.svg => positive_Icon.svg}    |  0
 5 files changed, 15 insertions(+), 6 deletions(-)
 rename scripts/simplifiedUI/simplifiedEmote/ui/qml/images/{clap_Icon.svg => applaud_Icon.svg} (100%)
 rename scripts/simplifiedUI/simplifiedEmote/ui/qml/images/{sad_Icon.svg => negative_Icon.svg} (100%)
 rename scripts/simplifiedUI/simplifiedEmote/ui/qml/images/{happy_Icon.svg => positive_Icon.svg} (100%)

diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
index 07275775e7..59fb88e54b 100644
--- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
+++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
@@ -131,6 +131,13 @@ function toggleReaction(reaction) {
 
     if (reactionEnding) {
         endReactionWrapper(reaction);
+        emoteAppBarWindow.sendToQml({
+            "source": "simplifiedEmote.js",
+            "method": "updateEmoteIndicator",
+            "data": {
+                "icon": "emote"
+            }
+        });
     } else {
         beginReactionWrapper(reaction);
     }
@@ -215,6 +222,7 @@ function onMessageFromEmoteAppBar(message) {
             console.log("Unrecognized message from " + EMOTE_APP_BAR_MESSAGE_SOURCE + ": " + JSON.stringify(message));
             break;
     }
+
     emoteAppBarWindow.sendToQml({
         "source": "simplifiedEmote.js",
         "method": "updateEmoteIndicator",
diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
index 0ad22df9c1..4de13d639e 100644
--- a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
+++ b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
@@ -65,7 +65,6 @@ Rectangle {
 
         ColorOverlay {
             anchors.fill: emoteIndicator
-            opacity: emoteIndicatorMouseArea.containsMouse ? 1.0 : 0.7
             source: emoteIndicator
             color: "#ffffff"
         }
@@ -98,10 +97,10 @@ Rectangle {
             id: emoteButtonsRepeater
             model: ListModel {
                 id: buttonsModel
-                ListElement { imageURL: "images/happy_Icon.svg"; method: "positive" }
-                ListElement { imageURL: "images/sad_Icon.svg"; method: "negative" }
+                ListElement { imageURL: "images/positive_Icon.svg"; method: "positive" }
+                ListElement { imageURL: "images/negative_Icon.svg"; method: "negative" }
                 ListElement { imageURL: "images/raiseHand_Icon.svg"; method: "raiseHand" }
-                ListElement { imageURL: "images/clap_Icon.svg"; method: "applaud" }
+                ListElement { imageURL: "images/applaud_Icon.svg"; method: "applaud" }
                 ListElement { imageURL: "images/point_Icon.svg"; method: "point" }
                 ListElement { imageURL: "images/emote_Icon.svg"; method: "toggleEmojiApp" }
             }
@@ -157,10 +156,12 @@ Rectangle {
         switch (message.method) {
             case "updateEmoteIndicator":
                 if (message.data.icon) {
-                print("UPDATING EMOTE INDICATOR");
-                    emoteIndicator.text = message.data.icon[0];
+                print("CHANGING INDICATOR TO: ", message.data.icon);
+                    var imageURL = "images/" + message.data.icon + "_Icon.svg";
+                    emoteIndicator.source = imageURL;
                 }
                 break;
+
             default:
                 print("MESSAGE TO THE EMOTE INDICATOR QML RECEIVED: ", JSON.stringify(message));
                 console.log('SimplifiedEmoteIndicator.qml: Unrecognized message from JS');
diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/clap_Icon.svg b/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/applaud_Icon.svg
similarity index 100%
rename from scripts/simplifiedUI/simplifiedEmote/ui/qml/images/clap_Icon.svg
rename to scripts/simplifiedUI/simplifiedEmote/ui/qml/images/applaud_Icon.svg
diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/sad_Icon.svg b/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/negative_Icon.svg
similarity index 100%
rename from scripts/simplifiedUI/simplifiedEmote/ui/qml/images/sad_Icon.svg
rename to scripts/simplifiedUI/simplifiedEmote/ui/qml/images/negative_Icon.svg
diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/happy_Icon.svg b/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/positive_Icon.svg
similarity index 100%
rename from scripts/simplifiedUI/simplifiedEmote/ui/qml/images/happy_Icon.svg
rename to scripts/simplifiedUI/simplifiedEmote/ui/qml/images/positive_Icon.svg