Add filter help links

pull/996/head
Alex Baker 6 years ago
parent 3eb2e86ed8
commit cba5a1ecc8

@ -16,7 +16,9 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
@ -126,6 +128,10 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
fab.setExtended(isNew() || adapter.getItemCount() <= 1); fab.setExtended(isNew() || adapter.getItemCount() <= 1);
if (isNew()) {
toolbar.inflateMenu(R.menu.menu_help);
}
updateList(); updateList();
updateTheme(); updateTheme();
@ -160,6 +166,7 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
criterionInstance.type = getType(group.getCheckedButtonId()); criterionInstance.type = getType(group.getCheckedButtonId());
updateList(); updateList();
}) })
.setNeutralButton(R.string.help,(v, which) -> help())
.show(); .show();
} }
@ -349,6 +356,20 @@ public class FilterSettingsActivity extends BaseListSettingsActivity {
finish(); 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() { public void updateList() {
int max = 0, last = -1; int max = 0, last = -1;

@ -378,7 +378,7 @@ public abstract class BaseCaldavAccountSettingsActivity extends ThemedInjectingA
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.help: case R.id.menu_help:
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getHelpUrl()))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getHelpUrl())));
break; break;
case R.id.remove: case R.id.remove:

@ -72,7 +72,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity
caldavAccount == null ? getString(R.string.add_account) : caldavAccount.getName()); caldavAccount == null ? getString(R.string.add_account) : caldavAccount.getName());
toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px)); toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px));
toolbar.setNavigationOnClickListener(v -> save()); toolbar.setNavigationOnClickListener(v -> save());
toolbar.inflateMenu(R.menu.menu_etesync_encryption_settings); toolbar.inflateMenu(R.menu.menu_help);
toolbar.setOnMenuItemClickListener(this); toolbar.setOnMenuItemClickListener(this);
themeColor.apply(toolbar); themeColor.apply(toolbar);
@ -213,7 +213,7 @@ public class EncryptionSettingsActivity extends ThemedInjectingAppCompatActivity
@Override @Override
public boolean onMenuItemClick(MenuItem item) { 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"))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://tasks.org/etesync")));
return true; return true;
} else { } else {

@ -38,7 +38,7 @@ public final class TaskerCreateTaskActivity extends AbstractFragmentPluginAppCom
toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px)); toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_save_24px));
toolbar.setNavigationOnClickListener(v -> save()); toolbar.setNavigationOnClickListener(v -> save());
toolbar.setOnMenuItemClickListener(this); toolbar.setOnMenuItemClickListener(this);
toolbar.inflateMenu(R.menu.menu_tasker_create_task); toolbar.inflateMenu(R.menu.menu_help);
themeColor.apply(toolbar); themeColor.apply(toolbar);
if (savedInstanceState != null) { if (savedInstanceState != null) {

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/help" android:id="@+id/menu_help"
android:icon="@drawable/ic_outline_help_outline_24px" android:icon="@drawable/ic_outline_help_outline_24px"
android:title="@string/help" android:title="@string/help"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/help" android:id="@+id/menu_help"
android:icon="@drawable/ic_outline_help_outline_24px" android:icon="@drawable/ic_outline_help_outline_24px"
android:title="@string/help" android:title="@string/help"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tasks="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/menu_help"
android:icon="@drawable/ic_outline_help_outline_24px"
android:title="@string/help"
tasks:showAsAction="ifRoom"/>
</menu>
Loading…
Cancel
Save