Don't reference platform 'OK' and 'Cancel' strings

Will temporarily have English translation fall back to the platform
string to give translators time to address this

app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt

@@ -308,8 +308,8 @@ class TaskEditFragment : Fragment(), Toolbar.OnMenuItemClickListener {
     private fun deleteButtonClick() {
         dialogBuilder
                 .newDialog(R.string.DLG_delete_this_task_question)
-                .setPositiveButton(android.R.string.ok) { _, _ -> delete() }
-                .setNegativeButton(android.R.string.cancel, null)
+                .setPositiveButton(R.string.ok) { _, _ -> delete() }
+                .setNegativeButton(R.string.cancel, null)
                 .show()
     }
 

app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt

@@ -350,8 +350,8 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
             R.id.menu_clear_completed -> {
                 dialogBuilder
                         .newDialog(R.string.clear_completed_tasks_confirmation)
-                        .setPositiveButton(android.R.string.ok) { _, _ -> clearCompleted() }
-                        .setNegativeButton(android.R.string.cancel, null)
+                        .setPositiveButton(R.string.ok) { _, _ -> clearCompleted() }
+                        .setNegativeButton(R.string.cancel, null)
                         .show()
                 true
             }
@@ -687,8 +687,8 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
                 dialogBuilder
                         .newDialog(R.string.delete_selected_tasks)
                         .setPositiveButton(
-                                android.R.string.ok) { _, _ -> deleteSelectedItems(selected) }
-                        .setNegativeButton(android.R.string.cancel, null)
+                                R.string.ok) { _, _ -> deleteSelectedItems(selected) }
+                        .setNegativeButton(R.string.cancel, null)
                         .show()
                 true
             }
@@ -696,8 +696,8 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
                 dialogBuilder
                         .newDialog(R.string.copy_selected_tasks)
                         .setPositiveButton(
-                                android.R.string.ok) { _, _ -> copySelectedItems(selected) }
-                        .setNegativeButton(android.R.string.cancel, null)
+                                R.string.ok) { _, _ -> copySelectedItems(selected) }
+                        .setNegativeButton(R.string.cancel, null)
                         .show()
                 true
             }

app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.kt

@@ -125,7 +125,7 @@ class TasksXmlImporter @Inject constructor(
                                 r.getQuantityString(R.plurals.Ntasks, importCount, importCount),
                                 r.getQuantityString(R.plurals.Ntasks, skipCount, skipCount),
                                 r.getQuantityString(R.plurals.Ntasks, errorCount, errorCount)))
-                .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, id: Int -> dialog.dismiss() }
+                .setPositiveButton(R.string.ok) { dialog: DialogInterface, id: Int -> dialog.dismiss() }
                 .show()
     }
 

app/src/main/java/com/todoroo/astrid/files/FilesControlSet.kt

