From 087f613d60d242602737a2f1872c04badd70d1a3 Mon Sep 17 00:00:00 2001
From: Wayne Chen <chen.wayne@outlook.com>
Date: Thu, 28 Feb 2019 16:48:17 -0800
Subject: [PATCH] fixing muted text

---
 .../icons/tablet-icons/mic-clip-i.svg         |  9 ++-
 .../resources/icons/tablet-icons/mic-mute.svg | 60 -------------------
 .../icons/tablet-icons/mic-unmute-i.svg       | 23 +------
 .../qml/hifi/audio/MicBarApplication.qml      |  6 +-
 4 files changed, 11 insertions(+), 87 deletions(-)
 delete mode 100644 interface/resources/icons/tablet-icons/mic-mute.svg

diff --git a/interface/resources/icons/tablet-icons/mic-clip-i.svg b/interface/resources/icons/tablet-icons/mic-clip-i.svg
index d6f36427a9..8bc1b2b558 100644
--- a/interface/resources/icons/tablet-icons/mic-clip-i.svg
+++ b/interface/resources/icons/tablet-icons/mic-clip-i.svg
@@ -1,3 +1,10 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22.8958 6.35833L21.7042 7.55C20.1333 5.81667 17.9125 4.67917 15.3667 4.67917C12.9292 4.67917 10.7625 5.7625 9.19167 7.3875L8 6.19583C9.84167 4.24583 12.4958 3 15.3667 3C18.3458 3 21.0542 4.3 22.8958 6.35833ZM20.1335 9.12086L18.9419 10.3125C18.1294 9.22919 16.8294 8.57919 15.3669 8.57919C14.0127 8.57919 12.821 9.22919 11.9544 10.15L10.7627 8.95836C11.9002 7.71252 13.5252 6.90002 15.3669 6.90002C17.2627 6.90002 18.996 7.76669 20.1335 9.12086ZM16.9006 27.4961C16.9006 28.3245 16.2291 28.9961 15.4006 28.9961C14.5722 28.9961 13.9006 28.3245 13.9006 27.4961C13.9006 26.6677 14.5722 25.9961 15.4006 25.9961C16.2291 25.9961 16.9006 26.6677 16.9006 27.4961ZM17.2301 12H13.8157L14.5077 24.0005H16.5182L17.2301 12Z" fill="#EA4C5F" fill-opacity="0.5"/>
+<g clip-path="url(#clip0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.6171 4.13055L23.1501 5.59762C21.2162 3.4637 18.4821 2.06332 15.3479 2.06332C12.3471 2.06332 9.67973 3.39702 7.74587 5.39756L6.27881 3.9305C8.54609 1.52984 11.8136 -0.00390625 15.3479 -0.00390625C19.0156 -0.00390625 22.3499 1.59653 24.6171 4.13055ZM21.2164 7.53196L19.7494 8.99903C18.7491 7.66533 17.1487 6.86511 15.3482 6.86511C13.6811 6.86511 12.214 7.66533 11.147 8.79897L9.67998 7.33191C11.0804 5.79815 13.0809 4.79788 15.3482 4.79788C17.6822 4.79788 19.8161 5.86484 21.2164 7.53196ZM17.2364 30.1533C17.2364 31.1732 16.4096 32 15.3898 32C14.3699 32 13.5431 31.1732 13.5431 30.1533C13.5431 29.1335 14.3699 28.3067 15.3898 28.3067C16.4096 28.3067 17.2364 29.1335 17.2364 30.1533ZM17.642 11.076H13.4385L14.2904 25.8499H16.7656L17.642 11.076Z" fill="#EA4C5F" fill-opacity="0.5"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
 </svg>
