From 26a3633a814793a5d88965fa793390e56227f94e Mon Sep 17 00:00:00 2001 From: tom79 Date: Mon, 11 Nov 2019 09:34:13 +0100 Subject: [PATCH] Some fixes with dialogs --- .../activities/AccountReportActivity.java | 2 +- .../activities/EditProfileActivity.java | 2 +- .../android/activities/ListActivity.java | 2 +- .../activities/MutedInstanceActivity.java | 2 +- .../activities/OwnerNotificationActivity.java | 2 +- .../activities/OwnerStatusActivity.java | 2 +- .../android/activities/PeertubeActivity.java | 4 +-- .../PeertubeEditUploadActivity.java | 2 +- .../activities/PhotoEditorActivity.java | 4 +-- .../activities/PixelfedComposeActivity.java | 8 ++--- .../activities/ShowAccountActivity.java | 12 ++++---- .../android/activities/TootActivity.java | 30 +++++++++---------- .../android/activities/WebviewActivity.java | 2 +- .../android/drawers/AccountsListAdapter.java | 2 +- .../android/drawers/DomainsListAdapter.java | 2 +- .../android/drawers/DraftsListAdapter.java | 2 +- .../android/drawers/FilterAdapter.java | 4 +-- .../drawers/NotificationsListAdapter.java | 4 +-- .../android/drawers/PixelfedListAdapter.java | 2 +- .../android/drawers/PlaylistAdapter.java | 2 +- .../drawers/ScheduledTootsListAdapter.java | 2 +- .../drawers/SearchTootsListAdapter.java | 2 +- .../android/drawers/SliderAdapter.java | 4 +-- .../android/drawers/StatusListAdapter.java | 14 ++++----- .../fragments/ColorSettingsFragment.java | 2 +- .../fragments/ContentSettingsFragment.java | 4 +-- .../DisplayAdminReportsFragment.java | 2 +- .../fragments/DisplayBookmarksFragment.java | 2 +- .../DisplayBookmarksPixelfedFragment.java | 2 +- .../fragments/DisplayDraftsFragment.java | 2 +- .../DisplayFavoritesPeertubeFragment.java | 2 +- .../fragments/DisplayFiltersFragment.java | 2 +- .../fragments/DisplayListsFragment.java | 2 +- .../DisplayMutedInstanceFragment.java | 2 +- .../fragments/DisplayPlaylistsFragment.java | 2 +- .../fedilab/android/helper/CrossActions.java | 12 ++++---- .../app/fedilab/android/helper/Helper.java | 10 +++---- app/src/main/res/values/styles.xml | 1 + build.gradle | 2 +- 39 files changed, 82 insertions(+), 81 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java b/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java index aed327b18..5f9dd9338 100644 --- a/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java @@ -184,7 +184,7 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction builderInner = new AlertDialog.Builder(AccountReportActivity.this, R.style.AppThemeDark); builderInner.setTitle(R.string.reconnect_account); builderInner.setMessage(R.string.reconnect_account_message); - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java index 5a0ff5484..41b250638 100644 --- a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java @@ -483,7 +483,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou new UpdateCredentialAsyncTask(getApplicationContext(), newCustomFields, profile_username, profile_note, profile_picture, avatarName, header_picture, headerName, profile_privacy, sensitive, EditProfileActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/ListActivity.java b/app/src/main/java/app/fedilab/android/activities/ListActivity.java index b3f467dac..ab4243ed4 100644 --- a/app/src/main/java/app/fedilab/android/activities/ListActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ListActivity.java @@ -214,7 +214,7 @@ public class ListActivity extends BaseActivity implements OnListActionInterface dialog.dismiss(); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java b/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java index 4dbcbdab0..249683d3a 100644 --- a/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java @@ -165,7 +165,7 @@ public class MutedInstanceActivity extends BaseActivity implements OnRetrieveDom } } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java b/app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java index 8cac20868..7aa997685 100644 --- a/app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java @@ -393,7 +393,7 @@ public class OwnerNotificationActivity extends BaseActivity implements OnRetriev dialog.dismiss(); } }) - .setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java b/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java index 1d8e6e3dc..6ead813eb 100644 --- a/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java @@ -419,7 +419,7 @@ public class OwnerStatusActivity extends BaseActivity implements OnRetrieveFeeds dialog.dismiss(); } }) - .setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java index 8d5e04b71..2c67b5c05 100644 --- a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java @@ -443,7 +443,7 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube LinearLayout.LayoutParams.WRAP_CONTENT); input.setLayoutParams(lp); builderInner.setView(input); - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -820,7 +820,7 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube final ArrayAdapter arrayAdapter = new ArrayAdapter(PeertubeActivity.this, android.R.layout.select_dialog_item); for (String resolution : peertube.getResolution()) arrayAdapter.add(resolution + "p"); - builderSingle.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java index 9e56ab0b2..aca072edb 100644 --- a/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java @@ -163,7 +163,7 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie } builderInner = new AlertDialog.Builder(PeertubeEditUploadActivity.this, style); builderInner.setMessage(getString(R.string.delete_video_confirmation)); - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java b/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java index 0caba7971..a3a6f2b55 100644 --- a/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java @@ -461,14 +461,14 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi saveImage(); } }); - builder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); } }); - builder.setNeutralButton(R.string.discard, new DialogInterface.OnClickListener() { + builder.setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { finish(); diff --git a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java index e2e942337..d7e7dbb11 100644 --- a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java @@ -270,7 +270,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu finish(); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); @@ -1259,7 +1259,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu if (currentVersion.compareTo(minVersion) == 1 || currentVersion.equals(minVersion)) { AlertDialog.Builder builderSingle = new AlertDialog.Builder(PixelfedComposeActivity.this, style); builderSingle.setTitle(getString(R.string.choose_schedule)); - builderSingle.setNeutralButton(R.string.device_schedule, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.device_schedule, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { deviceSchedule(time[0]); @@ -1425,7 +1425,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu dialog.setTitle(R.string.toot_visibility_tilte); final String[] stringArray = getResources().getStringArray(R.array.toot_visibility); final ArrayAdapter arrayAdapter = new ArrayAdapter<>(PixelfedComposeActivity.this, android.R.layout.simple_list_item_1, stringArray); - dialog.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int position) { dialog.dismiss(); @@ -1502,7 +1502,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu finish(); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java index 6216375a2..b8e77ee51 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java @@ -795,7 +795,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt AlertDialog.Builder unfollowConfirm = new AlertDialog.Builder(ShowAccountActivity.this, style); unfollowConfirm.setTitle(getString(R.string.unfollow_confirm)); unfollowConfirm.setMessage(account.getAcct()); - unfollowConfirm.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + unfollowConfirm.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -845,7 +845,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt input.setText(userNote.getNote()); input.setImeOptions(EditorInfo.IME_FLAG_NO_ENTER_ACTION); builderInner.setView(input); - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -1361,7 +1361,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt } AlertDialog.Builder builderSingle = new AlertDialog.Builder(ShowAccountActivity.this, style); builderSingle.setTitle(getString(R.string.action_lists_add_to)); - builderSingle.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -1425,7 +1425,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt input.setLayoutParams(lp); builderInner.setView(input); doActionAccount = API.StatusAction.REPORT; - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -1459,7 +1459,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt } input.setImeOptions(EditorInfo.IME_FLAG_NO_ENTER_ACTION); builderInner.setView(input); - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -1499,7 +1499,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt default: return true; } - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 625e2a62b..ac4b710d7 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -351,7 +351,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, finish(); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); @@ -1695,7 +1695,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, dialog.dismiss(); } }); - alert.setNeutralButton(R.string.accounts, new DialogInterface.OnClickListener() { + alert.setNegativeButton(R.string.accounts, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { new RetrieveAccountsForReplyAsyncTask(getApplicationContext(), tootReply.getReblog() != null ? tootReply.getReblog() : tootReply, TootActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); dialog.dismiss(); @@ -1832,7 +1832,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, dialog.dismiss(); } }); - transAlert.setNeutralButton(R.string.validate, new DialogInterface.OnClickListener() { + transAlert.setNegativeButton(R.string.validate, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { TextView toot_trans = popup_trans.findViewById(R.id.toot_trans); TextView cw_trans = popup_trans.findViewById(R.id.cw_trans); @@ -1868,7 +1868,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, int paddingPixel = 15; float density = getResources().getDisplayMetrics().density; int paddingDp = (int) (paddingPixel * density); - builder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); } @@ -1950,7 +1950,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } }); builderSingle.setView(dialogView); - builderSingle.setNeutralButton(R.string.validate, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.validate, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -2004,7 +2004,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, ids[i] = draft.getId(); i++; } - builderSingle.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -2024,7 +2024,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, dialog.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogConfirm, int which) { dialogConfirm.dismiss(); @@ -2125,7 +2125,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, if (currentVersion.compareTo(minVersion) == 1 || currentVersion.equals(minVersion)) { AlertDialog.Builder builderSingle = new AlertDialog.Builder(TootActivity.this, style); builderSingle.setTitle(getString(R.string.choose_schedule)); - builderSingle.setNeutralButton(R.string.device_schedule, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.device_schedule, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { deviceSchedule(time[0]); @@ -2231,7 +2231,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } } - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { toot_it.setEnabled(true); @@ -2451,7 +2451,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } }); - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -2486,7 +2486,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, AlertDialog.Builder dialog = new AlertDialog.Builder(TootActivity.this, style); dialog.setMessage(R.string.toot_delete_media); - dialog.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -2535,7 +2535,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, dialog.setTitle(R.string.toot_visibility_tilte); final String[] stringArray = getResources().getStringArray(R.array.toot_visibility); final ArrayAdapter arrayAdapter = new ArrayAdapter<>(TootActivity.this, android.R.layout.simple_list_item_1, stringArray); - dialog.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int position) { dialog.dismiss(); @@ -2612,7 +2612,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, finish(); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); @@ -3792,7 +3792,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } - alertPoll.setNeutralButton(R.string.delete, new DialogInterface.OnClickListener() { + alertPoll.setNegativeButton(R.string.delete, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { if (poll != null) poll = null; @@ -3960,7 +3960,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, final AlertDialog.Builder builderSingle = new AlertDialog.Builder(TootActivity.this, style); AccountsReplyAdapter accountsReplyAdapter = new AccountsReplyAdapter(new WeakReference<>(TootActivity.this), accounts, checkedValues); builderSingle.setTitle(getString(R.string.select_accounts)).setAdapter(accountsReplyAdapter, null); - builderSingle.setNeutralButton(R.string.validate, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.validate, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java b/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java index f214ccf15..aecb09901 100644 --- a/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/WebviewActivity.java @@ -261,7 +261,7 @@ public class WebviewActivity extends BaseActivity { AlertDialog.Builder builder = new AlertDialog.Builder(WebviewActivity.this, style); builder.setTitle(R.string.list_of_blocked_domains); - builder.setNeutralButton(R.string.close, new DialogInterface.OnClickListener() { + builder.setNegativeButton(R.string.close, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java index b532b481b..a848346f7 100644 --- a/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java @@ -236,7 +236,7 @@ public class AccountsListAdapter extends RecyclerView.Adapter implements OnPostA AlertDialog.Builder unfollowConfirm = new AlertDialog.Builder(context, style); unfollowConfirm.setTitle(context.getString(R.string.unfollow_confirm)); unfollowConfirm.setMessage(account.getAcct()); - unfollowConfirm.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + unfollowConfirm.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java index b5e065e73..0a97e64fe 100644 --- a/app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java @@ -109,7 +109,7 @@ public class DomainsListAdapter extends RecyclerView.Adapter implements OnRetrie dialog.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/DraftsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/DraftsListAdapter.java index d539bb6eb..84af250fd 100644 --- a/app/src/main/java/app/fedilab/android/drawers/DraftsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/DraftsListAdapter.java @@ -163,7 +163,7 @@ public class DraftsListAdapter extends BaseAdapter { dialog.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java b/app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java index 7b811bf2f..92370b768 100644 --- a/app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java @@ -217,7 +217,7 @@ public class FilterAdapter extends BaseAdapter implements OnFilterActionInterfac dialog.dismiss(); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); @@ -259,7 +259,7 @@ public class FilterAdapter extends BaseAdapter implements OnFilterActionInterfac dialog.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index a9995bc20..fba201a3e 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -1028,7 +1028,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On input.setLayoutParams(lp); builderInner.setView(input); } - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -1175,7 +1175,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On new PostNotificationsAsyncTask(context, notification.getId(), NotificationsListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); dialog.dismiss(); } - }).setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + }).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java index b439aae85..c48bae6bb 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java @@ -942,7 +942,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA input.setLayoutParams(lp); builderInner.setView(input); } - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/PlaylistAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PlaylistAdapter.java index a580da679..56a1c7b17 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PlaylistAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PlaylistAdapter.java @@ -152,7 +152,7 @@ public class PlaylistAdapter extends BaseAdapter implements OnPlaylistActionInte dialog.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/ScheduledTootsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ScheduledTootsListAdapter.java index cfe28b212..39384b896 100644 --- a/app/src/main/java/app/fedilab/android/drawers/ScheduledTootsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/ScheduledTootsListAdapter.java @@ -226,7 +226,7 @@ public class ScheduledTootsListAdapter extends BaseAdapter implements OnPostActi dialog.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/SearchTootsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/SearchTootsListAdapter.java index b2030d227..bfe164dfa 100644 --- a/app/src/main/java/app/fedilab/android/drawers/SearchTootsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/SearchTootsListAdapter.java @@ -149,7 +149,7 @@ public class SearchTootsListAdapter extends BaseAdapter { dialog.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java b/app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java index 92f0a4396..4dd7607c9 100644 --- a/app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java @@ -163,7 +163,7 @@ public class SliderAdapter extends SliderViewAdapter arrayAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, stringArray); - dialog.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int position) { dialog.dismiss(); @@ -2898,7 +2898,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct input.setLayoutParams(lp); builderInner.setView(input); } - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -3299,7 +3299,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct input.setLayoutParams(lp); builderInner.setView(input); } - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -4128,7 +4128,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct } } - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java index 4dc95dc03..03dd9b49b 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java @@ -63,7 +63,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat { } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java index 67c7bed9d..405f4f228 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java @@ -1601,7 +1601,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot dialog.setTitle(R.string.toot_visibility_tilte); final String[] stringArray = getResources().getStringArray(R.array.toot_visibility); final ArrayAdapter arrayAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, stringArray); - dialog.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int position) { dialog.dismiss(); @@ -2409,7 +2409,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, style); View icon_selector = inflater.inflate(R.layout.dialog_icon_selector, null); dialogBuilder.setView(icon_selector); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java index ff6a3b374..8d7e07a39 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java @@ -215,7 +215,7 @@ public class DisplayAdminReportsFragment extends Fragment implements OnAdminActi builderInner = new AlertDialog.Builder(context, R.style.AppThemeDark); builderInner.setTitle(R.string.reconnect_account); builderInner.setMessage(R.string.reconnect_account_message); - builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksFragment.java index 0bec8f283..78662a7d4 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksFragment.java @@ -148,7 +148,7 @@ public class DisplayBookmarksFragment extends Fragment implements OnRetrieveFeed dialogConfirm.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogConfirm, int which) { dialogConfirm.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksPixelfedFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksPixelfedFragment.java index 163399341..cacd01631 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksPixelfedFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksPixelfedFragment.java @@ -147,7 +147,7 @@ public class DisplayBookmarksPixelfedFragment extends Fragment implements OnRetr dialogConfirm.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogConfirm, int which) { dialogConfirm.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayDraftsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayDraftsFragment.java index c49a10b83..883ddfb47 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayDraftsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayDraftsFragment.java @@ -124,7 +124,7 @@ public class DisplayDraftsFragment extends Fragment { dialogConfirm.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogConfirm, int which) { dialogConfirm.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayFavoritesPeertubeFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayFavoritesPeertubeFragment.java index 01c1a682b..fde074e28 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayFavoritesPeertubeFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayFavoritesPeertubeFragment.java @@ -150,7 +150,7 @@ public class DisplayFavoritesPeertubeFragment extends Fragment implements OnRetr dialogConfirm.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogConfirm, int which) { dialogConfirm.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java index 8198c37c5..abc50d299 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java @@ -189,7 +189,7 @@ public class DisplayFiltersFragment extends Fragment implements OnFilterActionIn add_new.setEnabled(false); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java index 13052132d..4efabdf3d 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java @@ -125,7 +125,7 @@ public class DisplayListsFragment extends Fragment implements OnListActionInterf add_new.setEnabled(false); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java index f9c40181e..11b01a9c1 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java @@ -194,7 +194,7 @@ public class DisplayMutedInstanceFragment extends Fragment implements OnRetrieve } } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java index 7e839c1c7..467e62213 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java @@ -264,7 +264,7 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/helper/CrossActions.java b/app/src/main/java/app/fedilab/android/helper/CrossActions.java index 792a079bf..adf006654 100644 --- a/app/src/main/java/app/fedilab/android/helper/CrossActions.java +++ b/app/src/main/java/app/fedilab/android/helper/CrossActions.java @@ -226,7 +226,7 @@ public class CrossActions { accountArray[i] = account; i++; } - builderSingle.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -509,7 +509,7 @@ public class CrossActions { accountArray[i] = account; i++; } - builderSingle.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -596,7 +596,7 @@ public class CrossActions { accountArray[i] = account; i++; } - builderSingle.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -753,7 +753,7 @@ public class CrossActions { accountArray[i] = account; i++; } - builderSingle.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -845,7 +845,7 @@ public class CrossActions { dialog.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -920,7 +920,7 @@ public class CrossActions { dialog.dismiss(); } }) - .setNeutralButton(R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index f7fbc625b..cab4dd834 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -1104,7 +1104,7 @@ public class Helper { } }) - .setNeutralButton(context.getString(R.string.cancel), new DialogInterface.OnClickListener() { + .setNegativeButton(context.getString(R.string.cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); } @@ -1578,7 +1578,7 @@ public class Helper { item.setVisible(false); } }) - .setNeutralButton(android.R.string.no, new DialogInterface.OnClickListener() { + .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { // do nothing } @@ -4306,7 +4306,7 @@ public class Helper { dialog.dismiss(); } }) - .setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); } @@ -4718,7 +4718,7 @@ public class Helper { dialog.dismiss(); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); @@ -4800,7 +4800,7 @@ public class Helper { dialog.dismiss(); } }); - dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() { + dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c3c9fcadc..d433fc073 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -105,6 +105,7 @@ true @android:color/transparent @null + @color/black @color/black diff --git a/build.gradle b/build.gradle index 31175778d..07aecfa23 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:3.5.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files