@@ -112,7 +112,7 @@ class FilesControlSet : TaskEditControlFragment() {
         clearFile.setOnClickListener {
             dialogBuilder
                     .newDialog(R.string.premium_remove_file_confirm)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                    .setPositiveButton(R.string.ok) { _, _ ->
                         lifecycleScope.launch {
                             withContext(NonCancellable) {
                                 taskAttachmentDao.delete(taskAttachment)
@@ -121,7 +121,7 @@ class FilesControlSet : TaskEditControlFragment() {
                             attachmentContainer.removeView(fileRow)
                         }
                     }
-                    .setNegativeButton(android.R.string.cancel, null)
+                    .setNegativeButton(R.string.cancel, null)
                     .show()
         }
     }

app/src/main/java/com/todoroo/astrid/notes/CommentsController.kt

@@ -118,7 +118,7 @@ class CommentsController @Inject constructor(
             }
 
             // Display a negative button on alert dialog
-            builder.setNegativeButton(android.R.string.cancel){dialog,which ->
+            builder.setNegativeButton(R.string.cancel){dialog,which ->
             }
             // Finally, make the alert dialog using builder
             val dialog: AlertDialog = builder.create()

app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.kt

@@ -82,7 +82,7 @@ class TimerControlSet : TaskEditControlFragment() {
         return dialogBuilder
                 .newDialog()
                 .setView(dialogView)
-                .setPositiveButton(android.R.string.ok) { _, _ -> refreshDisplayView() }
+                .setPositiveButton(R.string.ok) { _, _ -> refreshDisplayView() }
                 .setOnCancelListener { refreshDisplayView() }
                 .create()
     }

app/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java

@@ -49,10 +49,10 @@ class NNumberPickerDialog extends AlertDialog implements OnClickListener {
     super(context);
     mCallback = callBack;
 
-    setButton(DialogInterface.BUTTON_POSITIVE, context.getText(android.R.string.ok), this);
+    setButton(DialogInterface.BUTTON_POSITIVE, context.getText(R.string.ok), this);
     setButton(
         DialogInterface.BUTTON_NEGATIVE,
-        context.getText(android.R.string.cancel),
+        context.getText(R.string.cancel),
         (OnClickListener) null);
 
     LayoutInflater inflater =

app/src/main/java/org/tasks/activities/BaseListSettingsActivity.kt

@@ -86,7 +86,7 @@ abstract class BaseListSettingsActivity : ThemedInjectingAppCompatActivity(), Ic
             dialogBuilder
                     .newDialog(R.string.discard_changes)
                     .setPositiveButton(R.string.discard) { _, _ -> finish() }
-                    .setNegativeButton(android.R.string.cancel, null)
+                    .setNegativeButton(R.string.cancel, null)
                     .show()
         }
     }
@@ -130,7 +130,7 @@ abstract class BaseListSettingsActivity : ThemedInjectingAppCompatActivity(), Ic
         dialogBuilder
                 .newDialog(R.string.delete_tag_confirmation, toolbarTitle)
                 .setPositiveButton(R.string.delete) { _, _ -> lifecycleScope.launch { delete() } }
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(R.string.cancel, null)
                 .show()
     }
 

app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt

@@ -140,8 +140,8 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
         dialogBuilder
                 .newDialog(criterionInstance.titleFromCriterion)
                 .setView(view)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setPositiveButton(android.R.string.ok) { _, _ ->
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.ok) { _, _ ->
                     criterionInstance.type = getType(group.checkedButtonId)
                     updateList()
                 }
@@ -211,7 +211,7 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
                             FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT))
             dialog
                     .setView(frameLayout)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                    .setPositiveButton(R.string.ok) { _, _ ->
                         item.selectedText = editText.text.toString()
                         onComplete?.run()
                     }

app/src/main/java/org/tasks/activities/ListPicker.kt

@@ -18,6 +18,7 @@ import com.todoroo.astrid.api.GtasksFilter
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.tasks.LocalBroadcastManager
+import org.tasks.R
 import org.tasks.dialogs.DialogBuilder
 import org.tasks.filters.FilterProvider
 import javax.inject.Inject
@@ -102,7 +103,7 @@ class ListPicker : DialogFragment() {
                 handler: (Filter) -> Unit): AlertDialog {
             val builder = dialogBuilder
                     .newDialog()
-                    .setNegativeButton(android.R.string.cancel, null)
+                    .setNegativeButton(R.string.cancel, null)
                     .setSingleChoiceItems(filterAdapter,-1) { dialog: DialogInterface, which: Int ->
                         val item = filterAdapter.getItem(which)
                         if (item is GtasksFilter || item is CaldavFilter) {

app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt

@@ -323,7 +323,7 @@ abstract class BaseCaldavAccountSettingsActivity : ThemedInjectingAppCompatActiv
                 .newDialog()
                 .setMessage(R.string.logout_warning, caldavAccount!!.name)
                 .setPositiveButton(R.string.remove) { _, _ -> lifecycleScope.launch { removeAccount() } }
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(R.string.cancel, null)
                 .show()
     }
 
@@ -343,7 +343,7 @@ abstract class BaseCaldavAccountSettingsActivity : ThemedInjectingAppCompatActiv
             dialogBuilder
                     .newDialog(R.string.discard_changes)
                     .setPositiveButton(R.string.discard) { _, _ -> finish() }
-                    .setNegativeButton(android.R.string.cancel, null)
+                    .setNegativeButton(R.string.cancel, null)
                     .show()
         }
     }

app/src/main/java/org/tasks/calendars/CalendarPicker.java

@@ -81,7 +81,7 @@ public class CalendarPicker extends DialogFragment {
                   data.putExtra(EXTRA_CALENDAR_NAME, calendar.getName());
                   getTargetFragment().onActivityResult(getTargetRequestCode(), Activity.RESULT_OK, data);
                 })
