Merge pull request #3588 from ByteHamster/remove-materialdialogs

Removed MaterialDialog dependency

3 files changed, 15 insertions, 22 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
index 673b58901..ca691c2e6 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
@@ -2,6 +2,7 @@ package de.danoeh.antennapod.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.core.view.MenuItemCompat;
 import androidx.appcompat.widget.SearchView;
@@ -18,8 +19,6 @@ import android.widget.GridView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.afollestad.materialdialogs.MaterialDialog;
-
 import de.danoeh.antennapod.discovery.ItunesPodcastSearcher;
 import de.danoeh.antennapod.discovery.ItunesTopListLoader;
 import de.danoeh.antennapod.discovery.PodcastSearchResult;
@@ -120,9 +119,9 @@ public class ItunesSearchFragment extends Fragment {
                         progressBar.setVisibility(View.GONE);
                         gridView.setVisibility(View.VISIBLE);
                         String prefix = getString(R.string.error_msg_prefix);
-                        new MaterialDialog.Builder(getActivity())
-                                .content(prefix + " " + error.getMessage())
-                                .neutralText(android.R.string.ok)
+                        new AlertDialog.Builder(getActivity())
+                                .setMessage(prefix + " " + error.getMessage())
+                                .setPositiveButton(android.R.string.ok, null)
                                 .show();
                     });
         });
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java
index 226209740..7e217cde4 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java
@@ -2,6 +2,7 @@ package de.danoeh.antennapod.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -11,7 +12,6 @@ import android.widget.AdapterView;
 import android.widget.GridView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import com.afollestad.materialdialogs.MaterialDialog;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
@@ -110,9 +110,9 @@ public class QuickFeedDiscoveryFragment extends Fragment implements AdapterView.
                     Log.e(TAG, Log.getStackTraceString(error));
                     view.setAlpha(1f);
                     String prefix = getString(R.string.error_msg_prefix);
-                    new MaterialDialog.Builder(getActivity())
-                            .content(prefix + " " + error.getMessage())
-                            .neutralText(android.R.string.ok)
+                    new AlertDialog.Builder(getActivity())
+                            .setMessage(prefix + " " + error.getMessage())
+                            .setPositiveButton(android.R.string.ok, null)
                             .show();
                 });
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
index 34e8684ed..1ca8f63aa 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/NetworkPreferencesFragment.java
@@ -5,11 +5,8 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import android.text.format.DateFormat;
-import com.afollestad.materialdialogs.MaterialDialog;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.PreferenceActivity;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
@@ -65,7 +62,7 @@ public class NetworkPreferencesFragment extends PreferenceFragmentCompat {
         // validate and set correct value: number of downloads between 1 and 50 (inclusive)
         findPreference(PREF_PROXY).setOnPreferenceClickListener(preference -> {
             ProxyDialog dialog = new ProxyDialog(getActivity());
-            dialog.createDialog().show();
+            dialog.show();
             return true;
         });
     }
@@ -107,13 +104,10 @@ public class NetworkPreferencesFragment extends PreferenceFragmentCompat {
     private void showUpdateIntervalTimePreferencesDialog() {
         final Context context = getActivity();
 
-        MaterialDialog.Builder builder = new MaterialDialog.Builder(context);
-        builder.title(R.string.pref_autoUpdateIntervallOrTime_title);
-        builder.content(R.string.pref_autoUpdateIntervallOrTime_message);
-        builder.positiveText(R.string.pref_autoUpdateIntervallOrTime_Interval);
-        builder.negativeText(R.string.pref_autoUpdateIntervallOrTime_TimeOfDay);
-        builder.neutralText(R.string.pref_autoUpdateIntervallOrTime_Disable);
-        builder.onPositive((dialog, which) -> {
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setTitle(R.string.pref_autoUpdateIntervallOrTime_title);
+        builder.setMessage(R.string.pref_autoUpdateIntervallOrTime_message);
+        builder.setPositiveButton(R.string.pref_autoUpdateIntervallOrTime_Interval, (dialog, which) -> {
             AlertDialog.Builder builder1 = new AlertDialog.Builder(context);
             builder1.setTitle(context.getString(R.string.pref_autoUpdateIntervallOrTime_Interval));
             final String[] values = context.getResources().getStringArray(R.array.update_intervall_values);
@@ -133,7 +127,7 @@ public class NetworkPreferencesFragment extends PreferenceFragmentCompat {
             builder1.setNegativeButton(context.getString(R.string.cancel_label), null);
             builder1.show();
         });
-        builder.onNegative((dialog, which) -> {
+        builder.setNegativeButton(R.string.pref_autoUpdateIntervallOrTime_TimeOfDay, (dialog, which) -> {
             int hourOfDay = 7;
             int minute = 0;
             int[] updateTime = UserPreferences.getUpdateTimeOfDay();
@@ -152,7 +146,7 @@ public class NetworkPreferencesFragment extends PreferenceFragmentCompat {
             timePickerDialog.setTitle(context.getString(R.string.pref_autoUpdateIntervallOrTime_TimeOfDay));
             timePickerDialog.show();
         });
-        builder.onNeutral((dialog, which) -> {
+        builder.setNeutralButton(R.string.pref_autoUpdateIntervallOrTime_Disable, (dialog, which) -> {
             UserPreferences.disableAutoUpdate();
             setUpdateIntervalText();
         });