From 51837ce36f512f0469acbc7fec7f63f3b6280522 Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Sat, 16 Oct 2021 15:33:45 -0400
Subject: [PATCH] Get rid of setUserVisibleHint
---
.../java/org/schabi/newpipe/BaseFragment.java | 10 +---------
.../newpipe/fragments/BlankFragment.java | 4 ++--
.../list/channel/ChannelFragment.java | 8 +++-----
.../fragments/list/kiosk/KioskFragment.java | 18 ++++++------------
.../local/bookmark/BookmarkFragment.java | 6 +++---
.../history/StatisticsPlaylistFragment.java | 6 +++---
.../SubscriptionsImportFragment.java | 8 +++-----
7 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/app/src/main/java/org/schabi/newpipe/BaseFragment.java b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
index 0be427648..16ddb8376 100644
--- a/app/src/main/java/org/schabi/newpipe/BaseFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/BaseFragment.java
@@ -21,7 +21,6 @@ public abstract class BaseFragment extends Fragment {
//These values are used for controlling fragments when they are part of the frontpage
@State
protected boolean useAsFrontPage = false;
- private boolean mIsVisibleToUser = false;
public void useAsFrontPage(final boolean value) {
useAsFrontPage = value;
@@ -85,12 +84,6 @@ public abstract class BaseFragment extends Fragment {
AppWatcher.INSTANCE.getObjectWatcher().watch(this);
}
- @Override
- public void setUserVisibleHint(final boolean isVisibleToUser) {
- super.setUserVisibleHint(isVisibleToUser);
- mIsVisibleToUser = isVisibleToUser;
- }
-
/*//////////////////////////////////////////////////////////////////////////
// Init
//////////////////////////////////////////////////////////////////////////*/
@@ -109,8 +102,7 @@ public abstract class BaseFragment extends Fragment {
if (DEBUG) {
Log.d(TAG, "setTitle() called with: title = [" + title + "]");
}
- if ((!useAsFrontPage || mIsVisibleToUser)
- && (activity != null && activity.getSupportActionBar() != null)) {
+ if (!useAsFrontPage && activity != null && activity.getSupportActionBar() != null) {
activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
activity.getSupportActionBar().setTitle(title);
}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
index 0cccfa4fe..fe4eef37a 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java
@@ -20,8 +20,8 @@ public class BlankFragment extends BaseFragment {
}
@Override
- public void setUserVisibleHint(final boolean isVisibleToUser) {
- super.setUserVisibleHint(isVisibleToUser);
+ public void onResume() {
+ super.onResume();
setTitle("NewPipe");
// leave this inline. Will make it harder for copy cats.
// If you are a Copy cat FUCK YOU.
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
index 1d16559ac..30e38a966 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -98,11 +98,9 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
}
@Override
- public void setUserVisibleHint(final boolean isVisibleToUser) {
- super.setUserVisibleHint(isVisibleToUser);
- if (activity != null
- && useAsFrontPage
- && isVisibleToUser) {
+ public void onResume() {
+ super.onResume();
+ if (activity != null && useAsFrontPage) {
setTitle(currentInfo != null ? currentInfo.getName() : name);
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
index f37f487bf..c25f18e8b 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
@@ -99,9 +99,12 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
}
@Override
- public void setUserVisibleHint(final boolean isVisibleToUser) {
- super.setUserVisibleHint(isVisibleToUser);
- if (useAsFrontPage && isVisibleToUser && activity != null) {
+ public void onResume() {
+ super.onResume();
+ if (!Localization.getPreferredContentCountry(requireContext()).equals(contentCountry)) {
+ reloadContent();
+ }
+ if (useAsFrontPage && activity != null) {
try {
setTitle(kioskTranslatedName);
} catch (final Exception e) {
@@ -117,15 +120,6 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
return inflater.inflate(R.layout.fragment_kiosk, container, false);
}
- @Override
- public void onResume() {
- super.onResume();
-
- if (!Localization.getPreferredContentCountry(requireContext()).equals(contentCountry)) {
- reloadContent();
- }
- }
-
/*//////////////////////////////////////////////////////////////////////////
// Menu
//////////////////////////////////////////////////////////////////////////*/
diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
index 794e5a33a..f272a8831 100644
--- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java
@@ -78,9 +78,9 @@ public final class BookmarkFragment extends BaseLocalListFragment<List<PlaylistL
}
@Override
- public void setUserVisibleHint(final boolean isVisibleToUser) {
- super.setUserVisibleHint(isVisibleToUser);
- if (activity != null && isVisibleToUser) {
+ public void onResume() {
+ super.onResume();
+ if (activity != null) {
setTitle(activity.getString(R.string.tab_bookmarks));
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
index 9632b47f7..376f18bc0 100644
--- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java
@@ -101,9 +101,9 @@ public class StatisticsPlaylistFragment
}
@Override
- public void setUserVisibleHint(final boolean isVisibleToUser) {
- super.setUserVisibleHint(isVisibleToUser);
- if (activity != null && isVisibleToUser) {
+ public void onResume() {
+ super.onResume();
+ if (activity != null) {
setTitle(activity.getString(R.string.title_activity_history));
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
index c4d088e39..675799586 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
@@ -97,11 +97,9 @@ public class SubscriptionsImportFragment extends BaseFragment {
}
@Override
- public void setUserVisibleHint(final boolean isVisibleToUser) {
- super.setUserVisibleHint(isVisibleToUser);
- if (isVisibleToUser) {
- setTitle(getString(R.string.import_title));
- }
+ public void onResume() {
+ super.onResume();
+ setTitle(getString(R.string.import_title));
}
@Nullable