Make play queue toolbar theme consistent with rest of app

Author: Isira-Seneviratne

app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java

@@ -4,7 +4,6 @@
 import static org.schabi.newpipe.util.external_communication.ShareUtils.shareText;
 
 import android.content.Context;
-import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.PopupMenu;
 
@@ -30,10 +29,7 @@ public static void openPopupMenu(final PlayQueue playQueue,
                                      final boolean hideDetails,
                                      final FragmentManager fragmentManager,
                                      final Context context) {
-        final ContextThemeWrapper themeWrapper =
-                new ContextThemeWrapper(context, R.style.DarkPopupMenu);
-
-        final PopupMenu popupMenu = new PopupMenu(themeWrapper, view);
+        final PopupMenu popupMenu = new PopupMenu(context, view);
         popupMenu.inflate(R.menu.menu_play_queue_item);
 
         if (hideDetails) {

app/src/main/java/org/schabi/newpipe/player/ui/VideoPlayerUi.java

@@ -41,7 +41,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.graphics.BitmapCompat;
@@ -179,13 +178,10 @@ private void initViews() {
         binding.playbackSeekBar.getProgressDrawable()
                 .setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY));
 
-        final ContextThemeWrapper themeWrapper = new ContextThemeWrapper(context,
-                R.style.DarkPopupMenu);
-
-        qualityPopupMenu = new PopupMenu(themeWrapper, binding.qualityTextView);
-        audioTrackPopupMenu = new PopupMenu(themeWrapper, binding.audioTrackTextView);
+        qualityPopupMenu = new PopupMenu(context, binding.qualityTextView);
+        audioTrackPopupMenu = new PopupMenu(context, binding.audioTrackTextView);
         playbackSpeedPopupMenu = new PopupMenu(context, binding.playbackSpeed);
-        captionPopupMenu = new PopupMenu(themeWrapper, binding.captionTextView);
+        captionPopupMenu = new PopupMenu(context, binding.captionTextView);
 
         binding.progressBarLoadingPanel.getIndeterminateDrawable()
                 .setColorFilter(new PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.MULTIPLY));

app/src/main/res/layout-land/activity_player_queue_control.xml

@@ -11,16 +11,13 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.Material3.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.Material3.ActionBar">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_weight="1"
-            android:background="?attr/colorPrimary"
             app:layout_scrollFlags="scroll|enterAlways"
             app:title="@string/app_name" />
 

app/src/main/res/layout/activity_player_queue_control.xml

@@ -11,16 +11,13 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.Material3.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.Material3.ActionBar">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_weight="1"
-            android:background="?attr/colorPrimary"
             app:layout_scrollFlags="scroll|enterAlways"
             app:title="@string/app_name" />
 

app/src/main/res/values/styles_misc.xml

@@ -66,8 +66,6 @@
         <item name="tint">?attr/actionColor</item>
     </style>
 
-    <style name="DarkPopupMenu" parent="ThemeOverlay.Material3.Dark.ActionBar" />
-
     <style name="ToolbarTheme" parent="ThemeOverlay.Material3.Dark.ActionBar">
         <item name="popupTheme">@style/ToolbarPopupTheme</item>
         <item name="android:textColorPrimary">?attr/actionColor</item>