be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Always use our strings, not android ones

This commit is contained in:
Stypox 2021-08-30 16:18:40 +02:00
parent 039bd5d413
commit cfdcb92fa3
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2071,7 +2071,7 @@ public final class VideoDetailFragment
new AlertDialog.Builder(activity) new AlertDialog.Builder(activity)
.setTitle(R.string.clear_queue_confirmation_description) .setTitle(R.string.clear_queue_confirmation_description)
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.setPositiveButton(android.R.string.yes, (dialog, which) -> { .setPositiveButton(R.string.ok, (dialog, which) -> {
onAllow.run(); onAllow.run();
dialog.dismiss(); dialog.dismiss();
}).show(); }).show();

24
app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt
View File

@ -143,21 +143,15 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
).get(FeedGroupDialogViewModel::class.java) ).get(FeedGroupDialogViewModel::class.java)
viewModel.groupLiveData.observe(viewLifecycleOwner, Observer(::handleGroup)) viewModel.groupLiveData.observe(viewLifecycleOwner, Observer(::handleGroup))
viewModel.subscriptionsLiveData.observe( viewModel.subscriptionsLiveData.observe(viewLifecycleOwner) {
viewLifecycleOwner, setupSubscriptionPicker(it.first, it.second)
Observer { }
setupSubscriptionPicker(it.first, it.second) viewModel.dialogEventLiveData.observe(viewLifecycleOwner) {
when (it) {
ProcessingEvent -> disableInput()
SuccessEvent -> dismiss()
} }
) }
viewModel.dialogEventLiveData.observe(
viewLifecycleOwner,
Observer {
when (it) {
ProcessingEvent -> disableInput()
SuccessEvent -> dismiss()
}
}
)
subscriptionGroupAdapter = GroupAdapter<GroupieViewHolder>().apply { subscriptionGroupAdapter = GroupAdapter<GroupieViewHolder>().apply {
add(subscriptionMainSection) add(subscriptionMainSection)
@ -437,7 +431,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable {
feedGroupCreateBinding.confirmButton.setText( feedGroupCreateBinding.confirmButton.setText(
when { when {
currentScreen == InitialScreen && groupId == NO_GROUP_SELECTED -> R.string.create currentScreen == InitialScreen && groupId == NO_GROUP_SELECTED -> R.string.create
else -> android.R.string.ok else -> R.string.ok
} }
) )

4
app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
View File

@ -232,11 +232,11 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
final AlertDialog.Builder alert = new AlertDialog.Builder(requireContext()); final AlertDialog.Builder alert = new AlertDialog.Builder(requireContext());
alert.setTitle(R.string.import_settings); alert.setTitle(R.string.import_settings);
alert.setNegativeButton(android.R.string.no, (dialog, which) -> { alert.setNegativeButton(R.string.cancel, (dialog, which) -> {
dialog.dismiss(); dialog.dismiss();
finishImport(importDataUri); finishImport(importDataUri);
}); });
alert.setPositiveButton(getString(R.string.ok), (dialog, which) -> { alert.setPositiveButton(R.string.ok, (dialog, which) -> {
dialog.dismiss(); dialog.dismiss();
manager.loadSharedPreferences(PreferenceManager manager.loadSharedPreferences(PreferenceManager
.getDefaultSharedPreferences(requireContext())); .getDefaultSharedPreferences(requireContext()));