From cba5a1ecc8d8d40ee4f3a611364c12ec8092b14f Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 27 Apr 2020 07:28:03 -0500 Subject: [PATCH] Add filter help links --- .../activities/FilterSettingsActivity.java | 21 +++++++++++++++++++ .../BaseCaldavAccountSettingsActivity.java | 2 +- .../etesync/EncryptionSettingsActivity.java | 4 ++-- .../ui/activity/TaskerCreateTaskActivity.java | 2 +- .../res/menu/menu_caldav_account_settings.xml | 2 +- ..._encryption_settings.xml => menu_help.xml} | 2 +- .../main/res/menu/menu_tasker_create_task.xml | 10 --------- 7 files changed, 27 insertions(+), 16 deletions(-) rename app/src/main/res/menu/{menu_etesync_encryption_settings.xml => menu_help.xml} (88%) delete mode 100644 app/src/main/res/menu/menu_tasker_create_task.xml diff --git a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java index 731a24418..fe259cb34 100644 --- a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java +++ b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java @@ -16,7 +16,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.database.Cursor; +import android.net.Uri; import android.os.Bundle; +import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.EditText; @@ -126,6 +128,10 @@ public class FilterSettingsActivity extends BaseListSettingsActivity { fab.setExtended(isNew() || adapter.getItemCount() <= 1); + if (isNew()) { + toolbar.inflateMenu(R.menu.menu_help); + } + updateList(); updateTheme(); @@ -160,6 +166,7 @@ public class FilterSettingsActivity extends BaseListSettingsActivity { criterionInstance.type = getType(group.getCheckedButtonId()); updateList(); }) + .setNeutralButton(R.string.help,(v, which) -> help()) .show(); } @@ -349,6 +356,20 @@ public class FilterSettingsActivity extends BaseListSettingsActivity { finish(); } + @Override + public boolean onMenuItemClick(MenuItem item) { + if (item.getItemId() == R.id.menu_help) { + help(); + return true; + } else { + return super.onMenuItemClick(item); + } + } + + private void help() { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://tasks.org/filters"))); + } + public void updateList() { int max = 0, last = -1; diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java index d77bba3be..c3acaa7bb 100644 --- a/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java +++ b/app/src/main/java/org/tasks/caldav/BaseCaldavAccountSettingsActivity.java @@ -378,7 +378,7 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA @Override public boolean onMenuItemClick(MenuItem item) { switch (item.getItemId()) { - case R.id.help: + case R.id.menu_help: startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getHelpUrl()))); break; case R.id.remove: diff --git a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java index 980bc3a20..19e1601e9 100644 --- a/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java +++ b/app/src/main/java/org/tasks/etesync/EncryptionSettingsActivity.java @@ -72,7 +72,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity caldavAccount == null ? getString(R.string.add_account) : caldavAccount.getName()); toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px)); toolbar.setNavigationOnClickListener(v -> save()); - toolbar.inflateMenu(R.menu.menu_etesync_encryption_settings); + toolbar.inflateMenu(R.menu.menu_help); toolbar.setOnMenuItemClickListener(this); themeColor.apply(toolbar); @@ -213,7 +213,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity @Override public boolean onMenuItemClick(MenuItem item) { - if (item.getItemId() == R.id.help) { + if (item.getItemId() == R.id.menu_help) { startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://tasks.org/etesync"))); return true; } else { 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 13028552b..ced95f334 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 @@ -38,7 +38,7 @@ public final class TaskerCreateTaskActivity extends AbstractFragmentPluginAppCom toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px)); toolbar.setNavigationOnClickListener(v -> save()); toolbar.setOnMenuItemClickListener(this); - toolbar.inflateMenu(R.menu.menu_tasker_create_task); + toolbar.inflateMenu(R.menu.menu_help); themeColor.apply(toolbar); if (savedInstanceState != null) { diff --git a/app/src/main/res/menu/menu_caldav_account_settings.xml b/app/src/main/res/menu/menu_caldav_account_settings.xml index 6a2762ffa..3ba2bfef8 100644 --- a/app/src/main/res/menu/menu_caldav_account_settings.xml +++ b/app/src/main/res/menu/menu_caldav_account_settings.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/menu_etesync_encryption_settings.xml b/app/src/main/res/menu/menu_help.xml similarity index 88% rename from app/src/main/res/menu/menu_etesync_encryption_settings.xml rename to app/src/main/res/menu/menu_help.xml index 4c186a162..0e128a213 100644 --- a/app/src/main/res/menu/menu_etesync_encryption_settings.xml +++ b/app/src/main/res/menu/menu_help.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/menu_tasker_create_task.xml b/app/src/main/res/menu/menu_tasker_create_task.xml deleted file mode 100644 index 81d399458..000000000 --- a/app/src/main/res/menu/menu_tasker_create_task.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file