Migrate XML-based views to Material 3

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/about/AboutActivity.kt

@@ -9,9 +9,11 @@ import org.schabi.newpipe.R
 import org.schabi.newpipe.ui.components.common.ScaffoldWithToolbar
 import org.schabi.newpipe.ui.screens.AboutScreen
 import org.schabi.newpipe.ui.theme.AppTheme
+import org.schabi.newpipe.util.ThemeHelper
 
 class AboutActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(ThemeHelper.getTheme(this))
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

@@ -70,7 +70,6 @@
 import org.schabi.newpipe.util.SimpleOnSeekBarChangeListener;
 import org.schabi.newpipe.util.StreamItemAdapter;
 import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper;
-import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.File;
 import java.io.IOException;
@@ -212,7 +211,6 @@ public void onCreate(@Nullable final Bundle savedInstanceState) {
         // dialog is being dismissed in onViewCreated()
         context = getContext();
 
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context));
         Bridge.restoreInstanceState(this, savedInstanceState);
 
         this.audioTrackAdapter = new AudioTrackAdapter(wrappedAudioTracks);

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

@@ -9,8 +9,6 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -21,7 +19,6 @@
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -44,7 +41,6 @@
 import org.schabi.newpipe.settings.tabs.TabsManager;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.views.ScrollableTabLayout;
 
 import java.util.ArrayList;
@@ -242,18 +238,6 @@ private void updateTabLayoutPosition() {
 
         tabLayout.setLayoutParams(tabParams);
         viewPager.setLayoutParams(pagerParams);
-
-        // change the background and icon color of the tab layout:
-        // service-colored at the top, app-background-colored at the bottom
-        tabLayout.setBackgroundColor(ThemeHelper.resolveColorFromAttr(requireContext(),
-                bottom ? android.R.attr.windowBackground : R.attr.colorPrimary));
-
-        @ColorInt final int iconColor = bottom
-                ? ThemeHelper.resolveColorFromAttr(requireContext(), android.R.attr.colorAccent)
-                : Color.WHITE;
-        tabLayout.setTabRippleColor(ColorStateList.valueOf(iconColor).withAlpha(32));
-        tabLayout.setTabIconTint(ColorStateList.valueOf(iconColor));
-        tabLayout.setSelectedTabIndicatorColor(iconColor);
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt

@@ -9,8 +9,8 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.content.pm.ActivityInfo
+import android.content.res.ColorStateList
 import android.database.ContentObserver
-import android.graphics.Color
 import android.graphics.Rect
 import android.os.Build
 import android.os.Bundle
@@ -44,6 +44,7 @@ import androidx.core.net.toUri
 import androidx.core.os.postDelayed
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.widget.ImageViewCompat
 import androidx.preference.PreferenceManager
 import coil3.util.CoilUtils
 import com.evernote.android.state.State
@@ -269,7 +270,7 @@ class VideoDetailFragment :
     ): View {
         val newBinding = FragmentVideoDetailBinding.inflate(inflater, container, false)
         nullableBinding = newBinding
-        return newBinding.getRoot()
+        return newBinding.root
     }
 
     override fun onPause() {
@@ -555,6 +556,13 @@ class VideoDetailFragment :
         binding.viewPager.setAdapter(pageAdapter)
         binding.tabLayout.setupWithViewPager(binding.viewPager)
 
+        val controlTint = ColorStateList.valueOf(
+            ThemeHelper.resolveColorFromAttr(activity, android.R.attr.colorPrimary)
+        )
+        ImageViewCompat.setImageTintList(binding.overlayPlayPauseButton, controlTint)
+        ImageViewCompat.setImageTintList(binding.overlayPlayQueueButton, controlTint)
+        ImageViewCompat.setImageTintList(binding.overlayCloseButton, controlTint)
+
         binding.detailThumbnailRootLayout.requestFocus()
 
         binding.detailControlsPlayWithKodi.isVisible =
@@ -1785,9 +1793,6 @@ class VideoDetailFragment :
         }
         activity.window.decorView.systemUiVisibility = 0
         activity.window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-        activity.window.statusBarColor = ThemeHelper.resolveColorFromAttr(
-            requireContext(), android.R.attr.colorPrimary
-        )
     }
 
     private fun hideSystemUi() {
@@ -1819,11 +1824,6 @@ class VideoDetailFragment :
             visibility = visibility or View.SYSTEM_UI_FLAG_FULLSCREEN
         }
         activity.window.decorView.systemUiVisibility = visibility
-
-        if (isInMultiWindow || this.isFullscreen) {
-            activity.window.statusBarColor = Color.TRANSPARENT
-            activity.window.navigationBarColor = Color.TRANSPARENT
-        }
         activity.window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
     }
 

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java

@@ -14,7 +14,6 @@
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.DialogEditTextBinding;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
-import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.List;
 
@@ -45,30 +44,25 @@ public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
             return super.onCreateDialog(savedInstanceState);
         }
 
-        final DialogEditTextBinding dialogBinding =
-                DialogEditTextBinding.inflate(getLayoutInflater());
-        dialogBinding.getRoot().getContext().setTheme(ThemeHelper.getDialogTheme(requireContext()));
+        final var dialogBinding = DialogEditTextBinding.inflate(getLayoutInflater());
         dialogBinding.dialogEditText.setHint(R.string.name);
         dialogBinding.dialogEditText.setInputType(InputType.TYPE_CLASS_TEXT);
 