-            .setNegativeButton(android.R.string.cancel, null)
+            .setNegativeButton(R.string.cancel, null)
             .show();
     listView = dialog.getListView();
     if (permissionChecker.canAccessCalendars()) {

app/src/main/java/org/tasks/dialogs/ColorPalettePicker.kt

@@ -104,7 +104,7 @@ class ColorPalettePicker : DialogFragment() {
             }
         }
         if (inventory.purchasedThemes()) {
-            builder.setNegativeButton(android.R.string.cancel, null)
+            builder.setNegativeButton(R.string.cancel, null)
         } else {
             builder.setPositiveButton(R.string.button_subscribe) { _: DialogInterface?, _: Int ->
                 context?.startActivity(Intent(requireContext(), PurchaseActivity::class.java))

app/src/main/java/org/tasks/dialogs/ColorWheelPicker.kt

@@ -50,7 +50,7 @@ class ColorWheelPicker : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         selected = savedInstanceState?.getInt(EXTRA_SELECTED) ?: requireArguments().getInt(EXTRA_SELECTED, 0)
 
-        val button = if (inventory.purchasedThemes()) android.R.string.ok else R.string.button_subscribe
+        val button = if (inventory.purchasedThemes()) R.string.ok else R.string.button_subscribe
         val builder = ColorPickerDialogBuilder
                 .with(activity)
                 .wheelType(ColorPickerView.WHEEL_TYPE.CIRCLE)
@@ -69,7 +69,7 @@ class ColorWheelPicker : DialogFragment() {
                         startActivityForResult(Intent(activity, PurchaseActivity::class.java), REQUEST_PURCHASE)
                     }
                 }
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(R.string.cancel, null)
         if (selected != 0) {
             builder.initialColor(selected)
         }

app/src/main/java/org/tasks/dialogs/GeofenceDialog.java

@@ -82,9 +82,9 @@ public class GeofenceDialog extends DialogFragment {
     return dialogBuilder
         .newDialog(original.getDisplayName())
         .setView(view)
-        .setNegativeButton(android.R.string.cancel, null)
+        .setNegativeButton(R.string.cancel, null)
         .setOnCancelListener(this::sendResult)
-        .setPositiveButton(android.R.string.ok, this::sendResult)
+        .setPositiveButton(R.string.ok, this::sendResult)
         .create();
   }
 

app/src/main/java/org/tasks/dialogs/IconPickerDialog.java

@@ -60,7 +60,7 @@ public class IconPickerDialog extends DialogFragment {
     iconPickerAdapter.submitList(CustomIcons.getIconList());
 
     AlertDialogBuilder builder =
-        dialogBuilder.newDialog().setNegativeButton(android.R.string.cancel, null).setView(view);
+        dialogBuilder.newDialog().setNegativeButton(R.string.cancel, null).setView(view);
     if (!inventory.hasPro()) {
       builder.setPositiveButton(
           R.string.button_subscribe,

app/src/main/java/org/tasks/dialogs/ImportTasksDialog.kt

@@ -69,7 +69,7 @@ class ImportTasksDialog : DialogFragment() {
                                         result.importCount),
                                 r.getQuantityString(R.plurals.Ntasks, result.skipCount, result.skipCount),
                                 r.getQuantityString(R.plurals.Ntasks, 0, 0)))
-                .setPositiveButton(android.R.string.ok, null)
+                .setPositiveButton(R.string.ok, null)
                 .show()
     }
 

app/src/main/java/org/tasks/dialogs/NewFilterDialog.kt

@@ -51,7 +51,7 @@ class NewFilterDialog : DialogFragment() {
                 .setItems(options.map { getString(it) }) { _, which ->
                     newCustomFilter(options[which])
                 }
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(R.string.cancel, null)
                 .show()
     }
 

app/src/main/java/org/tasks/dialogs/SortDialog.java

@@ -116,7 +116,7 @@ public class SortDialog extends DialogFragment {
                 })
             .setPositiveButton(R.string.TLA_menu_sort, (dialog, which) -> setSelection(false))
             .setNeutralButton(R.string.reverse, (dialog, which) -> setSelection(true))
-            .setNegativeButton(android.R.string.cancel, null)
+            .setNegativeButton(R.string.cancel, null)
             .show();
 
     enableReverse();

