Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix with neutral button

This commit is contained in:
tom79 2019-11-10 14:32:49 +01:00
parent df2b8d0e85
commit 1c01f31397
39 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java
View File

@ -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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
View File

@ -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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/activities/ListActivity.java
View File

@ -214,7 +214,7 @@ public class ListActivity extends BaseActivity implements OnListActionInterface
dialog.dismiss();
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java
View File

@ -165,7 +165,7 @@ public class MutedInstanceActivity extends BaseActivity implements OnRetrieveDom
}
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java
View File

@ -393,7 +393,7 @@ public class OwnerNotificationActivity extends BaseActivity implements OnRetriev
dialog.dismiss();
}
})
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java
View File

@ -419,7 +419,7 @@ public class OwnerStatusActivity extends BaseActivity implements OnRetrieveFeeds
dialog.dismiss();
}
})
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

4
app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java
View File

@ -443,7 +443,7 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube
LinearLayout.LayoutParams.WRAP_CONTENT);
input.setLayoutParams(lp);
builderInner.setView(input);
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(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<String> arrayAdapter = new ArrayAdapter<String>(PeertubeActivity.this, android.R.layout.select_dialog_item);
for (String resolution : peertube.getResolution())
arrayAdapter.add(resolution + "p");
builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java
View File

@ -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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
View File

@ -461,7 +461,7 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
saveImage();
}
});
builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

8
app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java
View File

@ -280,7 +280,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
finish();
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
@ -1274,7 +1274,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.setNegativeButton(R.string.device_schedule, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(R.string.device_schedule, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
deviceSchedule(time[0]);
@ -1443,7 +1443,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<String> arrayAdapter = new ArrayAdapter<>(PixelfedComposeActivity.this, android.R.layout.simple_list_item_1, stringArray);
dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialog.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int position) {
dialog.dismiss();
@ -1520,7 +1520,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
finish();
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

12
app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
View File

@ -797,7 +797,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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
unfollowConfirm.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -847,7 +847,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
input.setText(userNote.getNote());
input.setImeOptions(EditorInfo.IME_FLAG_NO_ENTER_ACTION);
builderInner.setView(input);
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -1363,7 +1363,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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -1427,7 +1427,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
input.setLayoutParams(lp);
builderInner.setView(input);
doActionAccount = API.StatusAction.REPORT;
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -1461,7 +1461,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
}
input.setImeOptions(EditorInfo.IME_FLAG_NO_ENTER_ACTION);
builderInner.setView(input);
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -1501,7 +1501,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
default:
return true;
}
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

26
app/src/main/java/app/fedilab/android/activities/TootActivity.java
View File