-        final Builder dialogBuilder = new Builder(requireContext(),
-                ThemeHelper.getDialogTheme(requireContext()))
+        return new Builder(requireContext())
                 .setTitle(R.string.create_playlist)
                 .setView(dialogBinding.getRoot())
                 .setCancelable(true)
                 .setNegativeButton(R.string.cancel, null)
                 .setPositiveButton(R.string.create, (dialogInterface, i) -> {
                     final String name = dialogBinding.dialogEditText.getText().toString();
-                    final LocalPlaylistManager playlistManager =
-                            new LocalPlaylistManager(NewPipeDatabase.getInstance(requireContext()));
+                    final var db = NewPipeDatabase.getInstance(requireContext());
                     final Toast successToast = Toast.makeText(getActivity(),
-                            R.string.playlist_creation_success,
-                            Toast.LENGTH_SHORT);
+                            R.string.playlist_creation_success, Toast.LENGTH_SHORT);
 
-                    playlistManager.createPlaylist(name, getStreamEntities())
+                    new LocalPlaylistManager(db).createPlaylist(name, getStreamEntities())
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(longs -> successToast.show());
-                });
-        return dialogBuilder.create();
+                })
+                .create();
     }
 }

app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt

@@ -39,7 +39,6 @@ import org.schabi.newpipe.local.subscription.item.ImportSubscriptionsHintPlaceho
 import org.schabi.newpipe.local.subscription.item.PickerIconItem
 import org.schabi.newpipe.local.subscription.item.PickerSubscriptionItem
 import org.schabi.newpipe.util.DeviceUtils
-import org.schabi.newpipe.util.ThemeHelper
 import java.io.Serializable
 
 class FeedGroupDialog : DialogFragment(), BackPressable {
@@ -80,7 +79,6 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
         super.onCreate(savedInstanceState)
         Bridge.restoreInstanceState(this, savedInstanceState)
 
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()))
         groupId = arguments?.getLong(KEY_GROUP_ID, NO_GROUP_SELECTED) ?: NO_GROUP_SELECTED
     }
 

app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt

@@ -21,7 +21,6 @@ import org.schabi.newpipe.databinding.DialogFeedGroupReorderBinding
 import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewModel.DialogEvent.ProcessingEvent
 import org.schabi.newpipe.local.subscription.dialog.FeedGroupReorderDialogViewModel.DialogEvent.SuccessEvent
 import org.schabi.newpipe.local.subscription.item.FeedGroupReorderItem
-import org.schabi.newpipe.util.ThemeHelper
 import java.util.Collections
 
 class FeedGroupReorderDialog : DialogFragment() {
@@ -39,8 +38,6 @@ class FeedGroupReorderDialog : DialogFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Bridge.restoreInstanceState(this, savedInstanceState)
-
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()))
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

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/java/org/schabi/newpipe/settings/SelectChannelFragment.java

@@ -10,7 +10,6 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.compose.ui.platform.ComposeView;
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -22,7 +21,6 @@
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
 import org.schabi.newpipe.ui.emptystate.EmptyStateSpec;
 import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
-import org.schabi.newpipe.util.ThemeHelper;
 import org.schabi.newpipe.util.image.CoilHelper;
 
 import java.util.List;
@@ -77,12 +75,6 @@ public void setOnCancelListener(final OnCancelListener listener) {
     // Init
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()));
-    }
-
     @Override
     public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
                              final Bundle savedInstanceState) {

app/src/main/java/org/schabi/newpipe/settings/SelectFeedGroupFragment.java

@@ -1,6 +1,5 @@
 package org.schabi.newpipe.settings;
 
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,7 +9,6 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -20,7 +18,6 @@
 import org.schabi.newpipe.database.AppDatabase;
 import org.schabi.newpipe.database.feed.model.FeedGroupEntity;
 import org.schabi.newpipe.error.ErrorUtil;
-import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.List;
 import java.util.Vector;
@@ -52,10 +49,7 @@
  */
 
 public class SelectFeedGroupFragment extends DialogFragment {
-
-    private OnSelectedListener onSelectedListener = null;
-    private OnCancelListener onCancelListener = null;
-
+    private OnSelectedListener onSelectedListener;
     private ProgressBar progressBar;
     private TextView emptyView;
     private RecyclerView recyclerView;
@@ -66,20 +60,10 @@ public void setOnSelectedListener(final OnSelectedListener listener) {
         onSelectedListener = listener;
     }
 
-    public void setOnCancelListener(final OnCancelListener listener) {
-        onCancelListener = listener;
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Init
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()));
-    }
-
     @Override
     public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
                              final Bundle savedInstanceState) {
@@ -109,14 +93,6 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup
     // Handle actions
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    public void onCancel(@NonNull final DialogInterface dialogInterface) {
-        super.onCancel(dialogInterface);
-        if (onCancelListener != null) {
-            onCancelListener.onCancel();
-        }
-    }
-
     private void clickedItem(final int position) {
         if (onSelectedListener != null) {
             final FeedGroupEntity entry = feedGroups.get(position);

app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java

@@ -8,7 +8,6 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.fragment.app.DialogFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -20,7 +19,6 @@
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.List;
 import java.util.Vector;
@@ -59,12 +57,6 @@ public void setOnSelectedListener(final OnSelectedListener listener) {
     // Init
     //////////////////////////////////////////////////////////////////////////*/
 
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setStyle(STYLE_NO_TITLE, ThemeHelper.getMinWidthDialogTheme(requireContext()));
-    }
-
     @Override
     public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
                              final Bundle savedInstanceState) {

app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java

@@ -86,9 +86,9 @@ public class SettingsActivity extends AppCompatActivity implements
 
     @Override
     protected void onCreate(final Bundle savedInstanceBundle) {
-        setTheme(ThemeHelper.getSettingsThemeStyle(this));
-
+        setTheme(ThemeHelper.getTheme(this));
         super.onCreate(savedInstanceBundle);
+
         Bridge.restoreInstanceState(this, savedInstanceBundle);
         final boolean restored = savedInstanceBundle != null;