Remove ThemeColor from task edit fragments

pull/996/head
Alex Baker 4 years ago
parent c95fa9a1df
commit aed4614eb1

@ -91,7 +91,6 @@ public final class TaskEditFragment extends InjectingFragment
@Inject Linkify linkify;
Task model = null;
private ThemeColor themeColor;
private TaskEditFragmentCallbackHandler callback;
private boolean showKeyboard;
private FragmentTaskEditBinding binding;
@ -133,7 +132,7 @@ public final class TaskEditFragment extends InjectingFragment
Bundle arguments = getArguments();
model = arguments.getParcelable(EXTRA_TASK);
themeColor = arguments.getParcelable(EXTRA_THEME);
ThemeColor themeColor = arguments.getParcelable(EXTRA_THEME);
Toolbar toolbar = binding.toolbar;
toolbar.setNavigationIcon(ContextCompat.getDrawable(context, R.drawable.ic_outline_save_24px));
@ -221,7 +220,7 @@ public final class TaskEditFragment extends InjectingFragment
FragmentManager fragmentManager = getChildFragmentManager();
List<TaskEditControlFragment> taskEditControlFragments =
taskEditControlSetFragmentManager.getOrCreateFragments(this, model, themeColor);
taskEditControlSetFragmentManager.getOrCreateFragments(this, model);
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
for (int i = 0; i < taskEditControlFragments.size(); i++) {

@ -21,7 +21,6 @@ import org.tasks.BuildConfig;
import org.tasks.R;
import org.tasks.injection.ForActivity;
import org.tasks.preferences.Preferences;
import org.tasks.themes.ThemeColor;
import org.tasks.ui.CalendarControlSet;
import org.tasks.ui.DeadlineControlSet;
import org.tasks.ui.DescriptionControlSet;
@ -110,11 +109,10 @@ public class TaskEditControlSetFragmentManager {
}
public List<TaskEditControlFragment> getOrCreateFragments(
TaskEditFragment taskEditFragment, Task task, ThemeColor themeColor) {
TaskEditFragment taskEditFragment, Task task) {
Bundle arguments = new Bundle();
arguments.putParcelable(TaskEditControlFragment.EXTRA_TASK, task);
arguments.putBoolean(TaskEditControlFragment.EXTRA_IS_NEW, task.isNew());
arguments.putParcelable(TaskEditControlFragment.EXTRA_THEME, themeColor);
List<TaskEditControlFragment> fragments = new ArrayList<>();
FragmentManager fragmentManager = taskEditFragment.getChildFragmentManager();

@ -12,17 +12,14 @@ import butterknife.ButterKnife;
import com.todoroo.astrid.data.Task;
import org.tasks.R;
import org.tasks.injection.InjectingFragment;
import org.tasks.themes.ThemeColor;
public abstract class TaskEditControlFragment extends InjectingFragment {
public static final String EXTRA_TASK = "extra_task";
public static final String EXTRA_IS_NEW = "extra_is_new";
public static final String EXTRA_THEME = "extra_theme";
protected Task task;
private boolean isNew;
protected ThemeColor themeColor;
@Nullable
@Override
@ -48,7 +45,6 @@ public abstract class TaskEditControlFragment extends InjectingFragment {
if (arguments != null) {
task = arguments.getParcelable(EXTRA_TASK);
isNew = arguments.getBoolean(EXTRA_IS_NEW);
themeColor = arguments.getParcelable(EXTRA_THEME);
}
}

Loading…
Cancel
Save