From 8aef204f688146785e74de7ba446db2fa9b7212e Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Sun, 21 Sep 2025 13:00:23 +0530 Subject: [PATCH] Clean up theming code --- .../newpipe/download/DownloadDialog.java | 2 -- .../local/dialog/PlaylistCreationDialog.java | 20 +++++--------- .../subscription/dialog/FeedGroupDialog.kt | 2 -- .../dialog/FeedGroupReorderDialog.kt | 3 --- .../settings/SelectChannelFragment.java | 8 ------ .../settings/SelectFeedGroupFragment.java | 26 +------------------ .../newpipe/settings/SelectKioskFragment.java | 8 ------ .../org/schabi/newpipe/util/ThemeHelper.java | 23 ---------------- .../res/layout/dialog_feed_group_create.xml | 7 +++-- .../res/layout/item_search_suggestion.xml | 3 +-- app/src/main/res/values/styles.xml | 26 ++++++------------- 11 files changed, 20 insertions(+), 108 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java index 0857fa339..e24246b35 100644 --- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java +++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java @@ -70,7 +70,6 @@ import org.schabi.newpipe.util.SecondaryStreamHelper; 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 class DownloadDialog extends DialogFragment // dialog is being dismissed in onViewCreated() context = getContext(); - setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(context)); Bridge.restoreInstanceState(this, savedInstanceState); this.audioTrackAdapter = new AudioTrackAdapter(wrappedAudioTracks); diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java index 0d5cfac23..24656c938 100644 --- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java +++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java @@ -14,7 +14,6 @@ import org.schabi.newpipe.R; 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 final class PlaylistCreationDialog extends PlaylistDialog { 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(); } } diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt index 0d71beefd..b5aac3192 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt +++ b/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 } diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt index c087da464..be65a5029 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt +++ b/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? { diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java index 2bc5f5396..c70bc5fba 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java @@ -10,7 +10,6 @@ import android.widget.ProgressBar; 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.error.ErrorUtil; 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 class SelectChannelFragment extends DialogFragment { // 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) { diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectFeedGroupFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectFeedGroupFragment.java index 662379369..46d7d7761 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectFeedGroupFragment.java +++ b/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.ProgressBar; 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.R; 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 @@ import io.reactivex.rxjava3.schedulers.Schedulers; */ 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 class SelectFeedGroupFragment extends DialogFragment { 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 class SelectFeedGroupFragment extends DialogFragment { // 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); diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java index 383390506..0bc31741d 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java @@ -8,7 +8,6 @@ import android.widget.ImageView; 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.NewPipe; 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 class SelectKioskFragment extends DialogFragment { // 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) { diff --git a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java index ab74e0305..f6c9c4c3f 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java @@ -90,29 +90,6 @@ public final class ThemeHelper { && !isDeviceDarkThemeEnabled(context)); } - /** - * Return a dialog theme styled according to the (default) selected theme. - * - * @param context context to get the selected theme - * @return the dialog style (the default one) - */ - @StyleRes - public static int getDialogTheme(final Context context) { - return isLightThemeSelected(context) ? R.style.LightDialogTheme : R.style.DarkDialogTheme; - } - - /** - * Return a min-width dialog theme styled according to the (default) selected theme. - * - * @param context context to get the selected theme - * @return the dialog style (the default one) - */ - @StyleRes - public static int getMinWidthDialogTheme(final Context context) { - return isLightThemeSelected(context) ? R.style.LightDialogMinWidthTheme - : R.style.DarkDialogMinWidthTheme; - } - /** * Return the selected theme styled according to the serviceId. * diff --git a/app/src/main/res/layout/dialog_feed_group_create.xml b/app/src/main/res/layout/dialog_feed_group_create.xml index 464940238..5a7af08b0 100644 --- a/app/src/main/res/layout/dialog_feed_group_create.xml +++ b/app/src/main/res/layout/dialog_feed_group_create.xml @@ -70,7 +70,7 @@