From af52d1c9f80c89d442708bf6f21499090b75bd34 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 4 Jul 2016 00:41:14 -0500 Subject: [PATCH] Fix manual list task adapters --- .../todoroo/astrid/subtasks/SubtasksListFragment.java | 4 +++- .../astrid/subtasks/SubtasksTagListFragment.java | 4 +++- src/main/java/org/tasks/themes/Theme.java | 10 +++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java index 239bfd33f..bbb51039b 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java +++ b/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java @@ -30,6 +30,7 @@ import org.tasks.dialogs.DialogBuilder; import org.tasks.injection.ForApplication; import org.tasks.injection.FragmentComponent; import org.tasks.preferences.Preferences; +import org.tasks.themes.Theme; import org.tasks.themes.ThemeCache; import org.tasks.ui.CheckBoxes; @@ -63,6 +64,7 @@ public class SubtasksListFragment extends TaskListFragment { @Inject CheckBoxes checkBoxes; @Inject TagService tagService; @Inject ThemeCache themeCache; + @Inject Theme theme; @Override public void onAttach(Activity activity) { @@ -155,7 +157,7 @@ public class SubtasksListFragment extends TaskListFragment { @Override protected TaskAdapter createTaskAdapter(TodorooCursor cursor) { - return helper.createTaskAdapter(context, cursor, sqlQueryTemplate); + return helper.createTaskAdapter(theme.wrap(context), cursor, sqlQueryTemplate); } @Override diff --git a/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java index 22eb21e42..d2375835d 100644 --- a/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java +++ b/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java @@ -29,6 +29,7 @@ import org.tasks.dialogs.DialogBuilder; import org.tasks.injection.ForApplication; import org.tasks.injection.FragmentComponent; import org.tasks.preferences.Preferences; +import org.tasks.themes.Theme; import org.tasks.themes.ThemeCache; import org.tasks.ui.CheckBoxes; @@ -53,6 +54,7 @@ public class SubtasksTagListFragment extends TagViewFragment { @Inject CheckBoxes checkBoxes; @Inject TagService tagService; @Inject ThemeCache themeCache; + @Inject Theme theme; private AstridOrderedListFragmentHelper helper; @@ -121,7 +123,7 @@ public class SubtasksTagListFragment extends TagViewFragment { @Override protected TaskAdapter createTaskAdapter(TodorooCursor cursor) { - return helper.createTaskAdapter(context, cursor, sqlQueryTemplate); + return helper.createTaskAdapter(theme.wrap(context), cursor, sqlQueryTemplate); } @Override diff --git a/src/main/java/org/tasks/themes/Theme.java b/src/main/java/org/tasks/themes/Theme.java index ad3245be9..ae44a8194 100644 --- a/src/main/java/org/tasks/themes/Theme.java +++ b/src/main/java/org/tasks/themes/Theme.java @@ -36,9 +36,7 @@ public class Theme { } public LayoutInflater getLayoutInflater(Context context) { - ContextThemeWrapper wrapper = themeBase.wrap(context); - applyToContext(wrapper); - return (LayoutInflater) wrapper.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + return (LayoutInflater) wrap(context).getSystemService(Context.LAYOUT_INFLATER_SERVICE); } public ContextThemeWrapper getThemedDialog(Context context) { @@ -63,4 +61,10 @@ public class Theme { themeColor.applyStyle(theme); themeAccent.apply(theme); } + + public Context wrap(Context context) { + ContextThemeWrapper wrapper = themeBase.wrap(context); + applyToContext(wrapper); + return wrapper; + } }