From 036445a57b149dec82c72e48b98ae4b7b7c6c2b8 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Sun, 8 Jan 2023 23:56:30 -0600 Subject: Initial progress of huge refactoring job that I really, really shouldn't be doing --- .../dsub/activity/EditPlayActionActivity.java | 41 +++++++--------------- 1 file changed, 12 insertions(+), 29 deletions(-) (limited to 'app/src/main/java/github/daneren2005/dsub/activity/EditPlayActionActivity.java') diff --git a/app/src/main/java/github/daneren2005/dsub/activity/EditPlayActionActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/EditPlayActionActivity.java index bc56eeb7..9423eb38 100644 --- a/app/src/main/java/github/daneren2005/dsub/activity/EditPlayActionActivity.java +++ b/app/src/main/java/github/daneren2005/dsub/activity/EditPlayActionActivity.java @@ -18,7 +18,6 @@ package github.daneren2005.dsub.activity; import android.app.Activity; import androidx.appcompat.app.AlertDialog; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import androidx.drawerlayout.widget.DrawerLayout; @@ -29,7 +28,6 @@ import android.view.View; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.CheckBox; -import android.widget.CompoundButton; import android.widget.EditText; import android.widget.Spinner; @@ -66,33 +64,20 @@ public class EditPlayActionActivity extends SubsonicActivity { doNothing = context.getResources().getString(R.string.tasker_edit_do_nothing); shuffleCheckbox = (CheckBox) findViewById(R.id.edit_shuffle_checkbox); - shuffleCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton view, boolean isChecked) { - startYearCheckbox.setEnabled(isChecked); - endYearCheckbox.setEnabled(isChecked); - genreButton.setEnabled(isChecked); - } + shuffleCheckbox.setOnCheckedChangeListener((view, isChecked) -> { + startYearCheckbox.setEnabled(isChecked); + endYearCheckbox.setEnabled(isChecked); + genreButton.setEnabled(isChecked); }); startYearCheckbox = (CheckBox) findViewById(R.id.edit_start_year_checkbox); startYearBox = (EditText) findViewById(R.id.edit_start_year); // Disable/enable number box if checked - startYearCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton view, boolean isChecked) { - startYearBox.setEnabled(isChecked); - } - }); + startYearCheckbox.setOnCheckedChangeListener((view, isChecked) -> startYearBox.setEnabled(isChecked)); endYearCheckbox = (CheckBox) findViewById(R.id.edit_end_year_checkbox); endYearBox = (EditText) findViewById(R.id.edit_end_year); - endYearCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton view, boolean isChecked) { - endYearBox.setEnabled(isChecked); - } - }); + endYearCheckbox.setOnCheckedChangeListener((view, isChecked) -> endYearBox.setEnabled(isChecked)); genreButton = (Button) findViewById(R.id.edit_genre_spinner); genreButton.setOnClickListener(new View.OnClickListener() { @@ -106,7 +91,7 @@ public class EditPlayActionActivity extends SubsonicActivity { @Override protected void done(final List genres) { - List names = new ArrayList(); + List names = new ArrayList<>(); String blank = context.getResources().getString(R.string.select_genre_blank); names.add(doNothing); names.add(blank); @@ -117,13 +102,11 @@ public class EditPlayActionActivity extends SubsonicActivity { AlertDialog.Builder builder = new AlertDialog.Builder(context); builder.setTitle(R.string.shuffle_pick_genre) - .setItems(names.toArray(new CharSequence[names.size()]), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - if(which == 1) { - genreButton.setText(""); - } else { - genreButton.setText(finalNames.get(which)); - } + .setItems(names.toArray(new CharSequence[0]), (dialog, which) -> { + if(which == 1) { + genreButton.setText(""); + } else { + genreButton.setText(finalNames.get(which)); } }); AlertDialog dialog = builder.create(); -- cgit v1.2.3