mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-23 16:40:32 +00:00
Code Issues Releases Wiki Activity

Fix tab layout visibility with age restricted videos

Browse Source 
Add comments
This commit is contained in:
Stypox 2021-02-12 10:54:16 +01:00
parent fdb0f01b38
commit 1e5dc01825
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View File

@ -580,6 +580,7 @@ public final class VideoDetailFragment
Player.DEFAULT_CONTROLS_DURATION, 0); Player.DEFAULT_CONTROLS_DURATION, 0);
binding.detailSecondaryControlPanel.setVisibility(View.GONE); binding.detailSecondaryControlPanel.setVisibility(View.GONE);
} }
// view pager height has changed, update the tab layout
updateTabLayoutVisibility(); updateTabLayoutVisibility();
} }
@ -650,6 +651,7 @@ public final class VideoDetailFragment
// prevent useless updates to tab layout visibility if nothing changed // prevent useless updates to tab layout visibility if nothing changed
if (verticalOffset != lastAppBarVerticalOffset) { if (verticalOffset != lastAppBarVerticalOffset) {
lastAppBarVerticalOffset = verticalOffset; lastAppBarVerticalOffset = verticalOffset;
// the view was scrolled
updateTabLayoutVisibility(); updateTabLayoutVisibility();
} }
}); });
@ -952,6 +954,7 @@ public final class VideoDetailFragment
} }
updateTabIconsAndContentDescriptions(); updateTabIconsAndContentDescriptions();
} }
// the page adapter now contains tabs: show the tab layout
updateTabLayoutVisibility(); updateTabLayoutVisibility();
} }
@ -974,12 +977,10 @@ public final class VideoDetailFragment
private void updateTabs(@NonNull final StreamInfo info) { private void updateTabs(@NonNull final StreamInfo info) {
if (showRelatedStreams) { if (showRelatedStreams) {
if (binding.relatedStreamsLayout == null) { // phone if (binding.relatedStreamsLayout == null) { // phone
pageAdapter.updateItem(RELATED_TAB_TAG, pageAdapter.updateItem(RELATED_TAB_TAG, RelatedVideosFragment.getInstance(info));
RelatedVideosFragment.getInstance(info));
} else { // tablet + TV } else { // tablet + TV
getChildFragmentManager().beginTransaction() getChildFragmentManager().beginTransaction()
.replace(R.id.relatedStreamsLayout, .replace(R.id.relatedStreamsLayout, RelatedVideosFragment.getInstance(info))
RelatedVideosFragment.getInstance(info))
.commitAllowingStateLoss(); .commitAllowingStateLoss();
binding.relatedStreamsLayout.setVisibility( binding.relatedStreamsLayout.setVisibility(
player != null && player.isFullscreen() ? View.GONE : View.VISIBLE); player != null && player.isFullscreen() ? View.GONE : View.VISIBLE);
@ -987,10 +988,12 @@ public final class VideoDetailFragment
} }
if (showDescription) { if (showDescription) {
pageAdapter.updateItem(DESCRIPTION_TAB_TAG, pageAdapter.updateItem(DESCRIPTION_TAB_TAG, new DescriptionFragment(info));
new DescriptionFragment(info));
} }
binding.viewPager.setVisibility(View.VISIBLE);
// make sure the tab layout is visible
updateTabLayoutVisibility();
pageAdapter.notifyDataSetUpdate(); pageAdapter.notifyDataSetUpdate();
updateTabIconsAndContentDescriptions(); updateTabIconsAndContentDescriptions();
} }
@ -1007,9 +1010,12 @@ public final class VideoDetailFragment
} }
public void updateTabLayoutVisibility() { public void updateTabLayoutVisibility() {
if (pageAdapter.getCount() < 2) { if (pageAdapter.getCount() < 2 || binding.viewPager.getVisibility() != View.VISIBLE) {
// hide tab layout if there is only one tab or if the view pager is also hidden
binding.tabLayout.setVisibility(View.GONE); binding.tabLayout.setVisibility(View.GONE);
} else { } else {
// call `post()` to be sure `viewPager.getHitRect()`
// is up to date and not being currently recomputed
binding.tabLayout.post(() -> { binding.tabLayout.post(() -> {
if (getContext() != null) { if (getContext() != null) {
final Rect pagerHitRect = new Rect(); final Rect pagerHitRect = new Rect();
@ -1020,7 +1026,7 @@ public final class VideoDetailFragment
WindowManager.class)).getDefaultDisplay().getSize(displaySize); WindowManager.class)).getDefaultDisplay().getSize(displaySize);
final int viewPagerVisibleHeight = displaySize.y - pagerHitRect.top; final int viewPagerVisibleHeight = displaySize.y - pagerHitRect.top;
// see TabLayout.DEFAULT_HEIGHT // see TabLayout.DEFAULT_HEIGHT, which is equal to 48dp
final float tabLayoutHeight = TypedValue.applyDimension( final float tabLayoutHeight = TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP, 48, getResources().getDisplayMetrics()); TypedValue.COMPLEX_UNIT_DIP, 48, getResources().getDisplayMetrics());
@ -1030,6 +1036,7 @@ public final class VideoDetailFragment
Math.max(0, tabLayoutHeight * 3 - viewPagerVisibleHeight)); Math.max(0, tabLayoutHeight * 3 - viewPagerVisibleHeight));
binding.tabLayout.setVisibility(View.VISIBLE); binding.tabLayout.setVisibility(View.VISIBLE);
} else { } else {
// view pager is not visible enough
binding.tabLayout.setVisibility(View.GONE); binding.tabLayout.setVisibility(View.GONE);
} }
} }
@ -1039,6 +1046,7 @@ public final class VideoDetailFragment
public void scrollToTop() { public void scrollToTop() {
binding.appBarLayout.setExpanded(true, true); binding.appBarLayout.setExpanded(true, true);
// notify tab layout of scrolling
updateTabLayoutVisibility(); updateTabLayoutVisibility();
} }