diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-10-12 21:14:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-12 21:14:08 +0200 |
commit | a73a932a7c773f09a9bb3965448fe3b4ccfe8ab2 (patch) | |
tree | 6beff65a62be04455ce223c60b0082f6bd5694e9 /app/src/main/java/de/danoeh/antennapod/dialog | |
parent | f6c8a8c0f785d26ee2374d52df44842997ed5956 (diff) | |
download | AntennaPod-a73a932a7c773f09a9bb3965448fe3b4ccfe8ab2.zip |
Move speed dialog to the bottom (#5464)
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/dialog')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java | 40 |
1 files changed, 21 insertions, 19 deletions
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 6011872cf..def2e56a7 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java @@ -1,15 +1,17 @@ package de.danoeh.antennapod.dialog; -import android.app.Dialog; +import android.os.Build; import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.DialogFragment; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.google.android.material.chip.Chip; import com.google.android.material.snackbar.Snackbar; import de.danoeh.antennapod.R; @@ -25,7 +27,7 @@ import java.util.Collections; import java.util.List; import java.util.Locale; -public class VariableSpeedDialog extends DialogFragment { +public class VariableSpeedDialog extends BottomSheetDialogFragment { private SpeedSelectionAdapter adapter; private final DecimalFormat speedFormat; private PlaybackController controller; @@ -70,12 +72,10 @@ public class VariableSpeedDialog extends DialogFragment { controller = null; } - @NonNull + @Nullable @Override - public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); - builder.setPositiveButton(R.string.close_label, null); - + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { View root = View.inflate(getContext(), R.layout.speed_select_dialog, null); speedSeekBar = root.findViewById(R.id.speed_seek_bar); RecyclerView selectedSpeedsGrid = root.findViewById(R.id.selected_speeds_grid); @@ -90,9 +90,7 @@ public class VariableSpeedDialog extends DialogFragment { addCurrentSpeedChip.setCloseIconResource(R.drawable.ic_add); addCurrentSpeedChip.setOnCloseIconClickListener(v -> addCurrentSpeed()); addCurrentSpeedChip.setOnClickListener(v -> addCurrentSpeed()); - - builder.setView(root); - return builder.create(); + return root; } private void addCurrentSpeed() { @@ -114,8 +112,9 @@ public class VariableSpeedDialog extends DialogFragment { @NonNull public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { Chip chip = new Chip(getContext()); - chip.setCloseIconVisible(true); - chip.setCloseIconResource(R.drawable.ic_delete); + if (Build.VERSION.SDK_INT >= 17) { + chip.setTextAlignment(View.TEXT_ALIGNMENT_CENTER); + } return new ViewHolder(chip); } @@ -124,16 +123,19 @@ public class VariableSpeedDialog extends DialogFragment { float speed = selectedSpeeds.get(position); holder.chip.setText(speedFormat.format(speed)); - holder.chip.setOnCloseIconClickListener(v -> { + holder.chip.setOnLongClickListener(v -> { selectedSpeeds.remove(speed); UserPreferences.setPlaybackSpeedArray(selectedSpeeds); notifyDataSetChanged(); + return true; }); holder.chip.setOnClickListener(v -> { - if (controller != null) { - dismiss(); - controller.setPlaybackSpeed(speed); - } + new Handler(Looper.getMainLooper()).postDelayed(() -> { + if (controller != null) { + dismiss(); + controller.setPlaybackSpeed(speed); + } + }, 200); }); } |