Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4604 from ByteHamster/fix-npe-bottomsheet

Browse Source 
Fixed NPEs in bottom sheet
This commit is contained in:
ByteHamster 2020-10-26 11:11:00 +01:00 committed by GitHub
commit 73bae55022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
View File

@ -166,6 +166,9 @@ public class MainActivity extends CastEnabledActivity {
public void onSlide(@NonNull View view, float slideOffset) { public void onSlide(@NonNull View view, float slideOffset) {
AudioPlayerFragment audioPlayer = (AudioPlayerFragment) getSupportFragmentManager() AudioPlayerFragment audioPlayer = (AudioPlayerFragment) getSupportFragmentManager()
.findFragmentByTag(AudioPlayerFragment.TAG); .findFragmentByTag(AudioPlayerFragment.TAG);
if (audioPlayer == null) {
return;
}
float condensedSlideOffset = Math.max(0.0f, Math.min(0.2f, slideOffset - 0.2f)) / 0.2f; float condensedSlideOffset = Math.max(0.0f, Math.min(0.2f, slideOffset - 0.2f)) / 0.2f;
audioPlayer.getExternalPlayerHolder().setAlpha(1 - condensedSlideOffset); audioPlayer.getExternalPlayerHolder().setAlpha(1 - condensedSlideOffset);
audioPlayer.getExternalPlayerHolder().setVisibility( audioPlayer.getExternalPlayerHolder().setVisibility(

7
app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
View File

@ -135,7 +135,12 @@ public class AudioPlayerFragment extends Fragment implements
pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
@Override @Override
public void onPageSelected(int position) { public void onPageSelected(int position) {
pager.post(() -> ((MainActivity) getActivity()).getBottomSheet().updateScrollingChild()); pager.post(() -> {
if (getActivity() != null) {
// By the time this is posted, the activity might be closed again.
((MainActivity) getActivity()).getBottomSheet().updateScrollingChild();
}
});
} }
}); });
pageIndicator = root.findViewById(R.id.page_indicator); pageIndicator = root.findViewById(R.id.page_indicator);