From 6fcf07513a0d784791f0c004db0794983d81cfe6 Mon Sep 17 00:00:00 2001 From: Andrew Shaw Date: Tue, 31 Jan 2012 19:10:31 -0800 Subject: [PATCH] Added blue repeat icon for night theme and fixed potential null pointer exception in TaskEditFragment --- .../todoroo/astrid/repeats/RepeatControlSet.java | 6 +++++- astrid/res/drawable/icn_edit_repeats_blue.png | Bin 0 -> 3803 bytes astrid/res/values/attrs.xml | 1 + astrid/res/values/styles.xml | 2 ++ .../astrid/activity/TaskEditFragment.java | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 astrid/res/drawable/icn_edit_repeats_blue.png diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java index e7213ebd5..be96498e1 100644 --- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -11,6 +11,7 @@ import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; import android.text.TextUtils; +import android.util.TypedValue; import android.view.View; import android.view.ViewGroup.LayoutParams; import android.widget.AdapterView; @@ -334,7 +335,10 @@ public class RepeatControlSet extends PopupControlSet { String date = String.format("%s %s", (Integer)value.getTag(), dateAbbrev[interval.getSelectedItemPosition()]); //$NON-NLS-1$ String text = String.format(activity.getString(R.string.repeat_detail_duedate), date); // Every freq int repeatDisplay.setText(text); - repeatImage.setImageResource(R.drawable.icn_edit_repeats_red); + + TypedValue repeatIcon = new TypedValue(); + activity.getTheme().resolveAttribute(R.attr.asRepeatIcon, repeatIcon, false); + repeatImage.setImageResource(repeatIcon.data); } else { diff --git a/astrid/res/drawable/icn_edit_repeats_blue.png b/astrid/res/drawable/icn_edit_repeats_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..9055f89a24690149861bf7ebac15e986c501599d GIT binary patch literal 3803 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 R%fSEu002ovPDHLkV1l8K9n}B; literal 0 HcmV?d00001 diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml index 75d9847d7..e7e04c890 100644 --- a/astrid/res/values/attrs.xml +++ b/astrid/res/values/attrs.xml @@ -25,6 +25,7 @@ + diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 89cdf10be..d97014be9 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -29,6 +29,7 @@ @color/blue_theme_color @drawable/lists_disclosure_blue @drawable/taskedit_arrow_up_white + @drawable/icn_edit_repeats_blue @drawable/header_blue useLogo|showHome|showTitle @@ -81,6 +82,7 @@ @color/red_theme_color @drawable/lists_disclosure_red @drawable/taskedit_arrow_up_white + @drawable/icn_edit_repeats_red @drawable/header_red useLogo|showHome|showTitle diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index c5af4351b..1bf9759e9 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -1036,7 +1036,7 @@ public final class TaskEditFragment extends Fragment implements @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (editNotes.activityResult(requestCode, resultCode, data)) { + if (editNotes != null && editNotes.activityResult(requestCode, resultCode, data)) { return; } if (requestCode == REQUEST_VOICE_RECOG