From b8005daa800832e120112c982ca5596df044d48d Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 18 Jan 2021 18:15:14 -0600 Subject: [PATCH] Update account help url and menu * Remove 'Delete' option from opentask accounts * Use resId for help url --- .../org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt | 8 +++++--- .../org/tasks/caldav/CaldavAccountSettingsActivity.kt | 3 +-- .../org/tasks/etebase/EtebaseAccountSettingsActivity.kt | 3 +-- .../org/tasks/etesync/EteSyncAccountSettingsActivity.kt | 3 +-- .../tasks/opentasks/OpenTaskAccountSettingsActivity.kt | 5 +++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt index bb639873b..edec69809 100644 --- a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.kt @@ -84,7 +84,7 @@ abstract class BaseCaldavAccountSettingsActivity : ThemedInjectingAppCompatActiv toolbar.title = if (caldavAccount == null) getString(R.string.add_account) else caldavAccount!!.name toolbar.navigationIcon = getDrawable(R.drawable.ic_outline_save_24px) toolbar.setNavigationOnClickListener { save() } - toolbar.inflateMenu(R.menu.menu_caldav_account_settings) + toolbar.inflateMenu(menuRes) toolbar.setOnMenuItemClickListener(this) toolbar.showOverflowMenu() themeColor.apply(toolbar) @@ -107,6 +107,8 @@ abstract class BaseCaldavAccountSettingsActivity : ThemedInjectingAppCompatActiv @get:StringRes protected open val description = 0 + protected open val menuRes = R.menu.menu_caldav_account_settings + override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) outState.putParcelable(EXTRA_CALDAV_DATA, caldavAccount) @@ -246,7 +248,7 @@ abstract class BaseCaldavAccountSettingsActivity : ThemedInjectingAppCompatActiv protected abstract suspend fun addAccount(url: String, username: String, password: String) protected abstract suspend fun updateAccount(url: String, username: String, password: String) protected abstract suspend fun updateAccount() - protected abstract val helpUrl: String? + protected abstract val helpUrl: Int protected fun requestFailed(t: Throwable) { hideProgressIndicator() @@ -347,7 +349,7 @@ abstract class BaseCaldavAccountSettingsActivity : ThemedInjectingAppCompatActiv override fun onMenuItemClick(item: MenuItem): Boolean { when (item.itemId) { - R.id.menu_help -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(helpUrl))) + R.id.menu_help -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(helpUrl)))) R.id.remove -> removeAccountPrompt() } return onOptionsItemSelected(item) diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt index 701132248..14c080a5c 100644 --- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.kt @@ -74,6 +74,5 @@ class CaldavAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Toolb return if (PASSWORD_MASK == input) encryption.decrypt(caldavAccount!!.password) else input } - override val helpUrl: String - get() = getString(R.string.url_caldav) + override val helpUrl = R.string.url_caldav } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt b/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt index e77e074eb..dea6e544f 100644 --- a/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/etebase/EtebaseAccountSettingsActivity.kt @@ -107,8 +107,7 @@ class EtebaseAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Tool override val newPassword: String get() = binding.password.text.toString().trim { it <= ' ' } - override val helpUrl: String - get() = getString(R.string.url_etesync) + override val helpUrl = R.string.url_etesync private suspend fun saveAccountAndFinish() { if (caldavAccount!!.id == Task.NO_ID) { diff --git a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.kt b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.kt index c66609fb7..349892fc4 100644 --- a/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/etesync/EteSyncAccountSettingsActivity.kt @@ -139,8 +139,7 @@ class EteSyncAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Tool override val newPassword: String get() = binding.password.text.toString().trim { it <= ' ' } - override val helpUrl: String - get() = getString(R.string.url_etesync) + override val helpUrl = 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/opentasks/OpenTaskAccountSettingsActivity.kt b/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt index 571d14ed2..606f7c605 100644 --- a/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt +++ b/app/src/main/java/org/tasks/opentasks/OpenTaskAccountSettingsActivity.kt @@ -61,6 +61,7 @@ class OpenTaskAccountSettingsActivity : BaseCaldavAccountSettingsActivity(), Too override suspend fun updateAccount() = updateAccount(caldavAccount!!.url) - override val helpUrl: String - get() = getString(R.string.help_url_sync) + override val helpUrl = R.string.help_url_sync + + override val menuRes = R.menu.menu_help } \ No newline at end of file