From d1ec9eb25fb7494c14e5795826dff54847e98abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Thu, 4 Jun 2026 14:02:46 +0100 Subject: [PATCH] Update "Cancel" and "Delete" string identifiers to lowercase --- .../activities/BackupRestoreProgressActivity.java | 2 +- .../activities/DataManagementActivity.java | 6 +++--- .../activities/HealthConnectInitialSyncDialog.java | 2 +- .../gadgetbridge/activities/SettingsActivity.java | 2 +- .../appmanager/AbstractAppManagerFragment.java | 2 +- .../audiorecordings/AudioRecordingsAdapter.java | 4 ++-- .../activities/debug/AbstractDebugFragment.kt | 2 +- .../activities/debug/CompanionDebugFragment.kt | 4 ++-- .../activities/debug/DatabaseDebugFragment.kt | 8 ++++---- .../activities/debug/DatabaseTableDebugFragment.kt | 12 ++++++------ .../activities/debug/HealthConnectDebugFragment.kt | 2 +- .../activities/debug/MainDebugFragment.kt | 2 +- .../activities/debug/OtherDebugFragment.kt | 2 +- .../activities/debug/WeatherDebugFragment.kt | 2 +- .../activities/debug/WidgetsDebugFragment.kt | 2 +- .../debug/preferences/PreferenceManagerActivity.java | 2 +- .../devicesettings/DeviceSettingsUtils.java | 2 +- .../activities/internet/InternetFirewallActivity.kt | 4 ++-- .../musicmanager/MusicManagerActivity.java | 6 +++--- .../welcome/WelcomeFragmentPermissions.java | 2 +- .../activities/workouts/WorkoutEditor.kt | 4 ++-- .../gadgetbridge/adapter/GBDeviceAdapterv2.java | 12 ++++++------ .../aawireless/AAWirelessSettingsCustomizer.java | 2 +- .../devices/banglejs/BangleJSSettingsCustomizer.java | 2 +- .../gadgetbridge/devices/qhybrid/TimePicker.java | 5 +++-- .../devices/qhybrid/WidgetSettingsActivity.java | 8 ++++---- .../headphones/SonyHeadphonesSettingsCustomizer.java | 2 +- .../gadgetbridge/util/DeviceTypeDialog.kt | 2 +- app/src/main/res/layout/activity_gpx_receiver.xml | 2 +- app/src/main/res/menu/activity_list_context_menu.xml | 2 +- app/src/main/res/menu/menu_audio_recording_item.xml | 2 +- app/src/main/res/values-ar/strings.xml | 4 ++-- app/src/main/res/values-bg/strings.xml | 4 ++-- app/src/main/res/values-ca/strings.xml | 4 ++-- app/src/main/res/values-cs/strings.xml | 4 ++-- app/src/main/res/values-de/strings.xml | 4 ++-- app/src/main/res/values-el/strings.xml | 4 ++-- app/src/main/res/values-en-rGB/strings.xml | 4 ++-- app/src/main/res/values-es/strings.xml | 4 ++-- app/src/main/res/values-et/strings.xml | 4 ++-- app/src/main/res/values-fi/strings.xml | 4 ++-- app/src/main/res/values-fr-rCA/strings.xml | 4 ++-- app/src/main/res/values-fr/strings.xml | 4 ++-- app/src/main/res/values-gl/strings.xml | 4 ++-- app/src/main/res/values-he/strings.xml | 4 ++-- app/src/main/res/values-hr/strings.xml | 4 ++-- app/src/main/res/values-hu/strings.xml | 4 ++-- app/src/main/res/values-id/strings.xml | 4 ++-- app/src/main/res/values-it/strings.xml | 4 ++-- app/src/main/res/values-ja/strings.xml | 4 ++-- app/src/main/res/values-ko/strings.xml | 4 ++-- app/src/main/res/values-nb-rNO/strings.xml | 4 ++-- app/src/main/res/values-nl/strings.xml | 4 ++-- app/src/main/res/values-pl/strings.xml | 4 ++-- app/src/main/res/values-pt-rBR/strings.xml | 4 ++-- app/src/main/res/values-pt-rPT/strings.xml | 4 ++-- app/src/main/res/values-pt/strings.xml | 4 ++-- app/src/main/res/values-ru/strings.xml | 4 ++-- app/src/main/res/values-sk/strings.xml | 4 ++-- app/src/main/res/values-sr/strings.xml | 4 ++-- app/src/main/res/values-sv/strings.xml | 4 ++-- app/src/main/res/values-ta/strings.xml | 4 ++-- app/src/main/res/values-tr/strings.xml | 4 ++-- app/src/main/res/values-uk/strings.xml | 4 ++-- app/src/main/res/values-zh-rCN/strings.xml | 4 ++-- app/src/main/res/values-zh-rTW/strings.xml | 4 ++-- app/src/main/res/values/arrays.xml | 2 +- app/src/main/res/values/strings.xml | 4 ++-- .../main/res/xml/fossil_hr_watchface_settings.xml | 6 +++--- app/src/main/res/xml/fossil_hr_widget_settings.xml | 10 +++++----- 70 files changed, 138 insertions(+), 137 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BackupRestoreProgressActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BackupRestoreProgressActivity.java index cd00708d50..c0aac6fdf1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BackupRestoreProgressActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/BackupRestoreProgressActivity.java @@ -242,7 +242,7 @@ public class BackupRestoreProgressActivity extends AbstractGBActivity { }).start(); } }) - .setNegativeButton(R.string.Cancel, (dialog, which) -> { + .setNegativeButton(R.string.cancel, (dialog, which) -> { }); if ("import".equals(action)) { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java index ae601d58b4..1eefd32c64 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DataManagementActivity.java @@ -105,7 +105,7 @@ public class DataManagementActivity extends AbstractGBActivity { startBackupIntent.putExtra(BackupRestoreProgressActivity.EXTRA_ACTION, "import"); startActivity(startBackupIntent); }) - .setNegativeButton(R.string.Cancel, (dialog, which) -> { + .setNegativeButton(R.string.cancel, (dialog, which) -> { }) .show(); } @@ -233,7 +233,7 @@ public class DataManagementActivity extends AbstractGBActivity { GB.toast(DataManagementActivity.this, getString(R.string.dbmanagementactivity_error_exporting_db, ex.getLocalizedMessage()), Toast.LENGTH_LONG, GB.ERROR, ex); } }) - .setNegativeButton(R.string.Cancel, (dialog, which) -> { + .setNegativeButton(R.string.cancel, (dialog, which) -> { }) .show(); } @@ -255,7 +255,7 @@ public class DataManagementActivity extends AbstractGBActivity { } importShared(); }) - .setNegativeButton(R.string.Cancel, (dialog, which) -> { + .setNegativeButton(R.string.cancel, (dialog, which) -> { }) .show(); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HealthConnectInitialSyncDialog.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HealthConnectInitialSyncDialog.java index fb3d41a7dc..c33ed910ce 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HealthConnectInitialSyncDialog.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/HealthConnectInitialSyncDialog.java @@ -104,7 +104,7 @@ public class HealthConnectInitialSyncDialog extends MaterialDialogFragment { .setPositiveButton(R.string.ok, (dialog, id) -> { handleSyncPeriodSelection(); }) - .setNegativeButton(R.string.Cancel, (dialog, id) -> dismiss()); + .setNegativeButton(R.string.cancel, (dialog, id) -> dismiss()); return builder.create(); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java index c5a3215766..0b1b54ac30 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/SettingsActivity.java @@ -519,7 +519,7 @@ public class SettingsActivity extends AbstractSettingsActivityV2 { editor.putString("opentracks_packagename", fitnessAppEditText.getText().toString()); editor.apply(); }) - .setNegativeButton(R.string.Cancel, (dialog, which) -> {}) + .setNegativeButton(R.string.cancel, (dialog, which) -> {}) .show(); return false; }); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java index 227cae20eb..6565eecae0 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/appmanager/AbstractAppManagerFragment.java @@ -751,7 +751,7 @@ public abstract class AbstractAppManagerFragment extends Fragment { private void deleteAppConfirm(final GBDeviceApp selectedApp, final boolean deleteFromCache) { new MaterialAlertDialogBuilder(getContext()) - .setTitle(R.string.Delete) + .setTitle(R.string.delete) .setMessage(requireContext().getString(R.string.contact_delete_confirm_description, selectedApp.getName())) .setIcon(R.drawable.ic_warning) .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/audiorecordings/AudioRecordingsAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/audiorecordings/AudioRecordingsAdapter.java index 21d819f90e..59ccb8000d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/audiorecordings/AudioRecordingsAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/audiorecordings/AudioRecordingsAdapter.java @@ -131,7 +131,7 @@ public class AudioRecordingsAdapter extends RecyclerView.Adapter { + .setNegativeButton(R.string.cancel, (dialog, which) -> { // do nothing }) .show(); @@ -150,7 +150,7 @@ public class AudioRecordingsAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/AbstractDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/AbstractDebugFragment.kt index dbd53fb4af..5e301bcade 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/AbstractDebugFragment.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/AbstractDebugFragment.kt @@ -40,7 +40,7 @@ abstract class AbstractDebugFragment : AbstractPreferenceFragment() { .setItems(deviceNames) { _, which -> function(selectedDevices[which]) } - .setNegativeButton(R.string.Cancel, null) + .setNegativeButton(R.string.cancel, null) .show() } else { function(selectedDevices[0]) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/CompanionDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/CompanionDebugFragment.kt index 0d12bc6d25..0719f0e77d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/CompanionDebugFragment.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/CompanionDebugFragment.kt @@ -75,7 +75,7 @@ class CompanionDebugFragment : AbstractDebugFragment() { .setIcon(device.icon) .setTitle("Unpair companion device") .setMessage("Unpair ${device.name} (${device.address}) from companion device?") - .setNeutralButton(R.string.Cancel) { _, _ -> } + .setNeutralButton(R.string.cancel) { _, _ -> } .setPositiveButton(R.string.ok) { _, _ -> unpairCompanion(device) } .show() } @@ -93,7 +93,7 @@ class CompanionDebugFragment : AbstractDebugFragment() { .setIcon(device.icon) .setTitle("Pair as companion") .setMessage("Pair ${device.name} (${device.address}) as companion device?") - .setNeutralButton(R.string.Cancel) { _, _ -> } + .setNeutralButton(R.string.cancel) { _, _ -> } .setPositiveButton(R.string.ok) { _, _ -> pairAsCompanion(device) } .show() } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseDebugFragment.kt index e6726f1e31..127670f4c2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseDebugFragment.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseDebugFragment.kt @@ -85,7 +85,7 @@ class DatabaseDebugFragment : AbstractDebugFragment() { .setIcon(R.drawable.ic_warning) .setTitle(R.string.dbmanagementactivity_delete_activity_data_title) .setMessage(R.string.dbmanagementactivity_really_delete_entire_db) - .setPositiveButton(R.string.Delete) { _, _ -> + .setPositiveButton(R.string.delete) { _, _ -> if (GBDatabaseManager.deleteActivityDatabase(requireContext())) { GB.toast( requireContext(), @@ -104,7 +104,7 @@ class DatabaseDebugFragment : AbstractDebugFragment() { ) } } - .setNegativeButton(R.string.Cancel) { _, _ -> } + .setNegativeButton(R.string.cancel) { _, _ -> } .show() } @@ -114,7 +114,7 @@ class DatabaseDebugFragment : AbstractDebugFragment() { .setTitle(R.string.dbmanagementactivity_delete_old_activity_db) .setIcon(R.drawable.ic_warning) .setMessage(R.string.dbmanagementactivity_delete_old_activitydb_confirmation) - .setPositiveButton(R.string.Delete) { _, _ -> + .setPositiveButton(R.string.delete) { _, _ -> if (GBDatabaseManager.deleteOldActivityDatabase(requireContext())) { GB.toast( requireContext(), @@ -134,7 +134,7 @@ class DatabaseDebugFragment : AbstractDebugFragment() { if (!hasOldActivityDatabase()) { findPreference(PREF_DEBUG_DELETE_OLD_DATABASE)!!.isVisible = false } - }.setNegativeButton(R.string.Cancel) { _, _ -> }.show() + }.setNegativeButton(R.string.cancel) { _, _ -> }.show() } // TODO ability to run raw sql from the UI diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseTableDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseTableDebugFragment.kt index 867a2e2dd2..d1a1f7a624 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseTableDebugFragment.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/DatabaseTableDebugFragment.kt @@ -251,7 +251,7 @@ class DatabaseTableDebugFragment : AbstractDebugFragment() { .setNegativeButton(R.string.share) { _, _ -> exportTableAndShare(tableName, startDate, endDate) } - .setNeutralButton(R.string.Cancel, null) + .setNeutralButton(R.string.cancel, null) .show() } @@ -470,7 +470,7 @@ class DatabaseTableDebugFragment : AbstractDebugFragment() { pendingImportTableName = tableName openFileLauncher.launch(arrayOf("text/csv", "text/plain", "*/*")) } - .setNegativeButton(R.string.Cancel, null) + .setNegativeButton(R.string.cancel, null) .show() } @@ -635,7 +635,7 @@ class DatabaseTableDebugFragment : AbstractDebugFragment() { .setIcon(R.drawable.ic_warning) .setTitle("Clear $tableName") .setMessage("Clear $tableName? All data in this table will be deleted.") - .setPositiveButton(R.string.Delete) { _, _ -> + .setPositiveButton(R.string.delete) { _, _ -> try { GBApplication.acquireDB().use { db -> db.database.execSQL("DELETE FROM $tableName;") @@ -646,7 +646,7 @@ class DatabaseTableDebugFragment : AbstractDebugFragment() { GB.toast("Failed to clear table", Toast.LENGTH_LONG, GB.ERROR, e) } } - .setNegativeButton(R.string.Cancel) { _, _ -> } + .setNegativeButton(R.string.cancel) { _, _ -> } .show() } @@ -656,7 +656,7 @@ class DatabaseTableDebugFragment : AbstractDebugFragment() { .setIcon(R.drawable.ic_warning) .setTitle("Drop $tableName") .setMessage("Drop $tableName? All data in this table will be lost, and the table must be re-created manually.") - .setPositiveButton(R.string.Delete) { _, _ -> + .setPositiveButton(R.string.delete) { _, _ -> try { GBApplication.acquireDB().use { db -> db.database.execSQL("DROP TABLE IF EXISTS $tableName;") @@ -666,7 +666,7 @@ class DatabaseTableDebugFragment : AbstractDebugFragment() { GB.toast("Failed to drop table", Toast.LENGTH_LONG, GB.ERROR, e) } } - .setNegativeButton(R.string.Cancel) { _, _ -> } + .setNegativeButton(R.string.cancel) { _, _ -> } .show() } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/HealthConnectDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/HealthConnectDebugFragment.kt index df8695b437..d7c3c1c561 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/HealthConnectDebugFragment.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/HealthConnectDebugFragment.kt @@ -60,7 +60,7 @@ class HealthConnectDebugFragment : AbstractDebugFragment() { } reloadSyncStates() } - .setNegativeButton(R.string.Cancel) { _, _ -> } + .setNegativeButton(R.string.cancel) { _, _ -> } .show() } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/MainDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/MainDebugFragment.kt index 6da29446a2..2564d76bb1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/MainDebugFragment.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/MainDebugFragment.kt @@ -117,7 +117,7 @@ class MainDebugFragment : AbstractDebugFragment() { .setTitle(R.string.warning) .setMessage(R.string.share_log_warning) .setPositiveButton(R.string.ok) { _, _ -> shareLog() } - .setNegativeButton(R.string.Cancel) { _, _ -> } + .setNegativeButton(R.string.cancel) { _, _ -> } .show() } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/OtherDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/OtherDebugFragment.kt index fad6c87b04..845927284d 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/OtherDebugFragment.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/OtherDebugFragment.kt @@ -106,7 +106,7 @@ class OtherDebugFragment : AbstractDebugFragment() { GBApplication.deviceService(it).onReset(GBDeviceProtocol.RESET_FLAGS_FACTORY_RESET) } } - .setNegativeButton(R.string.Cancel) { _, _ -> } + .setNegativeButton(R.string.cancel) { _, _ -> } .show() } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/WeatherDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/WeatherDebugFragment.kt index b5572c7c41..10ee3f1ff8 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/WeatherDebugFragment.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/WeatherDebugFragment.kt @@ -138,7 +138,7 @@ class WeatherDebugFragment : AbstractDebugFragment() { // Delete items.add( RunnableListIconItem( - requireContext().getString(R.string.Delete), + requireContext().getString(R.string.delete), R.drawable.ic_delete ) { val newList = Weather.getWeatherSpecs().toMutableList() diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/WidgetsDebugFragment.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/WidgetsDebugFragment.kt index f22c5352ed..8fc2ad1218 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/WidgetsDebugFragment.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/WidgetsDebugFragment.kt @@ -44,7 +44,7 @@ class WidgetsDebugFragment : AbstractDebugFragment() { val items: MutableList = ArrayList(4) items.add( - RunnableListIconItem(getString(R.string.Delete), R.drawable.ic_delete_forever) { + RunnableListIconItem(getString(R.string.delete), R.drawable.ic_delete_forever) { appWidgetHost.deleteAppWidgetId(appWidgetID) reloadWidgets() } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/preferences/PreferenceManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/preferences/PreferenceManagerActivity.java index 0afea786fd..1d182c89fa 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/preferences/PreferenceManagerActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/debug/preferences/PreferenceManagerActivity.java @@ -191,7 +191,7 @@ public class PreferenceManagerActivity extends AbstractGBActivity implements Men .setIcon(R.drawable.ic_warning) .setTitle(R.string.debugactivity_confirm_remove_device_preferences_title) .setMessage(R.string.debugactivity_confirm_remove_device_preferences) - .setNegativeButton(R.string.Cancel, (dialog, which) -> { + .setNegativeButton(R.string.cancel, (dialog, which) -> { dialog.dismiss(); }) .setPositiveButton(R.string.ok, (dialog, which) -> { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java index 6ead69a78b..44cf31b0fd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/devicesettings/DeviceSettingsUtils.java @@ -277,7 +277,7 @@ public final class DeviceSettingsUtils { } handler.notifyPreferenceChanged(preferenceKey); }) - .setNegativeButton(handler.getContext().getString(R.string.Cancel), (dialog, which) -> dialog.dismiss()) + .setNegativeButton(handler.getContext().getString(R.string.cancel), (dialog, which) -> dialog.dismiss()) .create() .show(); return false; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/internet/InternetFirewallActivity.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/internet/InternetFirewallActivity.kt index 0f5eba975b..267c541b8f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/internet/InternetFirewallActivity.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/internet/InternetFirewallActivity.kt @@ -155,11 +155,11 @@ class InternetFirewallActivity : AbstractGBActivity() { saveRuleToDatabase(domain, action) } loadRules() - }.setNegativeButton(R.string.Cancel, null) + }.setNegativeButton(R.string.cancel, null) // Add delete button if editing if (isEditing) { - dialogBuilder.setNeutralButton(R.string.Delete) { _, _ -> + dialogBuilder.setNeutralButton(R.string.delete) { _, _ -> deleteRuleFromDatabase(existingRule) loadRules() } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/musicmanager/MusicManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/musicmanager/MusicManagerActivity.java index 77ab01b3f2..2caac2cf84 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/musicmanager/MusicManagerActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/musicmanager/MusicManagerActivity.java @@ -437,7 +437,7 @@ public class MusicManagerActivity extends AbstractGBActivity { list.add(music.getId()); new MaterialAlertDialogBuilder(this) - .setTitle(R.string.Delete) + .setTitle(R.string.delete) .setMessage(this.getString(R.string.music_delete_confirm_description, music.getTitle())) .setIcon(R.drawable.ic_warning) .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> { @@ -449,7 +449,7 @@ public class MusicManagerActivity extends AbstractGBActivity { private void deleteMusicMultipleConfirm(final ArrayList list) { new MaterialAlertDialogBuilder(this) - .setTitle(R.string.Delete) + .setTitle(R.string.delete) .setMessage(this.getString(R.string.music_delete_multiple_confirm_description, list.size())) .setIcon(R.drawable.ic_warning) .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> { @@ -539,7 +539,7 @@ public class MusicManagerActivity extends AbstractGBActivity { if(playlist.getId() == 0) return; new MaterialAlertDialogBuilder(this) - .setTitle(R.string.Delete) + .setTitle(R.string.delete) .setMessage(this.getString(R.string.music_delete_confirm_description, playlist.getName())) .setIcon(R.drawable.ic_warning) .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/welcome/WelcomeFragmentPermissions.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/welcome/WelcomeFragmentPermissions.java index b9ce1b7280..aba6ffef58 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/welcome/WelcomeFragmentPermissions.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/welcome/WelcomeFragmentPermissions.java @@ -75,7 +75,7 @@ public class WelcomeFragmentPermissions extends Fragment { .apply(); requireActivity().finish(); }) - .setNegativeButton(R.string.Cancel, (dialog, which) -> { + .setNegativeButton(R.string.cancel, (dialog, which) -> { // do nothing }) .show(); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutEditor.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutEditor.kt index 372eeb69b4..94cfd0e36e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutEditor.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/WorkoutEditor.kt @@ -52,7 +52,7 @@ class WorkoutEditor(private val context: Context) { workout.summary.update() callback.onWorkoutUpdated() } - .setNegativeButton(R.string.Cancel, null) + .setNegativeButton(R.string.cancel, null) .show() } @@ -131,7 +131,7 @@ class WorkoutEditor(private val context: Context) { workout.summary.update() callback.onWorkoutUpdated() } - .setNegativeButton(R.string.Cancel) { dialog2, which2 -> } + .setNegativeButton(R.string.cancel) { dialog2, which2 -> } .show() dialog!!.dismiss() } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java index e7f6d4b75a..34b0fd7c4e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java @@ -636,7 +636,7 @@ public class GBDeviceAdapterv2 extends ListAdapter removeDevice(device, true)) - .setNegativeButton(R.string.Cancel, (dialog, which) -> {}); + .setNegativeButton(R.string.cancel, (dialog, which) -> {}); if (deviceHasFiles(device)) { builder.setNeutralButton(R.string.delete_device_and_retain_files, @@ -1159,7 +1159,7 @@ public class GBDeviceAdapterv2 extends ListAdapter { + items.add(new RunnableListIconItem(context.getString(R.string.delete), R.drawable.ic_delete, () -> { final Intent intent = new Intent(AAWirelessPrefs.ACTION_PHONE_DELETE); intent.putExtra(AAWirelessPrefs.EXTRA_PHONE_MAC, phoneMac); intent.setPackage(BuildConfig.APPLICATION_ID); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSettingsCustomizer.java index 8937e70773..7a36a78455 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSettingsCustomizer.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/BangleJSSettingsCustomizer.java @@ -95,7 +95,7 @@ public class BangleJSSettingsCustomizer implements DeviceSpecificSettingsCustomi activityFullSyncDialog.setMessage(context.getString(R.string.sony_anc_optimizer_status_starting)); activityFullSyncDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); activityFullSyncDialog.setProgress(0); - activityFullSyncDialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.Cancel), (dialog1, which) -> { + activityFullSyncDialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel), (dialog1, which) -> { dialog1.dismiss(); activityFullSyncDialog = null; handler.notifyPreferenceChanged(PREF_BANGLEJS_ACTIVITY_FULL_SYNC_STOP); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/TimePicker.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/TimePicker.java index c146e79373..7301e20a19 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/TimePicker.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/TimePicker.java @@ -40,6 +40,7 @@ import androidx.appcompat.app.AlertDialog; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.requests.misfit.PlayNotificationRequest; public class TimePicker extends MaterialAlertDialogBuilder { @@ -139,8 +140,8 @@ public class TimePicker extends MaterialAlertDialogBuilder { - setNegativeButton("cancel", null); - setPositiveButton("ok", new DialogInterface.OnClickListener() { + setNegativeButton(getContext().getString(R.string.cancel), null); + setPositiveButton(getContext().getString(R.string.ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { if(finishListener == null) return; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java index a284949b2d..cf84ffce4a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/WidgetSettingsActivity.java @@ -120,8 +120,8 @@ public class WidgetSettingsActivity extends AbstractGBActivity { if(element == null) { dialogBuilder .setTitle("create element") - .setNegativeButton("cancel", null) - .setPositiveButton("ok", new DialogInterface.OnClickListener() { + .setNegativeButton(this.getBaseContext().getString(R.string.cancel), null) + .setPositiveButton(this.getBaseContext().getString(R.string.ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { if(((RadioButton)((AlertDialog)dialog).findViewById(R.id.qhybrid_widget_elements_type_text)).isChecked()){ @@ -143,7 +143,7 @@ public class WidgetSettingsActivity extends AbstractGBActivity { }else{ dialogBuilder .setTitle("edit element") - .setNegativeButton("delete", new DialogInterface.OnClickListener() { + .setNegativeButton(this.getBaseContext().getString(R.string.delete), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { WidgetSettingsActivity.this.subject.getElements().remove(element); @@ -151,7 +151,7 @@ public class WidgetSettingsActivity extends AbstractGBActivity { refreshElementsList(); } }) - .setPositiveButton("ok", new DialogInterface.OnClickListener() { + .setPositiveButton(this.getBaseContext().getString(R.string.ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { element.setId(((EditText)((AlertDialog)dialog).findViewById(R.id.qhybrid_widget_element_id)).getText().toString()); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java index 24b8a61748..bc4254397b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/SonyHeadphonesSettingsCustomizer.java @@ -203,7 +203,7 @@ public class SonyHeadphonesSettingsCustomizer implements DeviceSpecificSettingsC ancOptimizerProgressDialog.setMessage(context.getString(R.string.sony_anc_optimizer_status_starting)); ancOptimizerProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); ancOptimizerProgressDialog.setProgress(0); - ancOptimizerProgressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.Cancel), (dialog1, which) -> { + ancOptimizerProgressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.cancel), (dialog1, which) -> { dialog1.dismiss(); ancOptimizerProgressDialog = null; handler.notifyPreferenceChanged(PREF_SONY_NOISE_OPTIMIZER_CANCEL); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceTypeDialog.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceTypeDialog.kt index 55a44fdec1..5c8625a8d5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceTypeDialog.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceTypeDialog.kt @@ -128,7 +128,7 @@ class DeviceTypeDialog( DeviceType.entries[selectedTestDeviceKey.toInt()] ) } - .setNegativeButton(R.string.Cancel) { _, _ -> } + .setNegativeButton(R.string.cancel) { _, _ -> } .create() // Validate and update OK button state diff --git a/app/src/main/res/layout/activity_gpx_receiver.xml b/app/src/main/res/layout/activity_gpx_receiver.xml index b6f2a6ae2c..0e40fda09f 100644 --- a/app/src/main/res/layout/activity_gpx_receiver.xml +++ b/app/src/main/res/layout/activity_gpx_receiver.xml @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="@string/Cancel" /> + android:text="@string/cancel" />