Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Code improvements regarding stepSize

This commit is contained in:
litetex 2022-03-04 21:34:45 +01:00
parent 321cf8bf7d
commit 621b38c98b
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
View File

@ -84,8 +84,6 @@ public class PlaybackParameterDialog extends DialogFragment {
@State @State
double pitchPercent = DEFAULT_PITCH_PERCENT; double pitchPercent = DEFAULT_PITCH_PERCENT;
@State @State
double stepSize = DEFAULT_STEP;
@State
boolean skipSilence = DEFAULT_SKIP_SILENCE; boolean skipSilence = DEFAULT_SKIP_SILENCE;
private DialogPlaybackParameterBinding binding; private DialogPlaybackParameterBinding binding;
@ -228,13 +226,10 @@ public class PlaybackParameterDialog extends DialogFragment {
this::onPitchPercentSliderUpdated); this::onPitchPercentSliderUpdated);
// Steps // Steps
setupStepTextView(binding.stepSizeOnePercent, STEP_1_PERCENT_VALUE); getStepSizeComponentMappings()
setupStepTextView(binding.stepSizeFivePercent, STEP_5_PERCENT_VALUE); .forEach(this::setupStepTextView);
setupStepTextView(binding.stepSizeTenPercent, STEP_10_PERCENT_VALUE); // Initialize UI
setupStepTextView(binding.stepSizeTwentyFivePercent, STEP_25_PERCENT_VALUE); setStepSizeToUI(getCurrentStepSize());
setupStepTextView(binding.stepSizeOneHundredPercent, STEP_100_PERCENT_VALUE);
setAndUpdateStepSize(stepSize);
// Bottom controls // Bottom controls
bindCheckboxWithBoolPref( bindCheckboxWithBoolPref(
@ -263,13 +258,12 @@ public class PlaybackParameterDialog extends DialogFragment {
); );
} }
private TextView setText( private void setText(
final TextView textView, final TextView textView,
final DoubleFunction<String> formatter, final DoubleFunction<String> formatter,
final double value final double value
) { ) {
Objects.requireNonNull(textView).setText(formatter.apply(value)); Objects.requireNonNull(textView).setText(formatter.apply(value));
return textView;
} }
private void registerOnStepClickListener( private void registerOnStepClickListener(
@ -280,7 +274,7 @@ public class PlaybackParameterDialog extends DialogFragment {
) { ) {
stepTextView.setOnClickListener(view -> { stepTextView.setOnClickListener(view -> {
newValueConsumer.accept( newValueConsumer.accept(
currentValueSupplier.getAsDouble() + 1 * stepSize * direction); currentValueSupplier.getAsDouble() + 1 * getCurrentStepSize() * direction);
updateCallback(); updateCallback();
}); });
} }
@ -315,16 +309,22 @@ public class PlaybackParameterDialog extends DialogFragment {
binding.pitchPercentStepDown.setText(getStepDownPercentString(newStepSize)); binding.pitchPercentStepDown.setText(getStepDownPercentString(newStepSize));
} }
private double getCurrentStepSize() {
return PreferenceManager.getDefaultSharedPreferences(requireContext())
.getFloat(getString(R.string.adjustment_step_key), (float) DEFAULT_STEP);
}
private void setAndUpdateSkipSilence(final boolean newSkipSilence) { private void setAndUpdateSkipSilence(final boolean newSkipSilence) {
this.skipSilence = newSkipSilence; this.skipSilence = newSkipSilence;
binding.skipSilenceCheckbox.setChecked(newSkipSilence); binding.skipSilenceCheckbox.setChecked(newSkipSilence);
} }
@SuppressWarnings("SameParameterValue") // this method was written to be reusable
private void bindCheckboxWithBoolPref( private void bindCheckboxWithBoolPref(
@NonNull final CheckBox checkBox, @NonNull final CheckBox checkBox,
@StringRes final int resId, @StringRes final int resId,
final boolean defaultValue, final boolean defaultValue,
@Nullable final Consumer<Boolean> onInitialValueOrValueChange @NonNull final Consumer<Boolean> onInitialValueOrValueChange
) { ) {
final boolean prefValue = PreferenceManager final boolean prefValue = PreferenceManager
.getDefaultSharedPreferences(requireContext()) .getDefaultSharedPreferences(requireContext())
@ -332,9 +332,7 @@ public class PlaybackParameterDialog extends DialogFragment {
checkBox.setChecked(prefValue); checkBox.setChecked(prefValue);
if (onInitialValueOrValueChange != null) { onInitialValueOrValueChange.accept(prefValue);
onInitialValueOrValueChange.accept(prefValue);
}
checkBox.setOnCheckedChangeListener((compoundButton, isChecked) -> { checkBox.setOnCheckedChangeListener((compoundButton, isChecked) -> {
// save whether pitch and tempo are unhooked or not // save whether pitch and tempo are unhooked or not
@ -343,9 +341,7 @@ public class PlaybackParameterDialog extends DialogFragment {
.putBoolean(getString(resId), isChecked) .putBoolean(getString(resId), isChecked)
.apply(); .apply();
if (onInitialValueOrValueChange != null) { onInitialValueOrValueChange.accept(isChecked);
onInitialValueOrValueChange.accept(isChecked);
}
}); });
} }