From c5fe70d6c30d73ece33959afbdd1c7bf21f493ce Mon Sep 17 00:00:00 2001
From: MCelliotG <mcelliotg@gmail.com>
Date: Thu, 6 Feb 2025 05:00:51 +0200
Subject: [PATCH] UI tweaks pt 2

Moved the mute icon next to squelch, but needs resizing to 22x19
Resized aviation, now we have space for date too.
---
 src/comms.cpp | 10 +++++-----
 src/gui.cpp   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/comms.cpp b/src/comms.cpp
index 0e88fb0..aa258c0 100644
--- a/src/comms.cpp
+++ b/src/comms.cpp
@@ -732,7 +732,7 @@ void XDRGTKRoutine() {
 
           case '\0':
             radio.setMute();
-            if (!screenmute) tft.drawBitmap(2, 4, Speaker, 26, 22, PrimaryColor);
+            if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
             if (!screenmute) {
               tft.drawRoundRect(10, 30, 300, 170, 5, ActiveColor);
               tft.fillRoundRect(12, 32, 296, 166, 5, BackgroundColor);
@@ -761,7 +761,7 @@ void XDRGTKRoutine() {
             XDRScan = false;
             if (VolSet != 0) {
               radio.setUnMute();
-              if (!screenmute) tft.drawBitmap(2, 4, Speaker, 26, 22, GreyoutColor);
+              if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
               radio.setVolume(((VolSet * 10) - 40) / 10);
             }
             break;
@@ -799,12 +799,12 @@ void XDRGTKRoutine() {
         VolSet = atoi(buff + 1);
         if (VolSet == 0) {
           radio.setMute();
-          if (!screenmute) tft.drawBitmap(2, 4, Speaker, 26, 22, PrimaryColor);
+          if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, PrimaryColor);
           XDRMute = true;
           SQ = true;
         } else {
           radio.setUnMute();
-          if (!screenmute) tft.drawBitmap(2, 4, Speaker, 26, 22, GreyoutColor);
+          if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
           radio.setVolume((VolSet - 40) / 10);
           XDRMute = false;
         }
@@ -831,7 +831,7 @@ void XDRGTKRoutine() {
         store = true;
         XDRMute = false;
         radio.setUnMute();
-        if (!screenmute) tft.drawBitmap(2, 4, Speaker, 26, 22, GreyoutColor);
+        if (!screenmute) tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
         VolSet = EEPROM.readByte(EE_BYTE_VOLSET);
         LowLevelSet = EEPROM.readByte(EE_BYTE_LOWLEVELSET);
         softmuteam = EEPROM.readByte(EE_BYTE_SOFTMUTEAM);
diff --git a/src/gui.cpp b/src/gui.cpp
index 394696b..eb19475 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -2886,7 +2886,7 @@ void BuildAdvancedRDS() {
   tftPrint(-1, "kHz", 203, 4, ActiveColor, ActiveColorSmooth, 28);
 
   tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor);
-  tft.drawBitmap(2, 4, Speaker, 26, 22, GreyoutColor);
+  tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
 
   if (!StereoToggle) {
     tft.drawCircle(48, 15, 10, SecondaryColor);
@@ -3021,7 +3021,7 @@ void BuildDisplay() {
   tftPrint(-1, unitString[unit], 282, 145, ActiveColor, ActiveColorSmooth, 16);
 
   tft.drawBitmap(70, 5, RDSLogo, 35, 22, GreyoutColor);
-  tft.drawBitmap(2, 4, Speaker, 26, 22, GreyoutColor);
+  tft.drawBitmap(253, 140, Speaker, 26, 22, GreyoutColor);
 
   if (!StereoToggle) {
     tft.drawCircle(48, 15, 10, SecondaryColor);