From 840bb29c542c797123eede58c15b3482a7e47bb6 Mon Sep 17 00:00:00 2001
From: karol <karkaminski@gmail.com>
Date: Tue, 3 Mar 2020 00:01:19 +0100
Subject: [PATCH] icon color change in action bar

---
 .../newpipe/player/ServicePlayerActivity.java | 25 ++++++++++++++++---
 .../res/drawable/ic_volume_off_gray_24dp.xml  |  5 ++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_volume_off_gray_24dp.xml

diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
index 9099c9927..75107a7e4 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -3,15 +3,19 @@ package org.schabi.newpipe.player;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.Settings;
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.ItemTouchHelper;
+
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -94,6 +98,8 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
     private TextView playbackSpeedButton;
     private TextView playbackPitchButton;
 
+    private Menu menu;
+
     ////////////////////////////////////////////////////////////////////////////
     // Abstracts
     ////////////////////////////////////////////////////////////////////////////
@@ -147,8 +153,10 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+        this.menu = menu;
         getMenuInflater().inflate(R.menu.menu_play_queue, menu);
         getMenuInflater().inflate(getPlayerOptionMenuResource(), menu);
+        onMaybeMuteChanged();
         return true;
     }
 
@@ -174,8 +182,8 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
                 this.player.setRecovery();
                 getApplicationContext().sendBroadcast(getPlayerShutdownIntent());
                 getApplicationContext().startActivity(
-                    getSwitchIntent(MainVideoPlayer.class)
-                        .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
+                        getSwitchIntent(MainVideoPlayer.class)
+                                .putExtra(BasePlayer.START_PAUSED, !this.player.isPlaying())
                 );
                 return true;
         }
@@ -218,7 +226,7 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
     }
 
     private void unbind() {
-        if(serviceBound) {
+        if (serviceBound) {
             unbindService(serviceConnection);
             serviceBound = false;
             stopPlayerListener();
@@ -689,7 +697,16 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
         }
     }
 
-    private void onMaybeMuteChanged(){
+    private void onMaybeMuteChanged() {
         muteButton.setColorFilter(ContextCompat.getColor(getApplicationContext(), player.isMuted() ? R.color.white : R.color.gray));
+
+        if (menu != null) {
+            MenuItem item = menu.findItem(R.id.action_mute);
+            TypedArray a = getTheme().obtainStyledAttributes(R.style.Theme_AppCompat, new int[]{R.attr.volume_off});
+            int attributeResourceId = a.getResourceId(0, 0);
+            Drawable drawableMuted = getResources().getDrawable(attributeResourceId);
+            Drawable drawableUnmuted = getResources().getDrawable(R.drawable.ic_volume_off_gray_24dp);
+            item.setIcon(player.isMuted() ? drawableMuted : drawableUnmuted);
+        }
     }
 }
diff --git a/app/src/main/res/drawable/ic_volume_off_gray_24dp.xml b/app/src/main/res/drawable/ic_volume_off_gray_24dp.xml
new file mode 100644
index 000000000..156ee53bb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_volume_off_gray_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#515151"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/gray" android:pathData="M16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v2.21l2.45,2.45c0.03,-0.2 0.05,-0.41 0.05,-0.63zM19,12c0,0.94 -0.2,1.82 -0.54,2.64l1.51,1.51C20.63,14.91 21,13.5 21,12c0,-4.28 -2.99,-7.86 -7,-8.77v2.06c2.89,0.86 5,3.54 5,6.71zM4.27,3L3,4.27 7.73,9L3,9v6h4l5,5v-6.73l4.25,4.25c-0.67,0.52 -1.42,0.93 -2.25,1.18v2.06c1.38,-0.31 2.63,-0.95 3.69,-1.81L19.73,21 21,19.73l-9,-9L4.27,3zM12,4L9.91,6.09 12,8.18L12,4z"/>
+</vector>