From e81e120adbc41af2597f396b002e4e76e22d2ed7 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 6 Nov 2020 15:56:29 -0600 Subject: [PATCH] Move URLs to keys.xml --- app/src/main/java/org/tasks/billing/PurchaseDialog.kt | 10 +++++----- .../org/tasks/caldav/CaldavAccountSettingsActivity.kt | 2 +- app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt | 2 +- .../org/tasks/etesync/EncryptionSettingsActivity.kt | 2 +- .../tasks/etesync/EteSyncAccountSettingsActivity.kt | 2 +- .../locale/ui/activity/TaskerCreateTaskActivity.java | 2 +- .../tasks/opentasks/OpenTaskAccountSettingsActivity.kt | 2 +- app/src/main/java/org/tasks/sync/AddAccountDialog.kt | 2 +- .../main/java/org/tasks/ui/NavigationDrawerFragment.kt | 2 +- app/src/main/res/values/keys.xml | 6 ++++++ 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/tasks/billing/PurchaseDialog.kt b/app/src/main/java/org/tasks/billing/PurchaseDialog.kt index 2cf489680..e28b80e9a 100644 --- a/app/src/main/java/org/tasks/billing/PurchaseDialog.kt +++ b/app/src/main/java/org/tasks/billing/PurchaseDialog.kt @@ -86,7 +86,7 @@ class PurchaseDialog : DialogFragment(), OnPurchasesUpdated { } else { benefits += """ --- -#### [${getString(R.string.upgrade_sync_with_tasks)} (BETA)](https://tasks.org/sync) +#### [${getString(R.string.upgrade_sync_with_tasks)} (BETA)](${getString(R.string.help_url_sync)}) * **${getString(R.string.upgrade_no_platform_lock_in)}** — ${getString(R.string.upgrade_open_internet_standards)} * **${getString(R.string.upgrade_customer)}** — ${getString(R.string.upgrade_privacy)} * ${getString(R.string.upgrade_coming_soon)} @@ -95,15 +95,15 @@ class PurchaseDialog : DialogFragment(), OnPurchasesUpdated { benefits += """ --- #### ${getString(R.string.upgrade_synchronization)} -* [${getString(R.string.davx5)}](https://tasks.org/docs/davx5.html) -* [${getString(R.string.caldav)}](https://tasks.org/docs/caldav_intro.html) -* [${getString(R.string.upgrade_etesync)}](https://tasks.org/docs/etesync_intro.html) +* [${getString(R.string.davx5)}](${getString(R.string.url_davx5)}) +* [${getString(R.string.caldav)}](${getString(R.string.url_caldav)}) +* [${getString(R.string.upgrade_etesync)}](${getString(R.string.url_etesync)}) * ${getString(R.string.upgrade_google_tasks)} --- #### ${getString(R.string.upgrade_additional_features)} * ${getString(R.string.upgrade_themes)} * ${getString(R.string.upgrade_google_places)} -* [${getString(R.string.upgrade_tasker)}](https://tasks.org/docs/tasker.html) +* [${getString(R.string.upgrade_tasker)}](${getString(R.string.url_tasker)}) --- * ${getString(R.string.upgrade_free_trial)} * **${getString(R.string.upgrade_downgrade)}** — ${getString(R.string.upgrade_balance)} diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt index 1a11cc748..12b5256a4 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt @@ -74,5 +74,5 @@ class CaldavAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Toolb } override val helpUrl: String - get() = "https://tasks.org/caldav" + get() = getString(R.string.url_caldav) } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt b/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt index b4a3be46d..3fb12c388 100644 --- a/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt +++ b/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt @@ -101,7 +101,7 @@ class WhatsNewDialog : DialogFragment() { private fun onDonateClick() { dismiss() - startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/donate"))) + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_donate)))) } override fun onCancel(dialog: DialogInterface) { diff --git a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.kt b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.kt index 911da597a..69144c4ef 100644 --- a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.kt +++ b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.kt @@ -173,7 +173,7 @@ class EncryptionSettingsActivity : ThemedInjectingAppCompatActivity(), Toolbar.O override fun onMenuItemClick(item: MenuItem): Boolean { return if (item.itemId == R.id.menu_help) { - startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/etesync"))) + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_etesync)))) true } else { onOptionsItemSelected(item) diff --git a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.kt b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.kt index f0a37f243..5a8a48320 100644 --- a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.kt @@ -142,7 +142,7 @@ class EteSyncAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Tool get() = binding.password.text.toString().trim { it <= ' ' } override val helpUrl: String - get() = "https://tasks.org/etesync" + get() = getString(R.string.url_etesync) override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (requestCode == REQUEST_ENCRYPTION_PASSWORD) { diff --git a/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java b/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java index ddb2d5157..3672d19b2 100755 --- a/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java +++ b/app/src/main/java/org/tasks/locale/ui/activity/TaskerCreateTaskActivity.java @@ -132,7 +132,7 @@ public final class TaskerCreateTaskActivity extends AbstractFragmentPluginAppCom public boolean onMenuItemClick(MenuItem item) { if (item.getItemId() == R.id.menu_help) { startActivity( - new Intent(Intent.ACTION_VIEW).setData(Uri.parse("https://tasks.org/help/tasker"))); + new Intent(Intent.ACTION_VIEW).setData(Uri.parse(getString(R.string.url_tasker)))); return true; } return onOptionsItemSelected(item); diff --git a/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt b/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt index d03edacaf..2d3249f7f 100644 --- a/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt @@ -65,5 +65,5 @@ class OpenTaskAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Too override suspend fun updateAccount() = updateAccount(caldavAccount!!.url) override val helpUrl: String - get() = "https://tasks.org/sync" + get() = getString(R.string.help_url_sync) } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/sync/AddAccountDialog.kt b/app/src/main/java/org/tasks/sync/AddAccountDialog.kt index efe651ff6..ba1a0fd07 100644 --- a/app/src/main/java/org/tasks/sync/AddAccountDialog.kt +++ b/app/src/main/java/org/tasks/sync/AddAccountDialog.kt @@ -79,7 +79,7 @@ class AddAccountDialog : DialogFragment() { Intent(activity, EteSyncAccountSettingsActivity::class.java), REQUEST_CALDAV_SETTINGS) 4 -> activity?.startActivity( - Intent(ACTION_VIEW, Uri.parse("https://tasks.org/davx5"))) + Intent(ACTION_VIEW, Uri.parse(getString(R.string.url_davx5)))) } dialog.dismiss() } diff --git a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.kt b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.kt index 2c70a9f33..e892d2d18 100644 --- a/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.kt +++ b/app/src/main/java/org/tasks/ui/NavigationDrawerFragment.kt @@ -86,7 +86,7 @@ class NavigationDrawerFragment : Fragment() { when (item.requestCode) { REQUEST_PURCHASE -> newPurchaseDialog().show(parentFragmentManager, FRAG_TAG_PURCHASE_DIALOG) - REQUEST_DONATE -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/donate"))) + REQUEST_DONATE -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_donate)))) REQUEST_NEW_FILTER -> newFilterDialog().show(parentFragmentManager, FRAG_TAG_NEW_FILTER) else -> activity?.startActivityForResult(item.intent, item.requestCode) } diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 0e36f78f9..d1bc73d1c 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -18,6 +18,12 @@ https://api.etesync.com https://tasks.org/sync + https://tasks.org/davx5 + https://tasks.org/caldav + https://tasks.org/etesync + https://tasks.org/help/tasker + https://tasks.org/donate + Subscribe to unlock additional features and support open source software! Sync with Tasks.org