app/src/main/java/org/tasks/dialogs/ThemePickerDialog.kt

@@ -92,7 +92,7 @@ class ThemePickerDialog : DialogFragment() {
                         }
                     }
                 }
-                .setPositiveButton(android.R.string.ok) { _, _ ->
+                .setPositiveButton(R.string.ok) { _, _ ->
                     deliverResult()
                 }
                 .show()
@@ -121,7 +121,7 @@ class ThemePickerDialog : DialogFragment() {
 
     private fun updateButton() {
         val stringRes = if (available()) {
-            android.R.string.cancel
+            R.string.cancel
         } else {
             R.string.button_subscribe
         }

app/src/main/java/org/tasks/locale/LocalePickerDialog.kt

@@ -31,7 +31,7 @@ class LocalePickerDialog : DialogFragment() {
                     targetFragment!!.onActivityResult(targetRequestCode, Activity.RESULT_OK, data)
                     dialog.dismiss()
                 }
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(R.string.cancel, null)
                 .show()
     }
 

app/src/main/java/org/tasks/location/LocationPermissionDialog.kt

@@ -52,7 +52,7 @@ class LocationPermissionDialog : DialogFragment() {
 
         return dialogBuilder.newDialog(R.string.missing_permissions)
                 .setView(binding.root)
-                .setNegativeButton(android.R.string.cancel) { _, _ ->
+                .setNegativeButton(R.string.cancel) { _, _ ->
                     dismiss()
                 }
                 .setNeutralButton(R.string.TLA_menu_settings) { _, _ ->

app/src/main/java/org/tasks/location/LocationPickerActivity.kt

@@ -230,7 +230,7 @@ class LocationPickerActivity : InjectingAppCompatActivity(), Toolbar.OnMenuItemC
                 dialogBuilder
                         .newDialog(R.string.missing_permissions)
                         .setMessage(R.string.location_permission_required_location)
-                        .setPositiveButton(android.R.string.ok, null)
+                        .setPositiveButton(R.string.ok, null)
                         .show()
             }
         } else {

app/src/main/java/org/tasks/preferences/fragments/Advanced.kt

@@ -159,13 +159,13 @@ class Advanced : InjectingPreferenceFragment() {
         dialogBuilder
             .newDialog()
             .setMessage(R.string.EPr_manage_delete_completed_gcal_message)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
+            .setPositiveButton(R.string.ok) { _, _ ->
                 performAction(R.string.EPr_manage_delete_completed_gcal_status) {
                     calendarEventProvider.deleteEvents(taskDao.getCompletedCalendarEvents())
                     taskDao.clearCompletedCalendarEvents()
                 }
             }
-            .setNegativeButton(android.R.string.cancel, null)
+            .setNegativeButton(R.string.cancel, null)
             .show()
     }
 
@@ -173,14 +173,14 @@ class Advanced : InjectingPreferenceFragment() {
         dialogBuilder
             .newDialog()
             .setMessage(R.string.EPr_manage_delete_all_gcal_message)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
+            .setPositiveButton(R.string.ok) { _, _ ->
                 performAction(
                     R.string.EPr_manage_delete_all_gcal_status) {
                         calendarEventProvider.deleteEvents(taskDao.getAllCalendarEvents())
                         taskDao.clearAllCalendarEvents()
                     }
             }
-            .setNegativeButton(android.R.string.cancel, null)
+            .setNegativeButton(R.string.cancel, null)
             .show()
     }
 
@@ -196,7 +196,7 @@ class Advanced : InjectingPreferenceFragment() {
                 preferences.reset()
                 restart()
             }
-            .setNegativeButton(android.R.string.cancel, null)
+            .setNegativeButton(R.string.cancel, null)
             .show()
     }
 
@@ -209,7 +209,7 @@ class Advanced : InjectingPreferenceFragment() {
                 requireContext().deleteDatabase(database.name)
                 restart()
             }
-            .setNegativeButton(android.R.string.cancel, null)
+            .setNegativeButton(R.string.cancel, null)
             .show()
     }
 }

app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt

@@ -200,7 +200,7 @@ class LookAndFeel : InjectingPreferenceFragment() {
                     placeProviderPreference.summary = choices[which]
                     dialog.dismiss()
                 }
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(R.string.cancel, null)
                 .show()
             false
         }

app/src/main/java/org/tasks/preferences/fragments/Synchronization.kt