diff --git a/interface/resources/icons/tablet-icons/mic-mute.svg b/interface/resources/icons/tablet-icons/mic-mute.svg
deleted file mode 100644
index bd42fded05..0000000000
--- a/interface/resources/icons/tablet-icons/mic-mute.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 40 40"
-   style="enable-background:new 0 0 40 40;"
-   xml:space="preserve"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="mic-mute.svg"><metadata
-     id="metadata6958"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs6956" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1824"
-     inkscape:window-height="1057"
-     id="namedview6954"
-     showgrid="false"
-     inkscape:zoom="5.9"
-     inkscape:cx="-40.338983"
-     inkscape:cy="20"
-     inkscape:window-x="88"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><style
-     type="text/css"
-     id="style6942">
-	.st0{fill:#FFFFFF;}
-</style><ellipse
-     style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-     id="path8048"
-     cx="20.1"
-     cy="20.5"
-     rx="15.967586"
-     ry="15.967585" /><rect
-     style="fill:#ffffff;fill-opacity:1;stroke:#feffff;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-     id="rect8065"
-     width="30.1991"
-     height="2.9999897"
-     x="13.432917"
-     y="-1.2235159"
-     transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" /></svg>
\ No newline at end of file
diff --git a/interface/resources/icons/tablet-icons/mic-unmute-i.svg b/interface/resources/icons/tablet-icons/mic-unmute-i.svg
index c4eda55cbc..f577a65bc2 100644
--- a/interface/resources/icons/tablet-icons/mic-unmute-i.svg
+++ b/interface/resources/icons/tablet-icons/mic-unmute-i.svg
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<g id="Layer_2">
-</g>
-<g id="Layer_1">
-	<path class="st0" d="M31.4,14.1l2.2-2.2c-2.1-2.5-5.3-4.1-8.8-4.1c-3.4,0-6.4,1.5-8.5,3.8c0.7,0.7,1.5,1.5,2.2,2.2
-		c1.6-1.7,3.8-2.9,6.3-2.9C27.5,10.9,29.9,12.1,31.4,14.1z"/>
-	<path class="st0" d="M36.5,9l2.2-2.2C35.3,3,30.3,0.6,24.8,0.6c-5.3,0-10.2,2.3-13.6,5.9c0.7,0.7,1.5,1.5,2.2,2.2
-		c2.9-3,6.9-5,11.4-5C29.5,3.7,33.6,5.8,36.5,9z"/>
-	<path class="st0" d="M28.5,22.7v-4.4c0-2-1.6-3.6-3.7-3.6h0c-2,0-3.7,1.6-3.7,3.6v4.4H28.5z"/>
-	<path class="st0" d="M21.1,26.5v4.3c0,2,1.7,3.6,3.7,3.6h0c2,0,3.7-1.6,3.7-3.6v-4.3H21.1z"/>
-	<path class="st0" d="M36,31.5c0-0.1,0-5.1,0-5.3c0-1-0.9-1.7-1.8-1.7c-1,0-1.7,0.8-1.7,1.8c0,0.3,0,4.8,0,5.2
-		c0,3.7-3.4,6.7-7.5,6.7c-4.1,0-7.5-3-7.5-6.7c0-0.4,0-4.9,0-5.3c0-1-0.7-1.8-1.6-1.8C14.9,24.3,14,25,14,26c0,0.3,0,5.4,0,5.5
-		c0,5.1,4,9.3,9.2,10.1l0,3.4h-4.3c-1,0-1.8,0.8-1.8,1.8c0,1,0.8,1.8,1.8,1.8h12.3c1,0,1.8-0.8,1.8-1.8c0-1-0.8-1.8-1.8-1.8h-4.4
-		l0-3.4C32,40.7,36,36.6,36,31.5z"/>
-</g>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.1477 5.60011L24.6143 4.13346C22.3477 1.60016 19.0144 0.000183105 15.3478 0.000183105C11.8145 0.000183105 8.54789 1.5335 6.28125 3.93346L7.7479 5.40011C9.6812 3.40014 12.3478 2.06682 15.3478 2.06682C18.4811 2.06682 21.2144 3.4668 23.1477 5.60011ZM19.7477 9.00007L21.2144 7.53342C19.8144 5.86677 17.6811 4.80012 15.3478 4.80012C13.0812 4.80012 11.0812 5.80011 9.68121 7.33342L11.1479 8.80007C12.2145 7.66675 13.6812 6.86676 15.3478 6.86676C17.1478 6.86676 18.7478 7.66675 19.7477 9.00007ZM17.8144 11.8V14.7333H12.8812V11.8C12.8812 10.4667 14.0145 9.40007 15.3478 9.40007C16.7478 9.40007 17.8144 10.4667 17.8144 11.8ZM12.8812 17.2666V20.1333C12.8812 21.4666 14.0145 22.5332 15.3478 22.5332C16.6811 22.5332 17.8144 21.4666 17.8144 20.1333V17.2666H12.8812ZM22.8145 17.0667V20.6C22.8145 24 20.1479 26.7333 16.6812 27.3332V29.5999H19.6145C20.2812 29.5999 20.8145 30.1332 20.8145 30.7999C20.8145 31.4665 20.2812 31.9998 19.6145 31.9998H11.4146C10.748 31.9998 10.2147 31.4665 10.2147 30.7999C10.2147 30.1332 10.748 29.5999 11.4146 29.5999H14.2813V27.3332C10.8147 26.7999 8.14802 24 8.14802 20.6V16.9334C8.14802 16.2667 8.74801 15.8001 9.41467 15.8667C10.0147 15.8667 10.4813 16.4001 10.4813 17.0667V20.6C10.4813 23.0666 12.748 25.0666 15.4813 25.0666C18.2146 25.0666 20.4812 23.0666 20.4812 20.6V17.1334C20.4812 16.4667 20.9478 15.9334 21.6145 15.9334C22.2145 15.9334 22.8145 16.4001 22.8145 17.0667Z" fill="white" fill-opacity="0.5"/>
 </svg>
diff --git a/interface/resources/qml/hifi/audio/MicBarApplication.qml b/interface/resources/qml/hifi/audio/MicBarApplication.qml
index 451f410e1d..2bf49aa83b 100644
--- a/interface/resources/qml/hifi/audio/MicBarApplication.qml
+++ b/interface/resources/qml/hifi/audio/MicBarApplication.qml
@@ -124,7 +124,6 @@ Rectangle {
                 height: 32;
                 anchors {
                     left: parent.left;
-                    leftMargin: 7;
                     top: parent.top;
                     topMargin: 5;
                 }
@@ -142,10 +141,7 @@ Rectangle {
     Item {
         id: status;
 
-        readonly property string color: colors.muted;
-
         visible: muted && (level >= userSpeakingLevel);
-        opacity: 0.9
 
         anchors {
             left: parent.left;
@@ -162,7 +158,7 @@ Rectangle {
                 verticalCenter: parent.verticalCenter;
             }
 
-            color: parent.color;
+            color: colors.mutedColor;
 
             text: "MUTED";
             size: 12;