diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java index 7a6dcccda..d57a9e514 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java @@ -65,6 +65,7 @@ import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.TaskService; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.service.abtesting.ABChooser; import com.todoroo.astrid.tags.TagMemberMetadata; import com.todoroo.astrid.tags.TagService; @@ -142,7 +143,7 @@ public class EditPeopleControlSet extends PopupControlSet { assignedDisplay = (TextView) getDisplayView().findViewById(R.id.display_row_edit); ImageView image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon); - image.setImageResource(R.drawable.tea_icn_assign); + image.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_assign, R.drawable.tea_icn_assign_lightblue)); setUpListeners(); } diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java index 4731fad4e..c534154ef 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -187,7 +187,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity { else { ThemeService.applyTheme(this); ActionBar actionBar = getSupportActionBar(); - if (ThemeService.getUnsimplifiedTheme() == R.style.Theme_White_Alt) + if (ThemeService.getTheme() == R.style.Theme_White_Alt) actionBar.setLogo(R.drawable.ic_menu_save_blue_alt); else actionBar.setLogo(R.drawable.ic_menu_save); diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java index 20f41952d..a1d1d704d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java @@ -36,6 +36,7 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gcal.Calendars.CalendarResult; import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.PopupControlSet; /** @@ -231,7 +232,7 @@ public class GCalControlSet extends PopupControlSet { protected void refreshDisplayView() { TextView calendar = (TextView) getDisplayView().findViewById(R.id.calendar_display_which); calendar.setTextColor(themeColor); - image.setImageResource(R.drawable.tea_icn_addcal); + image.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_addcal, R.drawable.tea_icn_addcal_lightblue)); if (initialized) { if (hasEvent) { calendar.setText(R.string.gcal_TEA_has_event); diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java index 1fc38db7e..e842c7c70 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java @@ -34,6 +34,7 @@ import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TagService.Tag; import com.todoroo.astrid.ui.PopupControlSet; import com.todoroo.astrid.utility.Flags; @@ -311,7 +312,7 @@ public final class TagsControlSet extends PopupControlSet { if (!TextUtils.isEmpty(tagString)) { tagsDisplay.setText(tagString); tagsDisplay.setTextColor(themeColor); - image.setImageResource(R.drawable.tea_icn_lists); + image.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_lists, R.drawable.tea_icn_lists_lightblue)); } else { tagsDisplay.setText(R.string.tag_FEx_untagged); tagsDisplay.setTextColor(unsetColor); diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java index 194e962ce..e8832cf87 100644 --- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java @@ -16,6 +16,7 @@ import com.timsu.astrid.R; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.TaskEditControlSet; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.timers.TimerActionControlSet.TimerActionListener; import com.todoroo.astrid.ui.PopupControlSet; import com.todoroo.astrid.ui.TimeDurationControlSet; @@ -136,7 +137,7 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe if (!TextUtils.isEmpty(toDisplay)) { displayEdit.setText(toDisplay); displayEdit.setTextColor(themeColor); - image.setImageResource(R.drawable.tea_icn_timer); + image.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_timer, R.drawable.tea_icn_timer_lightblue)); } else { displayEdit.setText(R.string.TEA_timer_controls); displayEdit.setTextColor(unsetColor); diff --git a/astrid/res/values/colors.xml b/astrid/res/values/colors.xml index d1d2cae43..7efaacb2f 100644 --- a/astrid/res/values/colors.xml +++ b/astrid/res/values/colors.xml @@ -23,7 +23,6 @@ #292929 #000000 #262626 - #385487 #535353 #ffffff diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index c2d8252e6..a8b5c80d8 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -26,7 +26,7 @@ public class TaskEditActivity extends AstridActivity { ThemeService.applyTheme(this); ActionBar actionBar = getSupportActionBar(); if (Preferences.getBoolean(R.string.p_save_and_cancel, false)) { - if (ThemeService.getUnsimplifiedTheme() == R.style.Theme_White_Alt) + if (ThemeService.getTheme() == R.style.Theme_White_Alt) actionBar.setLogo(R.drawable.ic_menu_save_blue_alt); else actionBar.setLogo(R.drawable.ic_menu_save); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 676a3b094..8690cd86e 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -66,7 +66,6 @@ import com.todoroo.astrid.actfm.CommentsActivity; import com.todoroo.astrid.actfm.EditPeopleControlSet; import com.todoroo.astrid.actfm.TaskCommentsFragment; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; -import com.todoroo.astrid.actfm.sync.ActFmSyncService; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.TaskAttachmentDao; import com.todoroo.astrid.data.RemoteModel; @@ -83,8 +82,6 @@ import com.todoroo.astrid.opencrx.OpencrxControlSet; import com.todoroo.astrid.opencrx.OpencrxCoreUtils; import com.todoroo.astrid.reminders.Notifications; import com.todoroo.astrid.repeats.RepeatControlSet; -import com.todoroo.astrid.service.AddOnService; -import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.TaskService; @@ -202,21 +199,12 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Autowired private TaskService taskService; - @Autowired - private MetadataService metadataService; - @Autowired private TaskAttachmentDao taskAttachmentDao; - @Autowired - private AddOnService addOnService; - @Autowired private ActFmPreferenceService actFmPreferenceService; - @Autowired - private ActFmSyncService actFmSyncService; - // --- UI components private ImageButton voiceAddNoteButton; diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index c6a545ecf..1fc8cf34f 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -193,7 +193,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu); personStatus = (TextView) actionBar.getCustomView().findViewById(R.id.person_image); commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments); - if (ThemeService.getUnsimplifiedTheme() == R.style.Theme_White_Alt) + if (ThemeService.getTheme() == R.style.Theme_White_Alt) commentsButton.setTextColor(getResources().getColor(R.color.blue_theme_color)); initializeFragments(actionBar); diff --git a/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java b/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java index 4c80945cf..3cffb03c6 100644 --- a/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java +++ b/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java @@ -15,6 +15,7 @@ import android.widget.Button; import com.timsu.astrid.R; import com.todoroo.astrid.data.Task; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.EditDialogOkBackground; // --- interface @@ -38,7 +39,7 @@ public abstract class TaskEditControlSet { if (viewLayout == -1) initialized = true; - themeColor = activity.getResources().getColor(R.color.task_edit_selected); + themeColor = activity.getResources().getColor(ThemeService.getTaskEditThemeColor()); unsetColor = activity.getResources().getColor(R.color.task_edit_deadline_gray); } diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 35cb7d357..d1a938a7e 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -49,10 +49,6 @@ public class ThemeService { } public static int getTheme() { - return getUnsimplifiedTheme(); - } - - public static int getUnsimplifiedTheme() { String preference = Preferences.getStringValue(R.string.p_theme); return getStyleForSetting(preference); } @@ -60,7 +56,7 @@ public class ThemeService { public static int getWidgetTheme() { String preference = Preferences.getStringValue(R.string.p_theme_widget); if (TextUtils.isEmpty(preference) || THEME_WIDGET_SAME_AS_APP.equals(preference)) - return getUnsimplifiedTheme(); + return getTheme(); else if (THEME_WIDGET_LEGACY.equals(preference)) return TasksWidget.THEME_LEGACY; else @@ -83,7 +79,7 @@ public class ThemeService { } public static int getThemeColor() { - int theme = getUnsimplifiedTheme(); + int theme = getTheme(); switch(theme) { case R.style.Theme: case R.style.Theme_Transparent: @@ -99,7 +95,7 @@ public class ThemeService { public static int getEditDialogTheme() { boolean ics = AndroidUtilities.getSdkVersion() >= 14; - int themeSetting = getUnsimplifiedTheme(); + int themeSetting = getTheme(); int theme; if (themeSetting == R.style.Theme || themeSetting == R.style.Theme_Transparent) { if (ics) @@ -116,7 +112,7 @@ public class ThemeService { } public static int getDialogTheme() { - int themeSetting = getUnsimplifiedTheme(); + int themeSetting = getTheme(); int theme; if (themeSetting == R.style.Theme || themeSetting == R.style.Theme_Transparent) { theme = R.style.Theme_Dialog; @@ -128,7 +124,7 @@ public class ThemeService { public static int getDialogTextColor() { if (AndroidUtilities.getSdkVersion() >= 11) { - int theme = getUnsimplifiedTheme(); + int theme = getTheme(); if (theme == R.style.Theme || theme == R.style.Theme_Transparent) return android.R.color.white; else @@ -166,7 +162,7 @@ public class ThemeService { } public static int getDrawable(int lightDrawable, int alter) { - int theme = getUnsimplifiedTheme(); + int theme = getTheme(); boolean darkTheme = theme == R.style.Theme || theme == R.style.Theme_Transparent; switch(alter) { case FLAG_FORCE_DARK: @@ -258,6 +254,24 @@ public class ThemeService { ContextManager.getResources().getResourceName(lightDrawable)); } + public static int getTaskEditDrawable(int regularDrawable, int lightBlueDrawable) { + int theme = getTheme(); + if (theme == R.style.Theme || theme == R.style.Theme_White_Alt || theme == R.style.Theme_TransparentWhite) { + return lightBlueDrawable; + } else { + return regularDrawable; + } + } + + public static int getTaskEditThemeColor() { + int theme = getTheme(); + if (theme == R.style.Theme || theme == R.style.Theme_White_Alt || theme == R.style.Theme_TransparentWhite) { + return R.color.blue_theme_color; + } else { + return R.color.dark_blue_theme_color; + } + } + public static void forceTheme(int theme) { currentTheme = theme; } diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java index 8e0e2b5ac..8e6e4155d 100644 --- a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java @@ -22,6 +22,7 @@ import com.timsu.astrid.R; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.repeats.RepeatControlSet; +import com.todoroo.astrid.service.ThemeService; public class DeadlineControlSet extends PopupControlSet { @@ -62,7 +63,7 @@ public class DeadlineControlSet extends PopupControlSet { } else { dateDisplay.setText(displayString); dateDisplay.setTextColor(themeColor); - image.setImageResource(R.drawable.tea_icn_date); + image.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_date, R.drawable.tea_icn_date_lightblue)); } } diff --git a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java index 679cf9108..7da262fce 100644 --- a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java @@ -18,6 +18,7 @@ import android.widget.TextView; import com.timsu.astrid.R; import com.todoroo.astrid.data.Task; +import com.todoroo.astrid.service.ThemeService; public class EditNotesControlSet extends PopupControlSet { @@ -45,7 +46,7 @@ public class EditNotesControlSet extends PopupControlSet { } else { notesPreview.setText(textToUse); notesPreview.setTextColor(themeColor); - image.setImageResource(R.drawable.tea_icn_edit); + image.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_edit, R.drawable.tea_icn_edit_lightblue)); } linkifyDisplayView(); diff --git a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java index 40a9d6b2f..f31febb4d 100644 --- a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -22,6 +22,7 @@ import com.timsu.astrid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.data.Task; +import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener; /** @@ -208,7 +209,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect auxDisplay.setText(activity.getString(R.string.TEA_hideUntil_display, display)); auxDisplay.setTextColor(themeColor); - image.setImageResource(R.drawable.tea_icn_hide); + image.setImageResource(ThemeService.getTaskEditDrawable(R.drawable.tea_icn_hide, R.drawable.tea_icn_hide_lightblue)); } }