Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename string finish to ok, as its content was "OK"

Browse source
This commit is contained in:
Stypox 2021-08-30 16:15:26 +02:00
parent 5ffba55b4a
commit 039bd5d413
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
80 changed files with 81 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.kt
View file

@ -108,7 +108,7 @@ object LicenseFragmentHelper {
alert.setView(webView)
Localization.assureCorrectAppLanguage(context)
alert.setNegativeButton(
context.getString(R.string.finish)
context.getString(R.string.ok)
) { dialog, _ -> dialog.dismiss() }
alert.show()
}

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

@ -681,7 +681,7 @@ public class DownloadDialog extends DialogFragment
new AlertDialog.Builder(context)
.setTitle(R.string.general_error)
.setMessage(msg)
.setNegativeButton(getString(R.string.finish), null)
.setNegativeButton(getString(R.string.ok), null)
.create()
.show();
}

2
app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt
View file

@ -206,7 +206,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
putBoolean(getString(R.string.feed_use_dedicated_fetch_method_key), !usingDedicatedMethod)
}
}
.setPositiveButton(resources.getString(R.string.finish), null)
.setPositiveButton(resources.getString(R.string.ok), null)
.create()
.show()
return true

2
app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java
View file

@ -40,7 +40,7 @@ public class ImportConfirmationDialog extends DialogFragment {
.setMessage(R.string.import_network_expensive_warning)
.setCancelable(true)
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.finish, (dialogInterface, i) -> {
.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
if (resultServiceIntent != null && getContext() != null) {
getContext().startService(resultServiceIntent);
}

2
app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java
View file

@ -164,7 +164,7 @@ public class PlaybackParameterDialog extends DialogFragment {
setPlaybackParameters(initialTempo, initialPitch, initialSkipSilence))
.setNeutralButton(R.string.playback_reset, (dialogInterface, i) ->
setPlaybackParameters(DEFAULT_TEMPO, DEFAULT_PITCH, DEFAULT_SKIP_SILENCE))
.setPositiveButton(R.string.finish, (dialogInterface, i) ->
.setPositiveButton(R.string.ok, (dialogInterface, i) ->
setCurrentPlaybackParameters());
return dialogBuilder.create();

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

@ -184,7 +184,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
new AlertDialog.Builder(requireActivity())
.setMessage(R.string.override_current_data)
.setPositiveButton(R.string.finish, (d, id) ->
.setPositiveButton(R.string.ok, (d, id) ->
importDatabase(file, lastImportDataUri))
.setNegativeButton(R.string.cancel, (d, id) ->
d.cancel())
@ -236,7 +236,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
dialog.dismiss();
finishImport(importDataUri);
});
alert.setPositiveButton(getString(R.string.finish), (dialog, which) -> {
alert.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
dialog.dismiss();
manager.loadSharedPreferences(PreferenceManager
.getDefaultSharedPreferences(requireContext()));

2
app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
View file

@ -179,7 +179,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
final AlertDialog.Builder msg = new AlertDialog.Builder(ctx);
msg.setTitle(title);
msg.setMessage(message);
msg.setPositiveButton(getString(R.string.finish), null);
msg.setPositiveButton(getString(R.string.ok), null);
msg.show();
}

2
app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
View file

@ -218,7 +218,7 @@ public class PeertubeInstanceListFragment extends Fragment {
.setIcon(R.drawable.place_holder_peertube)
.setView(dialogBinding.getRoot())
.setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.finish, (dialog1, which) -> {
.setPositiveButton(R.string.ok, (dialog1, which) -> {
final String url = dialogBinding.dialogEditText.getText().toString();
addInstance(url);
})

2
app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
View file

@ -555,7 +555,7 @@ public class MissionAdapter extends Adapter<ViewHolder> implements Handler.Callb
);
}
builder.setNegativeButton(R.string.finish, (dialog, which) -> dialog.cancel())
builder.setNegativeButton(R.string.ok, (dialog, which) -> dialog.cancel())
.setTitle(mission.storage.getName())
.create()
.show();