From 7ac4b18a6e19f9b9b1077a06d9ee0b98d9d36434 Mon Sep 17 00:00:00 2001 From: MPK44 Date: Sat, 16 Apr 2016 21:09:13 +0200 Subject: [PATCH 1/4] changed options when using back key in task edit from "keep editing" to "save" as "keep editing" is possible with back key --- .../todoroo/astrid/activity/TaskEditFragment.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index ebe6f84cb..0dfe45fd6 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -10,6 +10,7 @@ import android.content.Context; import android.content.DialogInterface; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v4.content.ContextCompat; import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.widget.Toolbar; import android.text.format.DateUtils; @@ -122,9 +123,9 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar } final boolean backButtonSavesTask = preferences.backButtonSavesTask(); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable( + Drawable drawable = DrawableCompat.wrap(ContextCompat.getDrawable(getActivity(), backButtonSavesTask ? R.drawable.ic_close_24dp : R.drawable.ic_save_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); + DrawableCompat.setTint(drawable, ContextCompat.getColor(context, android.R.color.white)); toolbar.setNavigationIcon(drawable); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override @@ -139,7 +140,7 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar toolbar.inflateMenu(R.menu.task_edit_fragment); Menu menu = toolbar.getMenu(); for (int i = 0 ; i < menu.size() ; i++) { - MenuColorizer.colorMenuItem(menu.getItem(i), getResources().getColor(android.R.color.white)); + MenuColorizer.colorMenuItem(menu.getItem(i), ContextCompat.getColor(context, android.R.color.white)); } toolbar.setOnMenuItemClickListener(this); @@ -260,7 +261,12 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar public void discardButtonClick() { if (hasChanges(taskEditControlSetFragmentManager.getFragmentsInPersistOrder())) { dialogBuilder.newMessageDialog(R.string.discard_confirmation) - .setPositiveButton(R.string.keep_editing, null) + .setPositiveButton(R.string.save, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + save(); + } + }) .setNegativeButton(R.string.discard, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { From 341b72edf6ef4ecd38eef4a680fc65bd45c40314 Mon Sep 17 00:00:00 2001 From: MPK44 Date: Sun, 17 Apr 2016 14:20:40 +0200 Subject: [PATCH 2/4] when using back button in filter creation user is asked to "save" or "discard" instad of "discard" and "cancle" cancle possible with back button --- .../java/com/todoroo/astrid/core/CustomFilterActivity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index 2141ce40d..25a59d676 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -388,7 +388,12 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity { finish(); } }) - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.save, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + saveAndView(); + } + }) .show(); } } From 33ba0492790ab9b77abd71d186b5ac89de73e329 Mon Sep 17 00:00:00 2001 From: MPK44 Date: Sun, 17 Apr 2016 14:30:36 +0200 Subject: [PATCH 3/4] choose save/discard instead of discard/cancel on back key when changing filter (name) --- .../com/todoroo/astrid/actfm/FilterSettingsActivity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java index 1cb17c878..d70f0b4b3 100644 --- a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java +++ b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java @@ -154,7 +154,12 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity { finish(); } }) - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.save, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + save(); + } + }) .show(); } } From 1eb767a354746fe791f4e05b5495e2e1dbc53618 Mon Sep 17 00:00:00 2001 From: MPK44 Date: Sun, 17 Apr 2016 15:02:25 +0200 Subject: [PATCH 4/4] attemp to fix CI error --- .../com/todoroo/astrid/actfm/FilterSettingsActivity.java | 8 +++++--- .../com/todoroo/astrid/core/CustomFilterActivity.java | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java index d70f0b4b3..3afddeff4 100644 --- a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java +++ b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java @@ -10,6 +10,8 @@ import android.content.DialogInterface; import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v4.content.ContextCompat; +import android.support.v4.content.res.ResourcesCompat; import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; @@ -61,8 +63,8 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity { ActionBar supportActionBar = getSupportActionBar(); if (supportActionBar != null) { supportActionBar.setDisplayHomeAsUpEnabled(true); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); + Drawable drawable = DrawableCompat.wrap(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_close_24dp, null)); + DrawableCompat.setTint(drawable, ContextCompat.getColor(getBaseContext(), android.R.color.white)); supportActionBar.setHomeAsUpIndicator(drawable); supportActionBar.setTitle(filter.listingTitle); } @@ -103,7 +105,7 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.tag_settings_activity, menu); - MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); + MenuColorizer.colorMenu(this, menu, ContextCompat.getColor(getBaseContext(), android.R.color.white)); return super.onCreateOptionsMenu(menu); } diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index 25a59d676..07b07c0e0 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -12,6 +12,8 @@ import android.content.Intent; import android.database.Cursor; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v4.content.ContextCompat; +import android.support.v4.content.res.ResourcesCompat; import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; @@ -156,8 +158,8 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity { ActionBar supportActionBar = getSupportActionBar(); if (supportActionBar != null) { supportActionBar.setDisplayHomeAsUpEnabled(true); - Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp)); - DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); + Drawable drawable = DrawableCompat.wrap(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_close_24dp, null)); + DrawableCompat.setTint(drawable, ContextCompat.getColor(getBaseContext(), android.R.color.white)); supportActionBar.setHomeAsUpIndicator(drawable); supportActionBar.setTitle(R.string.FLA_new_filter); } @@ -354,7 +356,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.tag_settings_activity, menu); - MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); + MenuColorizer.colorMenu(this, menu, ContextCompat.getColor(getBaseContext(), android.R.color.white)); menu.findItem(R.id.delete).setVisible(false); return super.onCreateOptionsMenu(menu); }