mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 16:40:32 +00:00
Always use our strings, not android ones
This commit is contained in:
parent
039bd5d413
commit
cfdcb92fa3
@ -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();
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -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()));
|
||||||
|
Loading…
Reference in New Issue
Block a user