Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2024-12-28 09:41:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3375 from orionlee/bugfix_batch_edit_deselect_all_fab_overlay_3374

Browse Source 
fix batch edit: deselect all label and FAB overlay remains when deselect all
This commit is contained in:
H. Lehmann 2019-09-03 23:31:50 +02:00 committed by GitHub
commit 06d81c56b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java
View File

@ -3,7 +3,6 @@ package de.danoeh.antennapod.dialog;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.IdRes; import android.support.annotation.IdRes;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@ -13,7 +12,6 @@ import android.support.design.widget.Snackbar;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.util.ArrayMap; import android.support.v4.util.ArrayMap;
import android.support.v4.view.ViewCompat;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.util.Log; import android.util.Log;
@ -218,7 +216,13 @@ public class EpisodesApplyActionFragment extends Fragment {
} }
private void showSpeedDialIfAnyChecked() { private void showSpeedDialIfAnyChecked() {
mSpeedDialView.setVisibility(checkedIds.size() > 0 ? View.VISIBLE : View.GONE); if (checkedIds.size() > 0) {
if (!mSpeedDialView.isShown()) {
mSpeedDialView.show();
}
} else {
mSpeedDialView.hide(); // hide() also handles UI, e.g., overlay properly.
}
} }
@Override @Override
@ -242,10 +246,13 @@ public class EpisodesApplyActionFragment extends Fragment {
// Prepare icon for select toggle button // Prepare icon for select toggle button
int[] icon = new int[1]; int[] icon = new int[1];
@StringRes int titleResId;
if (checkedIds.size() == episodes.size()) { if (checkedIds.size() == episodes.size()) {
icon[0] = R.attr.ic_select_none; icon[0] = R.attr.ic_select_none;
titleResId = R.string.deselect_all_label;
} else { } else {
icon[0] = R.attr.ic_select_all; icon[0] = R.attr.ic_select_all;
titleResId = R.string.select_all_label;
} }
TypedArray a = getActivity().obtainStyledAttributes(icon); TypedArray a = getActivity().obtainStyledAttributes(icon);
@ -253,6 +260,7 @@ public class EpisodesApplyActionFragment extends Fragment {
a.recycle(); a.recycle();
mSelectToggle.setIcon(iconDrawable); mSelectToggle.setIcon(iconDrawable);
mSelectToggle.setTitle(titleResId);
} }
@Override @Override