diff options
Diffstat (limited to 'app/src/main/java')
7 files changed, 14 insertions, 17 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java index 8c66b6a4c..a0ad99e7d 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -187,7 +187,7 @@ public class VideoplayerActivity extends MediaplayerActivity { videoControlsHider.stop(); if (System.currentTimeMillis() - lastScreenTap < 300) { - if (event.getX() > v.getMeasuredWidth() / 2) { + if (event.getX() > v.getMeasuredWidth() / 2.0f) { onFastForward(); showSkipAnimation(true); } else { diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java index e45533826..7b41652bd 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java @@ -94,7 +94,7 @@ public class PlaybackControlsDialog extends DialogFragment { barRightVolume.setEnabled(false); } - final CheckBox skipSilence = (CheckBox) dialog.findViewById(R.id.skipSilence); + final CheckBox skipSilence = dialog.findViewById(R.id.skipSilence); skipSilence.setChecked(UserPreferences.isSkipSilence()); if (!UserPreferences.useExoplayer()) { skipSilence.setEnabled(false); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java index ef8ed335d..1fc7a77b2 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java @@ -45,9 +45,8 @@ public class VariableSpeedDialog extends DialogFragment { AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(R.string.no_playback_plugin_title); builder.setMessage(R.string.no_playback_plugin_or_sonic_msg); - builder.setPositiveButton(R.string.enable_sonic, (dialog, which) -> { - UserPreferences.enableSonic(); - }); + builder.setPositiveButton(R.string.enable_sonic, (dialog, which) -> + UserPreferences.enableSonic()); builder.setNeutralButton(R.string.close_label, null); builder.show(); } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java index 26216b375..283b4b466 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -335,10 +335,8 @@ public class QueueFragment extends Fragment { if (keepSortedNew) { SortOrder sortOrder = UserPreferences.getQueueKeepSortedOrder(); DBWriter.reorderQueue(sortOrder, true); - if (recyclerAdapter != null) { - recyclerAdapter.updateDragDropEnabled(); - } - } else if (recyclerAdapter != null) { + } + if (recyclerAdapter != null) { recyclerAdapter.updateDragDropEnabled(); } getActivity().invalidateOptionsMenu(); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AutoDownloadPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AutoDownloadPreferencesFragment.java index 064c4b3bc..0d6e79e84 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AutoDownloadPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AutoDownloadPreferencesFragment.java @@ -168,7 +168,7 @@ public class AutoDownloadPreferencesFragment extends PreferenceFragmentCompat { private void buildEpisodeCleanupPreference() { final Resources res = getActivity().getResources(); - ListPreference pref = (ListPreference) findPreference(UserPreferences.PREF_EPISODE_CLEANUP); + ListPreference pref = findPreference(UserPreferences.PREF_EPISODE_CLEANUP); String[] values = res.getStringArray( R.array.episode_cleanup_values); String[] entries = new String[values.length]; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java index f07e59afe..1fa1fed58 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java @@ -109,7 +109,7 @@ public class PlaybackPreferencesFragment extends PreferenceFragmentCompat { private void buildSmartMarkAsPlayedPreference() { final Resources res = getActivity().getResources(); - ListPreference pref = (ListPreference) findPreference(UserPreferences.PREF_SMART_MARK_AS_PLAYED_SECS); + ListPreference pref = findPreference(UserPreferences.PREF_SMART_MARK_AS_PLAYED_SECS); String[] values = res.getStringArray(R.array.smart_mark_as_played_values); String[] entries = new String[values.length]; for (int x = 0; x < values.length; x++) { diff --git a/app/src/main/java/de/danoeh/antennapod/view/LockableBottomSheetBehavior.java b/app/src/main/java/de/danoeh/antennapod/view/LockableBottomSheetBehavior.java index 8e8d98fc9..1b96c7c4f 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/LockableBottomSheetBehavior.java +++ b/app/src/main/java/de/danoeh/antennapod/view/LockableBottomSheetBehavior.java @@ -47,11 +47,11 @@ public class LockableBottomSheetBehavior<V extends View> extends ViewPagerBottom @Override public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, V child, View directTargetChild, - View target, int nestedScrollAxes) { + View target, int axes, int type) { boolean handled = false; if (!isLocked) { - handled = super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target, nestedScrollAxes); + handled = super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target, axes, type); } return handled; @@ -59,16 +59,16 @@ public class LockableBottomSheetBehavior<V extends View> extends ViewPagerBottom @Override public void onNestedPreScroll(CoordinatorLayout coordinatorLayout, V child, View target, - int dx, int dy, int[] consumed) { + int dx, int dy, int[] consumed, int type) { if (!isLocked) { - super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed); + super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type); } } @Override - public void onStopNestedScroll(CoordinatorLayout coordinatorLayout, V child, View target) { + public void onStopNestedScroll(CoordinatorLayout coordinatorLayout, V child, View target, int type) { if (!isLocked) { - super.onStopNestedScroll(coordinatorLayout, child, target); + super.onStopNestedScroll(coordinatorLayout, child, target, type); } } |