Fix manual list task adapters

pull/379/merge
Alex Baker 10 years ago
parent 76ea66625c
commit af52d1c9f8

@ -30,6 +30,7 @@ import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.ForApplication; import org.tasks.injection.ForApplication;
import org.tasks.injection.FragmentComponent; import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.themes.Theme;
import org.tasks.themes.ThemeCache; import org.tasks.themes.ThemeCache;
import org.tasks.ui.CheckBoxes; import org.tasks.ui.CheckBoxes;
@ -63,6 +64,7 @@ public class SubtasksListFragment extends TaskListFragment {
@Inject CheckBoxes checkBoxes; @Inject CheckBoxes checkBoxes;
@Inject TagService tagService; @Inject TagService tagService;
@Inject ThemeCache themeCache; @Inject ThemeCache themeCache;
@Inject Theme theme;
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Activity activity) {
@ -155,7 +157,7 @@ public class SubtasksListFragment extends TaskListFragment {
@Override @Override
protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) { protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) {
return helper.createTaskAdapter(context, cursor, sqlQueryTemplate); return helper.createTaskAdapter(theme.wrap(context), cursor, sqlQueryTemplate);
} }
@Override @Override

@ -29,6 +29,7 @@ import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.ForApplication; import org.tasks.injection.ForApplication;
import org.tasks.injection.FragmentComponent; import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.themes.Theme;
import org.tasks.themes.ThemeCache; import org.tasks.themes.ThemeCache;
import org.tasks.ui.CheckBoxes; import org.tasks.ui.CheckBoxes;
@ -53,6 +54,7 @@ public class SubtasksTagListFragment extends TagViewFragment {
@Inject CheckBoxes checkBoxes; @Inject CheckBoxes checkBoxes;
@Inject TagService tagService; @Inject TagService tagService;
@Inject ThemeCache themeCache; @Inject ThemeCache themeCache;
@Inject Theme theme;
private AstridOrderedListFragmentHelper<TaskListMetadata> helper; private AstridOrderedListFragmentHelper<TaskListMetadata> helper;
@ -121,7 +123,7 @@ public class SubtasksTagListFragment extends TagViewFragment {
@Override @Override
protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) { protected TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor) {
return helper.createTaskAdapter(context, cursor, sqlQueryTemplate); return helper.createTaskAdapter(theme.wrap(context), cursor, sqlQueryTemplate);
} }
@Override @Override

@ -36,9 +36,7 @@ public class Theme {
} }
public LayoutInflater getLayoutInflater(Context context) { public LayoutInflater getLayoutInflater(Context context) {
ContextThemeWrapper wrapper = themeBase.wrap(context); return (LayoutInflater) wrap(context).getSystemService(Context.LAYOUT_INFLATER_SERVICE);
applyToContext(wrapper);
return (LayoutInflater) wrapper.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
} }
public ContextThemeWrapper getThemedDialog(Context context) { public ContextThemeWrapper getThemedDialog(Context context) {
@ -63,4 +61,10 @@ public class Theme {
themeColor.applyStyle(theme); themeColor.applyStyle(theme);
themeAccent.apply(theme); themeAccent.apply(theme);
} }
public Context wrap(Context context) {
ContextThemeWrapper wrapper = themeBase.wrap(context);
applyToContext(wrapper);
return wrapper;
}
} }

Loading…
Cancel
Save