@ -351,7 +351,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
finish();
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(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.setNegativeButton(R.string.accounts, new DialogInterface.OnClickListener() {
alert.setNeutralButton(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.setNegativeButton(R.string.validate, new DialogInterface.OnClickListener() {
transAlert.setNeutralButton(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);
@ -1950,7 +1950,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
}
});
builderSingle.setView(dialogView);
builderSingle.setNegativeButton(R.string.validate, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(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();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(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.setNegativeButton(R.string.device_schedule, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialog.setNeutralButton(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<String> arrayAdapter = new ArrayAdapter<>(TootActivity.this, android.R.layout.simple_list_item_1, stringArray);
dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialog.setNeutralButton(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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
@ -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.setNegativeButton(R.string.validate, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(R.string.validate, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/activities/WebviewActivity.java
View File

@ -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.setNegativeButton(R.string.close, new DialogInterface.OnClickListener() {
builder.setNeutralButton(R.string.close, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/drawers/AccountsListAdapter.java
View File

@ -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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
unfollowConfirm.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/drawers/DomainsListAdapter.java
View File

@ -109,7 +109,7 @@ public class DomainsListAdapter extends RecyclerView.Adapter implements OnRetrie
dialog.dismiss();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/drawers/DraftsListAdapter.java
View File

@ -163,7 +163,7 @@ public class DraftsListAdapter extends BaseAdapter {
dialog.dismiss();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

4
app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java
View File

@ -217,7 +217,7 @@ public class FilterAdapter extends BaseAdapter implements OnFilterActionInterfac
dialog.dismiss();
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(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();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

4
app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
View File

@ -1028,7 +1028,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
input.setLayoutParams(lp);
builderInner.setView(input);
}
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(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();
}
}).setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
}).setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java
View File

@ -927,7 +927,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
input.setLayoutParams(lp);
builderInner.setView(input);
}
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/drawers/PlaylistAdapter.java
View File

@ -152,7 +152,7 @@ public class PlaylistAdapter extends BaseAdapter implements OnPlaylistActionInte
dialog.dismiss();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/drawers/ScheduledTootsListAdapter.java
View File

@ -226,7 +226,7 @@ public class ScheduledTootsListAdapter extends BaseAdapter implements OnPostActi
dialog.dismiss();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/drawers/SearchTootsListAdapter.java
View File

@ -149,7 +149,7 @@ public class SearchTootsListAdapter extends BaseAdapter {
dialog.dismiss();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

4
app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java
View File

@ -163,7 +163,7 @@ public class SliderAdapter extends SliderViewAdapter<SliderAdapter.SliderAdapter
}
});
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -208,7 +208,7 @@ public class SliderAdapter extends SliderViewAdapter<SliderAdapter.SliderAdapter
AlertDialog.Builder dialog = new AlertDialog.Builder(contextWeakReference.get(), style);
dialog.setMessage(R.string.toot_delete_media);
dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialog.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

12
app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
View File

@ -1195,7 +1195,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
LinearLayout.LayoutParams.WRAP_CONTENT);
input.setLayoutParams(lp);
builderInner.setView(input);
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -1234,7 +1234,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
builderInner = new AlertDialog.Builder(context, style);
builderInner.setTitle(R.string.delete_comment);
builderInner.setMessage(R.string.delete_comment_confirm);
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -2481,7 +2481,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
dialog.setTitle(R.string.toot_visibility_tilte);
final String[] stringArray = context.getResources().getStringArray(R.array.toot_visibility);
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, stringArray);
dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialog.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int position) {
dialog.dismiss();
@ -2899,7 +2899,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
input.setLayoutParams(lp);
builderInner.setView(input);
}
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -3300,7 +3300,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
input.setLayoutParams(lp);
builderInner.setView(input);
}
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
@ -4129,7 +4129,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
}
builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java
View File

@ -54,7 +54,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat {
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

4
app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
View File

@ -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<String> arrayAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, stringArray);
dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialog.setNeutralButton(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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java
View File

@ -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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderInner.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksFragment.java
View File

@ -148,7 +148,7 @@ public class DisplayBookmarksFragment extends Fragment implements OnRetrieveFeed
dialogConfirm.dismiss();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogConfirm, int which) {
dialogConfirm.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/DisplayBookmarksPixelfedFragment.java
View File

@ -147,7 +147,7 @@ public class DisplayBookmarksPixelfedFragment extends Fragment implements OnRetr
dialogConfirm.dismiss();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogConfirm, int which) {
dialogConfirm.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/DisplayDraftsFragment.java
View File

@ -124,7 +124,7 @@ public class DisplayDraftsFragment extends Fragment {
dialogConfirm.dismiss();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogConfirm, int which) {
dialogConfirm.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/DisplayFavoritesPeertubeFragment.java
View File

@ -150,7 +150,7 @@ public class DisplayFavoritesPeertubeFragment extends Fragment implements OnRetr
dialogConfirm.dismiss();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogConfirm, int which) {
dialogConfirm.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java
View File

@ -189,7 +189,7 @@ public class DisplayFiltersFragment extends Fragment implements OnFilterActionIn
add_new.setEnabled(false);
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java
View File

@ -125,7 +125,7 @@ public class DisplayListsFragment extends Fragment implements OnListActionInterf
add_new.setEnabled(false);
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java
View File

@ -194,7 +194,7 @@ public class DisplayMutedInstanceFragment extends Fragment implements OnRetrieve
}
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

2
app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java
View File

@ -264,7 +264,7 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

12
app/src/main/java/app/fedilab/android/helper/CrossActions.java
View File

@ -226,7 +226,7 @@ public class CrossActions {
accountArray[i] = account;
i++;
}
builderSingle.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(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.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builderSingle.setNeutralButton(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();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(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();
}
})
.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();

10
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

@ -1105,7 +1105,7 @@ public class Helper {
}
})
.setNegativeButton(context.getString(R.string.cancel), new DialogInterface.OnClickListener() {
.setNeutralButton(context.getString(R.string.cancel), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
@ -1579,7 +1579,7 @@ public class Helper {
item.setVisible(false);
}
})
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
.setNeutralButton(android.R.string.no, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
// do nothing
}
@ -4307,7 +4307,7 @@ public class Helper {
dialog.dismiss();
}
})
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
@ -4719,7 +4719,7 @@ public class Helper {
dialog.dismiss();
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
@ -4801,7 +4801,7 @@ public class Helper {
dialog.dismiss();
}
});
dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
dialogBuilder.setNeutralButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();

2
app/src/main/res/drawable-anydpi/ic_edit.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:fillColor="?attr/iconColorMenu"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
</vector>

2
app/src/main/res/drawable-anydpi/ic_person_outline.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?attr/iconColor"
android:fillColor="?attr/iconColorMenu"
android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z" />
</vector>