summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java3
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java10
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java6
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java8
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java3
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java61
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java25
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java6
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java15
10 files changed, 72 insertions, 69 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 729aa7fd..0d9a37c2 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -33,6 +33,7 @@ import android.widget.TextView;
import androidx.core.text.HtmlCompat;
import com.google.android.material.button.MaterialButton;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.fox.ttrss.types.Article;
import org.fox.ttrss.types.Attachment;
@@ -236,7 +237,7 @@ public class ArticleFragment extends androidx.fragment.app.Fragment {
final EditText edit = new EditText(getActivity());
edit.setText(String.valueOf(m_article.score));
- AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
.setTitle(R.string.score_for_this_article)
.setPositiveButton(R.string.set_score,
new DialogInterface.OnClickListener() {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index ec1ddb9d..8e672aac 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -47,6 +47,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.SimpleTarget;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.snackbar.Snackbar;
import org.fox.ttrss.util.DatabaseHelper;
@@ -506,8 +507,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
View dialogView = View.inflate(this, R.layout.dialog_open_link_askcb, null);
final CheckBox askEveryTimeCB = dialogView.findViewById(R.id.open_link_ask_checkbox);
- AlertDialog.Builder builder = new AlertDialog.Builder(
- CommonActivity.this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setView(dialogView)
.setMessage(uri.toString())
.setPositiveButton(R.string.quick_preview,
@@ -562,7 +562,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
}
});*/
- AlertDialog dlg = builder.create();
+ Dialog dlg = builder.create();
dlg.show();
} else {
@@ -614,7 +614,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
if (es.size() > 0) {
if (es.get(0).hasAttr("title")) {
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setCancelable(true)
.setMessage(es.get(0).attr("title"))
.setPositiveButton(R.string.dialog_close, new DialogInterface.OnClickListener() {
@@ -625,7 +625,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
}
);
- AlertDialog dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
} else {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index ec6c508d..55c8950b 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -33,6 +33,7 @@ import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
@@ -257,8 +258,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
if (true) {
final Feed feed = getFeedAtPosition(info.position);
- AlertDialog.Builder builder = new AlertDialog.Builder(
- m_activity)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
.setMessage(getString(R.string.unsubscribe_from_prompt, feed.title))
.setPositiveButton(R.string.unsubscribe,
new Dialog.OnClickListener() {
@@ -277,7 +277,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
}
});
- AlertDialog dlg = builder.create();
+ Dialog dlg = builder.create();
dlg.show();
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 06e815f0..a843bf39 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -70,6 +70,7 @@ import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
import com.bumptech.glide.request.target.Target;
import com.google.android.material.button.MaterialButton;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.snackbar.Snackbar;
import com.google.gson.JsonElement;
@@ -190,8 +191,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
final Article fa = article;
- AlertDialog.Builder builder = new AlertDialog.Builder(
- m_activity)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
.setMessage(R.string.confirm_catchup_above)
.setPositiveButton(R.string.dialog_ok,
new Dialog.OnClickListener() {
@@ -210,7 +210,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
}
});
- AlertDialog dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
}
return true;
@@ -1088,7 +1088,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
final EditText edit = new EditText(getActivity());
edit.setText(String.valueOf(article.score));
- AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
.setTitle(R.string.score_for_this_article)
.setPositiveButton(R.string.set_score,
new DialogInterface.OnClickListener() {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
index 62fa7227..7ccfb646 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java
@@ -22,6 +22,7 @@ import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.gson.JsonElement;
@@ -352,7 +353,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList
++i;
}
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(getString(R.string.headlines_sort_articles_title))
.setSingleChoiceItems(
sortTitles,
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 807b133b..b8680c71 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -31,6 +31,7 @@ import android.widget.TextView;
import androidx.appcompat.view.ActionMode;
import androidx.appcompat.widget.Toolbar;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@ -89,7 +90,7 @@ public class OnlineActivity extends CommonActivity {
int titleStringId = searchQuery.length() > 0 ? R.string.catchup_dialog_title_search : R.string.catchup_dialog_title;
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(getString(titleStringId, feed.title))
.setSingleChoiceItems(
new String[] {
@@ -133,8 +134,7 @@ public class OnlineActivity extends CommonActivity {
dialog.show();
} else {
- AlertDialog.Builder builder = new AlertDialog.Builder(
- this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setMessage(getString(R.string.catchup_dialog_title, feed.title))
.setPositiveButton(R.string.catchup,
new Dialog.OnClickListener() {
@@ -153,7 +153,7 @@ public class OnlineActivity extends CommonActivity {
}
});
- AlertDialog dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
}
}
@@ -274,7 +274,7 @@ public class OnlineActivity extends CommonActivity {
}
protected void switchOffline() {
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setMessage(R.string.dialog_offline_switch_prompt)
.setPositiveButton(R.string.dialog_offline_go,
new Dialog.OnClickListener() {
@@ -301,7 +301,7 @@ public class OnlineActivity extends CommonActivity {
}
});
- AlertDialog dlg = builder.create();
+ Dialog dlg = builder.create();
dlg.show();
}
@@ -367,8 +367,8 @@ public class OnlineActivity extends CommonActivity {
setLoadingStatus(R.string.login_need_configure);
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setMessage(R.string.dialog_need_configure_prompt)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+ .setMessage(R.string.dialog_need_configure_prompt)
.setCancelable(false)
.setPositiveButton(R.string.dialog_open_preferences, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
@@ -384,7 +384,8 @@ public class OnlineActivity extends CommonActivity {
dialog.cancel();
}
});
- AlertDialog alert = builder.create();
+
+ Dialog alert = builder.create();
alert.show();
} else {
@@ -485,8 +486,7 @@ public class OnlineActivity extends CommonActivity {
itemUrls[i] = article.attachments.get(i).content_url;
}
- Dialog dialog = new Dialog(OnlineActivity.this);
- AlertDialog.Builder builder = new AlertDialog.Builder(OnlineActivity.this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(R.string.attachments_prompt)
.setCancelable(true)
.setSingleChoiceItems(items, 0, new OnClickListener() {
@@ -519,7 +519,7 @@ public class OnlineActivity extends CommonActivity {
}
});
- dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
}
}
@@ -568,7 +568,7 @@ public class OnlineActivity extends CommonActivity {
final EditText edit = new EditText(this);
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(R.string.search)
.setPositiveButton(getString(R.string.search),
new OnClickListener() {
@@ -619,7 +619,7 @@ public class OnlineActivity extends CommonActivity {
int selectedIndex = Arrays.asList(headlineModeValues).indexOf(headlineMode);
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(R.string.headlines_set_view_mode)
.setSingleChoiceItems(headlineModeNames,
selectedIndex, new OnClickListener() {
@@ -674,7 +674,7 @@ public class OnlineActivity extends CommonActivity {
selectedIndex = 4;
}
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(R.string.headlines_set_view_mode)
.setSingleChoiceItems(
new String[]{
@@ -717,8 +717,7 @@ public class OnlineActivity extends CommonActivity {
return true;
} else if (itemId == R.id.headlines_select) {
if (hf != null) {
- Dialog dialog = new Dialog(this);
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(R.string.headlines_select_dialog)
.setSingleChoiceItems(
new String[]{
@@ -745,7 +744,7 @@ public class OnlineActivity extends CommonActivity {
}
});
- dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
}
return true;
@@ -833,8 +832,7 @@ public class OnlineActivity extends CommonActivity {
} else if (itemId == R.id.catchup_above) {
if (hf != null) {
- AlertDialog.Builder builder = new AlertDialog.Builder(
- OnlineActivity.this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setMessage(R.string.confirm_catchup_above)
.setPositiveButton(R.string.dialog_ok,
new OnClickListener() {
@@ -853,7 +851,7 @@ public class OnlineActivity extends CommonActivity {
}
});
- AlertDialog dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
}
@@ -937,9 +935,10 @@ public class OnlineActivity extends CommonActivity {
public void editArticleNote(final Article article) {
String note = "";
-
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(article.title);
+
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+ .setTitle(article.title);
+
final EditText topicEdit = new EditText(this);
topicEdit.setText(note);
builder.setView(topicEdit);
@@ -965,7 +964,7 @@ public class OnlineActivity extends CommonActivity {
}
});
- AlertDialog dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
}
@@ -988,9 +987,8 @@ public class OnlineActivity extends CommonActivity {
itemIds[i] = labels.get(i).id;
checkedItems[i] = labels.get(i).checked;
}
-
- Dialog dialog = new Dialog(OnlineActivity.this);
- AlertDialog.Builder builder = new AlertDialog.Builder(OnlineActivity.this)
+
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(OnlineActivity.this)
.setTitle(R.string.article_set_labels)
.setMultiChoiceItems(items, checkedItems, new OnMultiChoiceClickListener() {
@@ -1018,7 +1016,7 @@ public class OnlineActivity extends CommonActivity {
}
});
- dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
}
@@ -1060,8 +1058,7 @@ public class OnlineActivity extends CommonActivity {
if (getDatabaseHelper().hasOfflineData()) {
- AlertDialog.Builder builder = new AlertDialog.Builder(
- OnlineActivity.this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setMessage(R.string.dialog_offline_prompt)
.setPositiveButton(R.string.dialog_offline_go,
new Dialog.OnClickListener() {
@@ -1078,7 +1075,7 @@ public class OnlineActivity extends CommonActivity {
}
});
- AlertDialog dlg = builder.create();
+ Dialog dlg = builder.create();
dlg.show();
}
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index 4da85e76..d7f487a1 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -24,6 +24,8 @@ import android.widget.EditText;
import androidx.appcompat.view.ActionMode;
import androidx.appcompat.widget.Toolbar;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
import org.fox.ttrss.CommonActivity;
import org.fox.ttrss.OnlineActivity;
import org.fox.ttrss.PreferencesActivity;
@@ -264,7 +266,7 @@ public class OfflineActivity extends CommonActivity {
final EditText edit = new EditText(this);
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(R.string.search)
.setPositiveButton(getString(R.string.search),
new OnClickListener() {
@@ -320,7 +322,7 @@ public class OfflineActivity extends CommonActivity {
selectedIndex = 3;
}
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(R.string.headlines_set_view_mode)
.setSingleChoiceItems(
new String[]{
@@ -363,11 +365,10 @@ public class OfflineActivity extends CommonActivity {
return true;
} else if (itemId == R.id.headlines_select) {
if (ohf != null) {
- Dialog dialog = new Dialog(this);
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(R.string.headlines_select_dialog);
- builder.setSingleChoiceItems(new String[]{
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+ .setTitle(R.string.headlines_select_dialog)
+ .setSingleChoiceItems(new String[]{
getString(R.string.headlines_select_all),
getString(R.string.headlines_select_unread),
getString(R.string.headlines_select_none)}, 0,
@@ -384,7 +385,7 @@ public class OfflineActivity extends CommonActivity {
}
});
- dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
}
return true;
@@ -396,8 +397,7 @@ public class OfflineActivity extends CommonActivity {
int count = getUnreadArticleCount(feedId, isCat);
if (count > 0) {
- AlertDialog.Builder builder = new AlertDialog.Builder(
- OfflineActivity.this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count))
.setPositiveButton(R.string.catchup,
new OnClickListener() {
@@ -416,7 +416,7 @@ public class OfflineActivity extends CommonActivity {
}
});
- AlertDialog dlg = builder.create();
+ Dialog dlg = builder.create();
dlg.show();
}
}
@@ -508,8 +508,7 @@ public class OfflineActivity extends CommonActivity {
return true;
} else if (itemId == R.id.catchup_above) {
if (oap != null) {
- AlertDialog.Builder builder = new AlertDialog.Builder(
- OfflineActivity.this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setMessage(R.string.confirm_catchup_above)
.setPositiveButton(R.string.dialog_ok,
new OnClickListener() {
@@ -528,7 +527,7 @@ public class OfflineActivity extends CommonActivity {
}
});
- AlertDialog dlg = builder.create();
+ Dialog dlg = builder.create();
dlg.show();
}
return true;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 8500d7c7..ef032609 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -52,6 +52,7 @@ import com.bumptech.glide.load.resource.drawable.GlideDrawable;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.google.android.material.button.MaterialButton;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.fox.ttrss.Application;
import org.fox.ttrss.CommonActivity;
@@ -203,8 +204,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
return true;
} else if (itemId == R.id.catchup_above) {
if (true) {
- AlertDialog.Builder builder = new AlertDialog.Builder(
- m_activity)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext())
.setMessage(R.string.confirm_catchup_above)
.setPositiveButton(R.string.dialog_ok,
new Dialog.OnClickListener() {
@@ -223,7 +223,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
}
});
- AlertDialog dialog = builder.create();
+ Dialog dialog = builder.create();
dialog.show();
}
return true;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
index 78dad8f3..44016124 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
@@ -25,6 +25,8 @@ import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
import java.util.HashMap;
public class OfflineMasterActivity extends OfflineActivity implements OfflineHeadlinesEventListener {
@@ -150,7 +152,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
int selectedIndex = m_prefs.getBoolean("offline_oldest_first", false) ? 1 : 0;
- AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
.setTitle(getString(R.string.headlines_sort_articles_title))
.setSingleChoiceItems(
new String[]{
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java
index 620916f8..39d6c2ef 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java
@@ -1,6 +1,7 @@
package org.fox.ttrss.share;
import android.app.AlertDialog;
+import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -11,6 +12,8 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
import org.fox.ttrss.ApiRequest;
import org.fox.ttrss.PreferencesActivity;
import org.fox.ttrss.R;
@@ -53,10 +56,10 @@ public abstract class CommonShareActivity extends CommonActivity {
if (m_prefs.getString("ttrss_url", "").trim().length() == 0) {
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setMessage(R.string.dialog_need_configure_prompt)
- .setCancelable(false)
- .setPositiveButton(R.string.dialog_open_preferences, new DialogInterface.OnClickListener() {
+ MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+ .setMessage(R.string.dialog_need_configure_prompt)
+ .setCancelable(false)
+ .setPositiveButton(R.string.dialog_open_preferences, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
// launch preferences
@@ -65,12 +68,12 @@ public abstract class CommonShareActivity extends CommonActivity {
startActivityForResult(intent, 0);
}
})
- .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+ .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
- AlertDialog alert = builder.create();
+ Dialog alert = builder.create();
alert.show();
} else {