Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6848 from Stypox/somali-cancel 

Use custom cancel string everywhere
This commit is contained in:
Tobi 2021-08-22 22:36:14 +02:00 committed by GitHub
parent e4dfce9ee2 f8caed139a
commit bdbb9bead2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
View File

@ -864,7 +864,7 @@ public class DownloadDialog extends DialogFragment
final AlertDialog.Builder askDialog = new AlertDialog.Builder(context) final AlertDialog.Builder askDialog = new AlertDialog.Builder(context)
.setTitle(R.string.download_dialog_title) .setTitle(R.string.download_dialog_title)
.setMessage(msgBody) .setMessage(msgBody)
.setNegativeButton(android.R.string.cancel, null); .setNegativeButton(R.string.cancel, null);
final StoredFileHelper finalStorage = storage; final StoredFileHelper finalStorage = storage;

4
app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View File

@ -2080,7 +2080,7 @@ public final class VideoDetailFragment
private void showClearingQueueConfirmation(final Runnable onAllow) { private void showClearingQueueConfirmation(final Runnable onAllow) {
new AlertDialog.Builder(activity) new AlertDialog.Builder(activity)
.setTitle(R.string.clear_queue_confirmation_description) .setTitle(R.string.clear_queue_confirmation_description)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.setPositiveButton(android.R.string.yes, (dialog, which) -> { .setPositiveButton(android.R.string.yes, (dialog, which) -> {
onAllow.run(); onAllow.run();
dialog.dismiss(); dialog.dismiss();
@ -2096,7 +2096,7 @@ public final class VideoDetailFragment
resolutions[i] = sortedVideoStreams.get(i).getResolution(); resolutions[i] = sortedVideoStreams.get(i).getResolution();
} }
final AlertDialog.Builder builder = new AlertDialog.Builder(activity) final AlertDialog.Builder builder = new AlertDialog.Builder(activity)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.setNeutralButton(R.string.open_in_browser, (dialog, i) -> .setNeutralButton(R.string.open_in_browser, (dialog, i) ->
ShareUtils.openUrlInBrowser(requireActivity(), url) ShareUtils.openUrlInBrowser(requireActivity(), url)
); );

2
app/src/main/res/layout/dialog_feed_group_create.xml
View File

@ -205,7 +205,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toStartOf="@+id/confirm_button" android:layout_toStartOf="@+id/confirm_button"
android:text="@android:string/cancel" /> android:text="@string/cancel" />
<Button <Button
android:id="@+id/confirm_button" android:id="@+id/confirm_button"