karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Translation: use Android's cancel/ok.

Browse Source 
Fix #868.
This commit is contained in:
Dennis Guse
2021-07-04 21:41:05 +02:00
parent 54fa2903ed
commit 77f03dcc28
60 changed files with 10 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/io/file/ErrorListDialog.java
+1 -3
View File
@@ -11,8 +11,6 @@ import androidx.fragment.app.FragmentManager;
import java.util.ArrayList;
import de.dennisguse.opentracks.R;
public class ErrorListDialog extends DialogFragment {
public static final String TAG = ErrorListDialog.class.getSimpleName();
@@ -61,7 +59,7 @@ public class ErrorListDialog extends DialogFragment {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity())
.setTitle(title)
.setItems(tracks, null)
.setPositiveButton(R.string.generic_ok, (dialog, which) -> dismiss());
.setPositiveButton(android.R.string.ok, (dialog, which) -> dismiss());
return alertDialogBuilder.create();
}
}
src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
+1 -1
View File
@@ -291,7 +291,7 @@ public class ExportActivity extends FragmentActivity implements ExportServiceRes
private void onExportEnded() {
viewBinding.exportProgressRightButton.setVisibility(View.VISIBLE);
viewBinding.exportProgressRightButton.setText(getString(R.string.generic_ok));
viewBinding.exportProgressRightButton.setText(getString(android.R.string.ok));
viewBinding.exportProgressRightButton.setOnClickListener((view) -> finish());
viewBinding.exportProgressAlertIcon.setVisibility(View.VISIBLE);
src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java
+1 -1
View File
@@ -176,7 +176,7 @@ public class ImportActivity extends FragmentActivity {
viewBinding.importProgressAlertIcon.setVisibility(View.VISIBLE);
viewBinding.importProgressRightButton.setVisibility(View.VISIBLE);
viewBinding.importProgressRightButton.setText(getString(R.string.generic_ok));
viewBinding.importProgressRightButton.setText(getString(android.R.string.ok));
viewBinding.importProgressRightButton.setOnClickListener((view) -> {
getViewModelStore().clear();
finish();
src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity
.setIcon(R.drawable.ic_logo_24dp)
.setTitle(R.string.app_name)
.setMessage(R.string.export_error_post_workout)
.setNeutralButton(R.string.generic_ok, null)
.setNeutralButton(android.R.string.ok, null)
.create()
.show();
}