Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use AlertDialog for episode filters (#3981)

Browse Source
This commit is contained in:
Tony Tam 2020-04-01 03:44:58 -07:00 committed by GitHub
parent eae200b0dc
commit ea58748b22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
app/src/main/java/de/danoeh/antennapod/dialog/EpisodeFilterDialog.java
View File

@ -1,38 +1,33 @@
package de.danoeh.antennapod.dialog; package de.danoeh.antennapod.dialog;
import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.view.View;
import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.RadioButton; import android.widget.RadioButton;
import androidx.appcompat.app.AlertDialog;
import de.danoeh.antennapod.R; import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.feed.FeedFilter; import de.danoeh.antennapod.core.feed.FeedFilter;
/** /**
* Displays a dialog with a text box for filtering episodes and two radio buttons for exclusion/inclusion * Displays a dialog with a text box for filtering episodes and two radio buttons for exclusion/inclusion
*/ */
public abstract class EpisodeFilterDialog extends Dialog { public abstract class EpisodeFilterDialog extends AlertDialog.Builder {
private final FeedFilter initialFilter; private final FeedFilter initialFilter;
public EpisodeFilterDialog(Context context, FeedFilter filter) { public EpisodeFilterDialog(Context context, FeedFilter filter) {
super(context); super(context);
this.initialFilter = filter; initialFilter = filter;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.episode_filter_dialog);
final EditText etxtEpisodeFilterText = findViewById(R.id.etxtEpisodeFilterText);
final RadioButton radioInclude = findViewById(R.id.radio_filter_include);
final RadioButton radioExclude = findViewById(R.id.radio_filter_exclude);
final Button butConfirm = findViewById(R.id.butConfirm);
final Button butCancel = findViewById(R.id.butCancel);
setTitle(R.string.episode_filters_label); setTitle(R.string.episode_filters_label);
setOnCancelListener(dialog -> onCancelled()); View rootView = View.inflate(context, R.layout.episode_filter_dialog, null);
setView(rootView);
final EditText etxtEpisodeFilterText = rootView.findViewById(R.id.etxtEpisodeFilterText);
final RadioButton radioInclude = rootView.findViewById(R.id.radio_filter_include);
final RadioButton radioExclude = rootView.findViewById(R.id.radio_filter_exclude);
if (initialFilter.includeOnly()) { if (initialFilter.includeOnly()) {
radioInclude.setChecked(true); radioInclude.setChecked(true);
@ -46,25 +41,19 @@ public abstract class EpisodeFilterDialog extends Dialog {
etxtEpisodeFilterText.setText(""); etxtEpisodeFilterText.setText("");
} }
setNegativeButton(R.string.cancel_label, null);
setPositiveButton(R.string.confirm_label, (dialog, which) -> {
String includeString = "";
String excludeString = "";
if (radioInclude.isChecked()) {
includeString = etxtEpisodeFilterText.getText().toString();
} else {
excludeString = etxtEpisodeFilterText.getText().toString();
}
butCancel.setOnClickListener(v -> cancel()); onConfirmed(new FeedFilter(includeString, excludeString));
butConfirm.setOnClickListener(v -> { }
);
String includeString = "";
String excludeString = "";
if (radioInclude.isChecked()) {
includeString = etxtEpisodeFilterText.getText().toString();
} else {
excludeString = etxtEpisodeFilterText.getText().toString();
}
onConfirmed(new FeedFilter(includeString, excludeString));
dismiss();
});
}
protected void onCancelled() {
} }
protected abstract void onConfirmed(FeedFilter filter); protected abstract void onConfirmed(FeedFilter filter);

107
app/src/main/res/layout/episode_filter_dialog.xml
View File

@ -2,94 +2,39 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical"
android:padding="16dp">
<LinearLayout <RadioGroup
android:layout_width="match_parent" android:id="@+id/radio_filter_group"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<RadioGroup
android:id="@+id/radio_filter_group"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RadioButton
android:id="@+id/radio_filter_include"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/episode_filters_include" />
<RadioButton
android:id="@+id/radio_filter_exclude"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/episode_filters_exclude" />
</RadioGroup>
<EditText
android:id="@+id/etxtEpisodeFilterText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="8"
android:minLines="1"
android:maxLines="20"
android:scrollbars="vertical"
android:hint="@string/episode_filters_hint"
android:focusable="true"
android:focusableInTouchMode="true"
android:cursorVisible="true" />
</LinearLayout>
<RelativeLayout
android:id="@+id/footer"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="48dp"> android:layout_height="wrap_content"
android:orientation="vertical">
<View <RadioButton
android:layout_width="match_parent" android:id="@+id/radio_filter_include"
android:layout_height="1dip"
android:layout_alignParentTop="true"
android:background="?android:attr/dividerVertical" />
<View
android:id="@+id/horizontal_divider"
android:layout_width="1dip"
android:layout_height="fill_parent"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="4dp"
android:layout_marginTop="4dp"
android:background="?android:attr/dividerVertical" />
<Button
android:id="@+id/butCancel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:text="@string/episode_filters_include" />
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@id/horizontal_divider"
android:layout_toStartOf="@id/horizontal_divider"
android:background="?android:attr/selectableItemBackground"
android:text="@string/cancel_label" />
<Button <RadioButton
android:id="@+id/butConfirm" android:id="@+id/radio_filter_exclude"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:text="@string/episode_filters_exclude" />
android:layout_alignParentRight="true" </RadioGroup>
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_toRightOf="@id/horizontal_divider"
android:layout_toEndOf="@id/horizontal_divider"
android:background="?android:attr/selectableItemBackground"
android:text="@string/confirm_label" />
</RelativeLayout>
<EditText
android:id="@+id/etxtEpisodeFilterText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="8"
android:minLines="1"
android:maxLines="20"
android:scrollbars="vertical"
android:hint="@string/episode_filters_hint"
android:focusable="true"
android:focusableInTouchMode="true"
android:cursorVisible="true" />
</LinearLayout> </LinearLayout>