Skip to content

Commit 51837ce

Browse files
committed
Get rid of setUserVisibleHint
1 parent 7edef8d commit 51837ce

7 files changed

Lines changed: 21 additions & 39 deletions

File tree

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public abstract class BaseFragment extends Fragment {
2121
//These values are used for controlling fragments when they are part of the frontpage
2222
@State
2323
protected boolean useAsFrontPage = false;
24-
private boolean mIsVisibleToUser = false;
2524

2625
public void useAsFrontPage(final boolean value) {
2726
useAsFrontPage = value;
@@ -85,12 +84,6 @@ public void onDestroy() {
8584
AppWatcher.INSTANCE.getObjectWatcher().watch(this);
8685
}
8786

88-
@Override
89-
public void setUserVisibleHint(final boolean isVisibleToUser) {
90-
super.setUserVisibleHint(isVisibleToUser);
91-
mIsVisibleToUser = isVisibleToUser;
92-
}
93-
9487
/*//////////////////////////////////////////////////////////////////////////
9588
// Init
9689
//////////////////////////////////////////////////////////////////////////*/
@@ -109,8 +102,7 @@ public void setTitle(final String title) {
109102
if (DEBUG) {
110103
Log.d(TAG, "setTitle() called with: title = [" + title + "]");
111104
}
112-
if ((!useAsFrontPage || mIsVisibleToUser)
113-
&& (activity != null && activity.getSupportActionBar() != null)) {
105+
if (!useAsFrontPage && activity != null && activity.getSupportActionBar() != null) {
114106
activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
115107
activity.getSupportActionBar().setTitle(title);
116108
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGrou
2020
}
2121

2222
@Override
23-
public void setUserVisibleHint(final boolean isVisibleToUser) {
24-
super.setUserVisibleHint(isVisibleToUser);
23+
public void onResume() {
24+
super.onResume();
2525
setTitle("NewPipe");
2626
// leave this inline. Will make it harder for copy cats.
2727
// If you are a Copy cat FUCK YOU.

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,9 @@ public ChannelFragment() {
9898
}
9999

100100
@Override
101-
public void setUserVisibleHint(final boolean isVisibleToUser) {
102-
super.setUserVisibleHint(isVisibleToUser);
103-
if (activity != null
104-
&& useAsFrontPage
105-
&& isVisibleToUser) {
101+
public void onResume() {
102+
super.onResume();
103+
if (activity != null && useAsFrontPage) {
106104
setTitle(currentInfo != null ? currentInfo.getName() : name);
107105
}
108106
}

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,12 @@ public void onCreate(final Bundle savedInstanceState) {
9999
}
100100

101101
@Override
102-
public void setUserVisibleHint(final boolean isVisibleToUser) {
103-
super.setUserVisibleHint(isVisibleToUser);
104-
if (useAsFrontPage && isVisibleToUser && activity != null) {
102+
public void onResume() {
103+
super.onResume();
104+
if (!Localization.getPreferredContentCountry(requireContext()).equals(contentCountry)) {
105+
reloadContent();
106+
}
107+
if (useAsFrontPage && activity != null) {
105108
try {
106109
setTitle(kioskTranslatedName);
107110
} catch (final Exception e) {
@@ -117,15 +120,6 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
117120
return inflater.inflate(R.layout.fragment_kiosk, container, false);
118121
}
119122

120-
@Override
121-
public void onResume() {
122-
super.onResume();
123-
124-
if (!Localization.getPreferredContentCountry(requireContext()).equals(contentCountry)) {
125-
reloadContent();
126-
}
127-
}
128-
129123
/*//////////////////////////////////////////////////////////////////////////
130124
// Menu
131125
//////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
7878
}
7979

8080
@Override
81-
public void setUserVisibleHint(final boolean isVisibleToUser) {
82-
super.setUserVisibleHint(isVisibleToUser);
83-
if (activity != null && isVisibleToUser) {
81+
public void onResume() {
82+
super.onResume();
83+
if (activity != null) {
8484
setTitle(activity.getString(R.string.tab_bookmarks));
8585
}
8686
}

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
101101
}
102102

103103
@Override
104-
public void setUserVisibleHint(final boolean isVisibleToUser) {
105-
super.setUserVisibleHint(isVisibleToUser);
106-
if (activity != null && isVisibleToUser) {
104+
public void onResume() {
105+
super.onResume();
106+
if (activity != null) {
107107
setTitle(activity.getString(R.string.title_activity_history));
108108
}
109109
}

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,9 @@ public void onCreate(final Bundle savedInstanceState) {
9797
}
9898

9999
@Override
100-
public void setUserVisibleHint(final boolean isVisibleToUser) {
101-
super.setUserVisibleHint(isVisibleToUser);
102-
if (isVisibleToUser) {
103-
setTitle(getString(R.string.import_title));
104-
}
100+
public void onResume() {
101+
super.onResume();
102+
setTitle(getString(R.string.import_title));
105103
}
106104

107105
@Nullable

0 commit comments

Comments
 (0)