sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #636 from andrewlord1990/499_populate_currently_set_filters_by_default

Browse source 
Set the currently applied filters by default when creating a new task
This commit is contained in:
Phillip Thelen 2016-10-04 13:39:27 +02:00 committed by GitHub
commit 55f5f95c82
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
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.events.commands.DeleteTaskCommand;
import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper; import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
import com.habitrpg.android.habitica.helpers.RemindersManager; 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.helpers.TaskAlarmManager;
import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager; import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager;
import com.habitrpg.android.habitica.ui.adapter.tasks.CheckListAdapter; import com.habitrpg.android.habitica.ui.adapter.tasks.CheckListAdapter;
@ -73,13 +74,14 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import javax.inject.Inject;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
import rx.Observable; import rx.Observable;
import rx.android.schedulers.AndroidSchedulers; import rx.android.schedulers.AndroidSchedulers;
import rx.schedulers.Schedulers; import rx.schedulers.Schedulers;
public class TaskFormActivity extends BaseActivity implements AdapterView.OnItemSelectedListener { public class TaskFormActivity extends BaseActivity implements AdapterView.OnItemSelectedListener {
public static final String TASK_ID_KEY = "taskId"; public static final String TASK_ID_KEY = "taskId";
public static final String USER_ID_KEY = "userId"; public static final String USER_ID_KEY = "userId";
@ -189,6 +191,10 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
@BindView(R.id.task_tags_checklist) @BindView(R.id.task_tags_checklist)
LinearLayout tagsContainerLinearLayout; LinearLayout tagsContainerLinearLayout;
@Inject
TagsHelper tagsHelper;
EmojiPopup popup; EmojiPopup popup;
private String taskType; private String taskType;
@ -361,8 +367,9 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
@Override @Override
public void onKeyboardClose() { public void onKeyboardClose() {
if (popup.isShowing()) if (popup.isShowing()) {
popup.dismiss(); popup.dismiss();
}
} }
}); });
@ -515,6 +522,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
} }
} }
}); });
checkbox.setChecked(tagsHelper.isTagChecked(tag.getId()));
tagsContainerLinearLayout.addView(row); tagsContainerLinearLayout.addView(row);
tagCheckBoxList.add(checkbox); tagCheckBoxList.add(checkbox);
position++; position++;
@ -731,8 +739,9 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
} }
} }
if (task.text.isEmpty()) if (task.text.isEmpty()) {
return false; return false;
}
task.notes = MarkdownParser.parseCompiled(taskNotes.getText()); task.notes = MarkdownParser.parseCompiled(taskNotes.getText());
@ -896,7 +905,6 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
EditText datePickerText; EditText datePickerText;
DateFormat dateFormatter; DateFormat dateFormatter;
public DateEditTextListener(EditText dateText) { public DateEditTextListener(EditText dateText) {
calendar = Calendar.getInstance(); calendar = Calendar.getInstance();