diff --git a/README.md b/README.md index 54b568b6b..b3edd02bc 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,6 @@ [![Build Status](https://travis-ci.org/tasks/tasks.svg?branch=master)](https://travis-ci.org/tasks/tasks) [![codecov.io](http://codecov.io/github/tasks/tasks/coverage.svg?branch=master)](http://codecov.io/github/tasks/tasks?branch=master) Visit the wiki to -* [help with translations](https://github.com/abaker/tasks/wiki/Translations) -* [become a beta tester](https://github.com/abaker/tasks/wiki/Beta-Testing) -* [get started with development](https://github.com/abaker/tasks/wiki/Getting-Started-with-Development) +* [help with translations](https://github.com/tasks/tasks/wiki/Translations) +* [become a beta tester](https://github.com/tasks/tasks/wiki/Beta-Testing) +* [get started with development](https://github.com/tasks/tasks/wiki/Getting-Started-with-Development) diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 43e5245d6..152b6757c 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -182,6 +182,12 @@ + + + { getResource(activity, R.attr.ic_action_settings), new Intent(activity, BasicPreferences.class), REQUEST_SETTINGS)); + add(new NavigationDrawerAction( + activity.getResources().getString(R.string.help_and_feedback), + getResource(activity, R.attr.ic_action_help), + new Intent(activity, HelpAndFeedbackActivity.class), + 0)); } notifyDataSetChanged(); diff --git a/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java b/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java index 2dfc423de..886f585a1 100644 --- a/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java @@ -26,6 +26,7 @@ import com.todoroo.astrid.tags.TaskToTagMetadata; import org.tasks.R; import org.tasks.injection.ForApplication; import org.tasks.preferences.Preferences; +import org.tasks.preferences.ResourceResolver; import java.util.ArrayList; import java.util.List; @@ -41,16 +42,20 @@ import javax.inject.Inject; public final class BuiltInFilterExposer { private final Preferences preferences; + private ResourceResolver resourceResolver; private final Context context; @Inject - public BuiltInFilterExposer(@ForApplication Context context, Preferences preferences) { + public BuiltInFilterExposer(ResourceResolver resourceResolver, @ForApplication Context context, Preferences preferences) { + this.resourceResolver = resourceResolver; this.context = context; this.preferences = preferences; } public Filter getMyTasksFilter() { - return getMyTasksFilter(context.getResources()); + Filter myTasksFilter = getMyTasksFilter(context.getResources()); + myTasksFilter.icon = resourceResolver.getResource(R.attr.ic_action_inbox); + return myTasksFilter; } public List getFilters() { diff --git a/src/main/java/org/tasks/injection/ActivityModule.java b/src/main/java/org/tasks/injection/ActivityModule.java index bec28c5c3..b480b3ba3 100644 --- a/src/main/java/org/tasks/injection/ActivityModule.java +++ b/src/main/java/org/tasks/injection/ActivityModule.java @@ -36,6 +36,7 @@ import org.tasks.activities.PurgeDeletedActivity; import org.tasks.preferences.AppearancePreferences; import org.tasks.preferences.BackupPreferences; import org.tasks.preferences.BasicPreferences; +import org.tasks.preferences.HelpAndFeedbackActivity; import org.tasks.preferences.MiscellaneousPreferences; import org.tasks.reminders.NotificationActivity; import org.tasks.reminders.SnoozeActivity; @@ -84,7 +85,8 @@ import dagger.Provides; AppearancePreferences.class, BackupPreferences.class, LocationPickerActivity.class, - NotificationActivity.class + NotificationActivity.class, + HelpAndFeedbackActivity.class }) public class ActivityModule { diff --git a/src/main/java/org/tasks/preferences/BasicPreferences.java b/src/main/java/org/tasks/preferences/BasicPreferences.java index 0c957b988..b21bd0ea2 100644 --- a/src/main/java/org/tasks/preferences/BasicPreferences.java +++ b/src/main/java/org/tasks/preferences/BasicPreferences.java @@ -18,7 +18,6 @@ public class BasicPreferences extends InjectingPreferenceActivity { private static final String EXTRA_RESULT = "extra_result"; private static final int RC_PREFS = 10001; - @Inject DeviceInfo deviceInfo; private Bundle result; @Override @@ -45,18 +44,6 @@ public class BasicPreferences extends InjectingPreferenceActivity { return true; } }); - - findPreference(getString(R.string.contact_developer)).setIntent( - new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", "Tasks Support ", null)) {{ - putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback"); - putExtra(Intent.EXTRA_TEXT, deviceInfo.getDebugInfo()); - }}); - if (!deviceInfo.supportsBilling()) { - remove(R.string.TLA_menu_donate); - } - if (!deviceInfo.isPlayStoreAvailable()) { - remove(R.string.rate_tasks); - } } @Override @@ -78,8 +65,4 @@ public class BasicPreferences extends InjectingPreferenceActivity { super.onActivityResult(requestCode, resultCode, data); } } - - private void remove(int resId) { - getPreferenceScreen().removePreference(findPreference(getString(resId))); - } } diff --git a/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java b/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java new file mode 100644 index 000000000..8b892d2bb --- /dev/null +++ b/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java @@ -0,0 +1,38 @@ +package org.tasks.preferences; + +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; + +import org.tasks.R; +import org.tasks.injection.InjectingPreferenceActivity; + +import javax.inject.Inject; + +public class HelpAndFeedbackActivity extends InjectingPreferenceActivity { + + @Inject DeviceInfo deviceInfo; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.preferences_help); + + findPreference(getString(R.string.contact_developer)).setIntent( + new Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", "Tasks Support ", null)) {{ + putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback"); + putExtra(Intent.EXTRA_TEXT, deviceInfo.getDebugInfo()); + }}); + if (!deviceInfo.supportsBilling()) { + remove(R.string.TLA_menu_donate); + } + if (!deviceInfo.isPlayStoreAvailable()) { + remove(R.string.rate_tasks); + } + } + + private void remove(int resId) { + getPreferenceScreen().removePreference(findPreference(getString(resId))); + } +} \ No newline at end of file diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index 5336b11f1..3fd3f93cf 100644 --- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -201,7 +201,11 @@ public class NavigationDrawerFragment extends InjectingFragment { } } else if (item instanceof NavigationDrawerAction) { NavigationDrawerAction action = (NavigationDrawerAction) item; - startActivityForResult(action.intent, action.requestCode); + if (action.requestCode > 0) { + startActivityForResult(action.intent, action.requestCode); + } else { + startActivity(action.intent); + } } } diff --git a/src/main/res/drawable-hdpi/ic_action_gear.png b/src/main/res/drawable-hdpi/ic_action_gear.png index 23471f478..0c114ed1f 100644 Binary files a/src/main/res/drawable-hdpi/ic_action_gear.png and b/src/main/res/drawable-hdpi/ic_action_gear.png differ diff --git a/src/main/res/drawable-hdpi/ic_action_help.png b/src/main/res/drawable-hdpi/ic_action_help.png new file mode 100644 index 000000000..7eec86b70 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_help.png differ diff --git a/src/main/res/drawable-hdpi/ic_action_help_white.png b/src/main/res/drawable-hdpi/ic_action_help_white.png new file mode 100644 index 000000000..a88801f87 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_help_white.png differ diff --git a/src/main/res/drawable-hdpi/ic_action_inbox.png b/src/main/res/drawable-hdpi/ic_action_inbox.png new file mode 100644 index 000000000..68dadd12e Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_inbox.png differ diff --git a/src/main/res/drawable-hdpi/ic_action_inbox_white.png b/src/main/res/drawable-hdpi/ic_action_inbox_white.png new file mode 100644 index 000000000..c40d39937 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_inbox_white.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_gear.png b/src/main/res/drawable-xhdpi/ic_action_gear.png index 3be1a7821..da108c8eb 100644 Binary files a/src/main/res/drawable-xhdpi/ic_action_gear.png and b/src/main/res/drawable-xhdpi/ic_action_gear.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_help.png b/src/main/res/drawable-xhdpi/ic_action_help.png new file mode 100644 index 000000000..27909d8c8 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_help.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_help_white.png b/src/main/res/drawable-xhdpi/ic_action_help_white.png new file mode 100644 index 000000000..849292b62 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_help_white.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_inbox.png b/src/main/res/drawable-xhdpi/ic_action_inbox.png new file mode 100644 index 000000000..a6762c9af Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_inbox.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_inbox_white.png b/src/main/res/drawable-xhdpi/ic_action_inbox_white.png new file mode 100644 index 000000000..b6676af81 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_inbox_white.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_gear.png b/src/main/res/drawable-xxhdpi/ic_action_gear.png index e00cd92c1..12fefb851 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_action_gear.png and b/src/main/res/drawable-xxhdpi/ic_action_gear.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_help.png b/src/main/res/drawable-xxhdpi/ic_action_help.png new file mode 100644 index 000000000..ab4cb9bb9 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_help.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_help_white.png b/src/main/res/drawable-xxhdpi/ic_action_help_white.png new file mode 100644 index 000000000..c49a9f8d0 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_help_white.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_inbox.png b/src/main/res/drawable-xxhdpi/ic_action_inbox.png new file mode 100644 index 000000000..0243136c2 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_inbox.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_inbox_white.png b/src/main/res/drawable-xxhdpi/ic_action_inbox_white.png new file mode 100644 index 000000000..f84703b70 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_inbox_white.png differ diff --git a/src/main/res/drawable/ic_action_gear.png b/src/main/res/drawable/ic_action_gear.png index 46cad2641..e01839358 100644 Binary files a/src/main/res/drawable/ic_action_gear.png and b/src/main/res/drawable/ic_action_gear.png differ diff --git a/src/main/res/drawable/ic_action_help.png b/src/main/res/drawable/ic_action_help.png new file mode 100644 index 000000000..49a8aa633 Binary files /dev/null and b/src/main/res/drawable/ic_action_help.png differ diff --git a/src/main/res/drawable/ic_action_help_white.png b/src/main/res/drawable/ic_action_help_white.png new file mode 100644 index 000000000..67d720016 Binary files /dev/null and b/src/main/res/drawable/ic_action_help_white.png differ diff --git a/src/main/res/drawable/ic_action_inbox.png b/src/main/res/drawable/ic_action_inbox.png new file mode 100644 index 000000000..25d565626 Binary files /dev/null and b/src/main/res/drawable/ic_action_inbox.png differ diff --git a/src/main/res/drawable/ic_action_inbox_white.png b/src/main/res/drawable/ic_action_inbox_white.png new file mode 100644 index 000000000..a582c098b Binary files /dev/null and b/src/main/res/drawable/ic_action_inbox_white.png differ diff --git a/src/main/res/layout/filter_adapter_row.xml b/src/main/res/layout/filter_adapter_row.xml index 1bb0d6bc6..ba65ca6ca 100644 --- a/src/main/res/layout/filter_adapter_row.xml +++ b/src/main/res/layout/filter_adapter_row.xml @@ -17,8 +17,7 @@ + + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 193c65b84..90cb4ccf7 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -58,6 +58,8 @@ @drawable/ic_action_reload @drawable/ic_action_calendar_month @drawable/ic_action_add_light + @drawable/ic_action_inbox + @drawable/ic_action_help