@@ -133,7 +133,7 @@ class Synchronization : InjectingPreferenceFragment() {
                             logoutConfirmation(googleTaskAccount)
                         }
                     }
-                    .setNegativeButton(android.R.string.cancel, null)
+                    .setNegativeButton(R.string.cancel, null)
                     .show()
                 false
             }
@@ -194,7 +194,7 @@ class Synchronization : InjectingPreferenceFragment() {
                     refresh()
                 }
             }
-            .setNegativeButton(android.R.string.cancel, null)
+            .setNegativeButton(R.string.cancel, null)
             .create()
         alertDialog.setCanceledOnTouchOutside(false)
         alertDialog.setCancelable(false)

app/src/main/java/org/tasks/reminders/NotificationDialog.java

@@ -48,7 +48,7 @@ public class NotificationDialog extends DialogFragment {
                   break;
               }
             })
-        .setNegativeButton(android.R.string.cancel, null)
+        .setNegativeButton(R.string.cancel, null)
         .show();
   }
 

app/src/main/java/org/tasks/reminders/SnoozeDialog.java

@@ -117,7 +117,7 @@ public class SnoozeDialog extends DialogFragment {
               }
             })
         .setNegativeButton(
-            android.R.string.cancel,
+            R.string.cancel,
             (dialog, which) -> {
               if (onCancelListener != null) {
                 onCancelListener.onCancel(dialog);

app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java

@@ -337,8 +337,8 @@ public class CustomRecurrenceDialog extends DialogFragment {
     return dialogBuilder
         .newDialog()
         .setView(dialogView)
-        .setPositiveButton(android.R.string.ok, this::onRuleSelected)
-        .setNegativeButton(android.R.string.cancel, null)
+        .setPositiveButton(R.string.ok, this::onRuleSelected)
+        .setNegativeButton(R.string.cancel, null)
         .show();
   }
 

app/src/main/java/org/tasks/sync/AddAccountDialog.kt

@@ -75,7 +75,7 @@ class AddAccountDialog : DialogFragment() {
                             Intent.ACTION_VIEW,
                             Uri.parse(context?.getString(R.string.help_url_sync))))
                 }
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(R.string.cancel, null)
                 .show()
     }
 

app/src/main/java/org/tasks/ui/CalendarControlSet.kt

@@ -81,7 +81,7 @@ class CalendarControlSet : TaskEditControlFragment() {
                             clear()
                         }
                     }
-                    .setNegativeButton(android.R.string.cancel, null)
+                    .setNegativeButton(R.string.cancel, null)
                     .show()
         }
     }

app/src/main/res/layout/activity_location_picker.xml

@@ -181,7 +181,7 @@
           android:layout_marginStart="@dimen/card_view_margin"
           android:layout_marginEnd="@dimen/card_view_margin"
           android:layout_gravity="start|center_vertical"
-          android:contentDescription="@android:string/search_go"
+          android:contentDescription="@string/TLA_menu_search"
           android:src="@drawable/ic_outline_search_24px"
           app:tint="@color/icon_tint"/>
 
@@ -191,7 +191,7 @@
           android:layout_marginStart="64dp"
           android:layout_gravity="center_vertical"
           android:gravity="start"
-          android:text="@android:string/search_go"
+          android:text="@string/TLA_menu_search"
           android:textAlignment="viewStart"
           android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
           android:textColor="@color/text_primary"/>

app/src/main/res/layout/dialog_date_time_picker_buttons.xml

@@ -19,7 +19,7 @@
           style="@style/Widget.MaterialComponents.Button.TextButton"
           android:textColor="?attr/colorAccent"
           android:id="@+id/ok_button"
-          android:text="@android:string/ok"
+          android:text="@string/ok"
           android:layout_below="@id/divider"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
           android:textColor="?attr/colorAccent"
           android:layout_below="@id/divider"
           android:id="@+id/cancel_button"
-          android:text="@android:string/cancel"
+          android:text="@string/cancel"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:paddingStart="@dimen/keyline_first"

app/src/main/res/values/strings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+  <string name="ok">@android:string/ok</string>
+  <string name="cancel">@android:string/cancel</string>
   <string name="actfm_picture_clear">Clear Picture</string>
   <string name="TVA_add_comment">Add a comment…</string>
   <string name="display_name">Display name</string>