Fixes #499. When creating a task, default the filters to the currently applied ones. This makes it easier to bulk create tasks with a set of filters, but also otherwise you won't be able to see a task after creating it unless you assigned the same filters to it.

This commit is contained in:
Andrew Lord 2016-09-30 22:11:39 +01:00
parent 0b47d4da80
commit 157d636f52

View file

@ -40,6 +40,7 @@ import com.habitrpg.android.habitica.events.TaskSaveEvent;
import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
import com.habitrpg.android.habitica.helpers.RemindersManager;
import com.habitrpg.android.habitica.helpers.TagsHelper;
import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager;
import com.habitrpg.android.habitica.ui.adapter.tasks.CheckListAdapter;
@ -73,13 +74,14 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import javax.inject.Inject;
import butterknife.BindView;
import butterknife.OnClick;
import rx.Observable;
import rx.android.schedulers.AndroidSchedulers;
import rx.schedulers.Schedulers;
public class TaskFormActivity extends BaseActivity implements AdapterView.OnItemSelectedListener {
public static final String TASK_ID_KEY = "taskId";
public static final String USER_ID_KEY = "userId";
@ -192,6 +194,10 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
@BindView(R.id.task_tags_checklist)
LinearLayout tagsContainerLinearLayout;
@Inject
TagsHelper tagsHelper;
EmojiPopup popup;
private String taskType;
@ -364,8 +370,9 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
@Override
public void onKeyboardClose() {
if (popup.isShowing())
if (popup.isShowing()) {
popup.dismiss();
}
}
});
@ -527,6 +534,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
}
}
});
checkbox.setChecked(tagsHelper.isTagChecked(tag.getId()));
tagsContainerLinearLayout.addView(row);
tagCheckBoxList.add(checkbox);
position++;
@ -743,8 +751,9 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
}
}
if (task.text.isEmpty())
if (task.text.isEmpty()) {
return false;
}
task.notes = MarkdownParser.parseCompiled(taskNotes.getText());
@ -908,7 +917,6 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
EditText datePickerText;
DateFormat dateFormatter;
public DateEditTextListener(EditText dateText) {
calendar = Calendar.getInstance();